Skip to content

[msbuild] Fix BundleResource defaults for iOS and MacCatalyst#23835

Merged
PureWeen merged 1 commit intomainfrom
dev/dalexsoto/fixbundleresource
Jul 25, 2024
Merged

[msbuild] Fix BundleResource defaults for iOS and MacCatalyst#23835
PureWeen merged 1 commit intomainfrom
dev/dalexsoto/fixbundleresource

Conversation

@dalexsoto
Copy link
Copy Markdown
Member

@dalexsoto dalexsoto commented Jul 25, 2024

Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2172694
Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2172757

This PR #21350 added the new PrivacyInfo.xcprivacy to our default templates (new requirement from Apple) when building from Windows we try to bundle this resource and unfortunately we are missing the required Link metadata when this is done from single project triggering a condition where the path is incorrectly calculated when zipped in windows and once the zip archive is transfered to the mac host it is unable to unarchive the file. To fix this we simply unify the logic with what the macios SDK currently does https://github.com/xamarin/xamarin-macios/blob/main/dotnet/targets/Microsoft.Sdk.DefaultItems.template.props#L77
this ensures the right bundling happens.

Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2172694
Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2172757

This PR #21350 added the new `PrivacyInfo.xcprivacy` to our default templates (new requirement from Apple) when building from Windows we try to bundle this resource and unfortunately we are missing the required Link metadata when this is done from single project triggering a condition where the path is incorrectly calculated when zipped in windows and once the zip archive is transfered to the mac host it is unable to unarchive the file. To fix this we simply unify the logic with what the macios SDK currently does [1] this ensures the right bundling happens.

[1]: https://github.com/xamarin/xamarin-macios/blob/main/dotnet/targets/Microsoft.Sdk.DefaultItems.template.props#L77
@dalexsoto dalexsoto requested a review from a team as a code owner July 25, 2024 19:02
@dalexsoto dalexsoto requested review from Eilon and rmarinho July 25, 2024 19:02
@PureWeen
Copy link
Copy Markdown
Member

/backport to release/8.0.1xx-sr7

@github-actions
Copy link
Copy Markdown
Contributor

Started backporting to release/8.0.1xx-sr7: https://github.com/dotnet/maui/actions/runs/10100378449

@PureWeen PureWeen merged commit db7dd11 into main Jul 25, 2024
@PureWeen PureWeen deleted the dev/dalexsoto/fixbundleresource branch July 25, 2024 23:04
@samhouts samhouts added fixed-in-net9.0-nightly This may be available in a nightly release! fixed-in-8.0.80 and removed fixed-in-net9.0-nightly This may be available in a nightly release! labels Aug 2, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Sep 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants