Handle content hiding separately for hot restart scenarios #6341
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change
We've been receiving bug reports that an issue that was resolved by changes to MSBuild in 114d30f still persists in hot reload scenarios or iOS. Both the
_CollectBundleResources
and_CollectHotRestartBundleResources
targets are run during a hot restart build but because of the constraint on target ordering outlined here the hiding/restoring only happens on the first target that is run (_CollectBundleResources
).So the current ordering is:
_CollectBundleResources
runsTo resolve this issue, we need to invoke the hiding/restore targets independently for the
_CollectBundleResources
and_CollectHotRestartBundleResources
. The new sequence is as follows:HideContentFromiOSBundleResources
hides the content_CollectBundleResources runs
RestoreHiddeniOSContent
restores the contentHideContentFromiOSHotRestartBundleResources
hides the content_CollectHotRestartBundleResources
runsRestoreHiddeniOSHotRestartContent
restores the contentIssues Fixed
Fixes #5245