Handle content hiding separately for hot restart scenarios

[captainsafia]

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).

A target is never run twice during a build, even if a subsequent target in the build depends on it. Once a target has been run, its contribution to the build is complete.

So the current ordering is:

• Problematic content is hidden
• _CollectBundleResources runs
• Problematic content is restored

To 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 content
• HideContentFromiOSHotRestartBundleResources hides the content
• _CollectHotRestartBundleResources runs
• RestoreHiddeniOSHotRestartContent restores the content

Issues Fixed

Fixes #5245

[jsuarezruiz]

/azp run

[azure-pipelines]

Azure Pipelines successfully started running 2 pipeline(s).

[javiercn]

@captainsafia can you ping me on teams to chat about this?

Our thinking was that https://github.com/dotnet/maui/pull/6341/files#diff-a403e09c8175f7c626397dc3695070bc822b977346468fe4cc11504388bbc68bL21 would take care of this.

Do you happen to/can get a binary log for this scenario?

[TanayParikh]

LGTM. Kicked off a re-run of the failing CI steps

[captainsafia]

@captainsafia can you ping me on teams to chat about this?

Our thinking was that https://github.com/dotnet/maui/pull/6341/files#diff-a403e09c8175f7c626397dc3695070bc822b977346468fe4cc11504388bbc68bL21 would take care of this.

Synced with Javier offline. We're taking this fix in as a stopgap and will work to address the core issue that required the workaround in the first place in the Xamarian hot reload implementation.

[robpaveza]

@captainsafia Looking at the timeline of the merge, I'm supposing that the fix didn't land in time for 17.2 Preview 5? I recently encountered this on a local build. Thanks!

[captainsafia]

Looking at the timeline of the merge, I'm supposing that the fix didn't land in time for 17.2 Preview 5

Correct, this will be part of the next release.

[PBTests]

Is there a fix for this? I'm on the absolute latest on both sides and still experience this issue. Can anyone identify a path to a solution? Thanks

[vallgrenerik]

@captainsafia Is this fix shipped? :)
Because I'm still hitting this issue when I'm trying on my physical device (iPhone) using hot restart.

[captainsafia]

@PBTests @vallgrenerik Would one of you mind opening a new issue for this? In particular, it would be helpful to know what combination of VS and iOS versions you are on.