Merge branch 'main' into dev/grendel/blobs-in-lib

* main: [Xamarin.Android.Build.Tasks] remove `%(TrimMode)=link` metadata (#8624)
dotnet · Jan 11, 2024 · 08408b9 · 08408b9
2 parents ab09406 + a34988c
commit 08408b9
Show file tree

Hide file tree

Showing 3 changed files with 857 additions and 496 deletions.
diff --git a/...in.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets b/...in.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets
@@ -29,11 +29,6 @@ This file contains the .NET 5-specific targets to customize ILLink
           Condition="'$(VSAndroidDesigner)' != ''"
           Value="$(VSAndroidDesigner)"
           Trim="true" />
-      <!-- TODO: remove setting the trim mode here, once the support packages are updated to NET6 and compatability packages not needed -->
-      <ResolvedFileToPublish
-          Condition=" '$(AndroidLinkMode)' == 'SdkOnly' and ( $([System.String]::Copy(%(Filename)).StartsWith ('Xamarin.AndroidX.')) or $([System.String]::Copy(%(Filename)).StartsWith ('Xamarin.Google.')) or $([System.String]::Copy(%(Filename)).StartsWith ('Xamarin.GooglePlayServices.')) ) ">
-        <TrimMode>link</TrimMode>
-      </ResolvedFileToPublish>
 
       <!--
         Used for the <ILLink CustomData="@(_TrimmerCustomData)" /> value:

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
@@ -157,7 +157,7 @@ public void BuildReleaseArm64 ([Values (false, true)] bool forms)
 
 			if (forms) {
 				proj.PackageReferences.Clear ();
-				proj.PackageReferences.Add (KnownPackages.XamarinForms_4_7_0_1142);
+				proj.PackageReferences.Add (KnownPackages.XamarinForms_5_0_0_2515);
 			}
 
 			byte [] apkDescData;