Skip to content

Commit 911f058

Browse files
github-actions[bot]dalexsotoPureWeen
authored
[release/8.0.1xx-sr7] [msbuild] Fix BundleResource defaults for iOS and MacCatalyst (#23836)
* [msbuild] Fix BundleResource defaults for iOS and MacCatalyst 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 * Update Versions.props --------- Co-authored-by: Alex Soto <[email protected]> Co-authored-by: Shane Neuville <[email protected]>
1 parent b956220 commit 911f058

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Diff for: eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project>
22
<PropertyGroup>
33
<!-- The .NET product branding version -->
4-
<ProductVersion>8.0.70</ProductVersion>
4+
<ProductVersion>8.0.71</ProductVersion>
55
<MajorVersion>8</MajorVersion>
66
<MinorVersion>0</MinorVersion>
7-
<PatchVersion>70</PatchVersion>
7+
<PatchVersion>71</PatchVersion>
88
<SdkBandVersion>8.0.100</SdkBandVersion>
99
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
1010
<!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->

Diff for: src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.Globs.props

+2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<BundleResource
6767
Include="$(iOSProjectFolder)Resources\**"
6868
Exclude="$(_SingleProjectiOSExcludes)"
69+
Link="$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(FullPath)'))"
6970
IsDefaultItem="true"
7071
/>
7172
<ImageAsset
@@ -101,6 +102,7 @@
101102
<BundleResource
102103
Include="$(MacCatalystProjectFolder)Resources\**"
103104
Exclude="$(_SingleProjectMacCatalystExcludes)"
105+
Link="$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(FullPath)'))"
104106
IsDefaultItem="true"
105107
/>
106108
<ImageAsset

0 commit comments

Comments
 (0)