[release/8.0.1xx-sr7] [msbuild] Fix BundleResource defaults for iOS a…

…nd 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]>
dotnet · Jul 25, 2024 · 911f058 · 911f058
1 parent b956220
commit 911f058
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
     <!-- The .NET product branding version -->
-    <ProductVersion>8.0.70</ProductVersion>
+    <ProductVersion>8.0.71</ProductVersion>
     <MajorVersion>8</MajorVersion>
     <MinorVersion>0</MinorVersion>
-    <PatchVersion>70</PatchVersion>
+    <PatchVersion>71</PatchVersion>
     <SdkBandVersion>8.0.100</SdkBandVersion>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->

diff --git a/.../src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.Globs.props b/.../src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.Globs.props
@@ -66,6 +66,7 @@
     <BundleResource
         Include="$(iOSProjectFolder)Resources\**"
         Exclude="$(_SingleProjectiOSExcludes)"
+        Link="$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(FullPath)'))"
         IsDefaultItem="true"
     />
     <ImageAsset
@@ -101,6 +102,7 @@
     <BundleResource
         Include="$(MacCatalystProjectFolder)Resources\**"
         Exclude="$(_SingleProjectMacCatalystExcludes)"
+        Link="$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(FullPath)'))"
         IsDefaultItem="true"
     />
     <ImageAsset