Bump to dotnet/installer@f3da421 7.0.100-rc.2.22417.1 (#7255)

Fixes: #7256 Changes: dotnet/installer@716bd17...f3da421 Changes: dotnet/linker@f09bacf...6252a21 Changes: dotnet/runtime@26a71c6...f52d8c5 Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-rc.1.22409.23 to 7.0.100-rc.2.22417.1 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22377.1 to 7.0.100-1.22415.4 * Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22403.8 to 7.0.0-rc.1.22411.12 ~~ Other Changes ~~ * Revert `export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=true`, as the original issue is fixed. * [illink] enable serialization discovery for the linker Context: dotnet/linker#2929 Context: https://github.com/dotnet/linker/blob/6e8e139a484f74c524c821c7a4a08287d77257a4/src/ILLink.Tasks/build/Microsoft.NET.ILLink.targets#L227-L229 Fixes: #7256 Serialization heuristics in the .NET 7 linker is now opt-in. We now need to pass a new flag to the linker by default: <_ExtraTrimmerArgs>--enable-serialization-discovery $(_ExtraTrimmerArgs)</_ExtraTrimmerArgs> * Update `.apkdesc` files for the new `marshal-ilgen` Mono component * [tests] ignore `WarnAboutAppDomains(true)` Co-authored-by: Jonathan Peppers <[email protected]>
dotnet · Aug 18, 2022 · 102982b · 102982b
1 parent 4873dfa
commit 102982b
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 76 deletions.
diff --git a/Makefile b/Makefile
@@ -38,9 +38,6 @@ endif
 
 export NO_SUDO       ?= false
 
-# Workaround: https://github.com/dotnet/sdk/issues/26965
-export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER = true
-
 ifneq ($(NO_SUDO),false)
 _PREPARE_ARGS += --auto-provisioning-uses-sudo=false
 endif

diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml
@@ -35,9 +35,6 @@ variables:
   value: net7.0
 - name: DotNetStableTargetFramework
   value: net6.0
-# Workaround: https://github.com/dotnet/sdk/issues/26965
-- name: DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER
-  value: true
 # Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820
 - name: _WriteTelemetryProperties
   value: false
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,16 +1,16 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.1.22409.23">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22417.1">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>716bd17882e62abb008911461ea4ff5a75c26788</Sha>
+      <Sha>f3da421a6e81382d6d2b25b236697f33e210092c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22377.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22415.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/linker</Uri>
-      <Sha>f09bacf09ef10b61cf9f19825f8782171a816dab</Sha>
+      <Sha>6252a2194dd32911db2c0669fc818555687d5570</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22403.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22411.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
+      <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-rc.1.22368.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,9 +1,9 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22409.23</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22377.1</MicrosoftNETILLinkTasksPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22403.8</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22417.1</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22415.4</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22411.12</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
     <MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-rc.1.22368.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>

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
@@ -15,6 +15,7 @@ This file contains the .NET 5-specific targets to customize ILLink
       DependsOnTargets="GetReferenceAssemblyPaths;_CreatePropertiesCache">
     <PropertyGroup>
       <TrimmerRemoveSymbols Condition=" '$(AndroidIncludeDebugSymbols)' != 'true' ">true</TrimmerRemoveSymbols>
+      <_ExtraTrimmerArgs Condition=" '$(_EnableSerializationDiscovery)' != 'false' ">--enable-serialization-discovery $(_ExtraTrimmerArgs)</_ExtraTrimmerArgs>
       <!--
         Used for the <ILLink DumpDependencies="$(_TrimmerDumpDependencies)" /> value:
         https://github.com/dotnet/sdk/blob/a5393731b5b7b225692fff121f747fbbc9e8b140/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets#L150

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs
@@ -182,6 +182,11 @@ public void PreserveCustomHttpClientHandlers ()
 		[Test]
 		public void WarnAboutAppDomains ([Values (true, false)] bool isRelease)
 		{
+			if (isRelease) {
+				// NOTE: trimmer warnings are hidden by default in .NET 7 rc1
+				Assert.Ignore("https://github.com/dotnet/linker/issues/2982");
+			}
+
 			var path = Path.Combine (Root, "temp", TestName);
 			var lib = new XamarinAndroidLibraryProject {
 				IsRelease = isRelease,

diff --git a/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
@@ -5,61 +5,64 @@
       "Size": 3032
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 58756
+      "Size": 58665
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 87933
+      "Size": 87971
     },
     "assemblies/rc.bin": {
-      "Size": 1129
+      "Size": 1182
     },
     "assemblies/System.Console.dll": {
-      "Size": 6401
+      "Size": 6404
     },
     "assemblies/System.Linq.dll": {
-      "Size": 9083
+      "Size": 9092
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 473290
+      "Size": 462335
     },
     "assemblies/System.Runtime.dll": {
-      "Size": 2379
+      "Size": 2375
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 3597
+      "Size": 3560
     },
     "classes.dex": {
       "Size": 360744
     },
+    "lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
+      "Size": 96832
+    },
     "lib/arm64-v8a/libmonodroid.so": {
       "Size": 425336
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
-      "Size": 3084552
+      "Size": 3052320
     },
     "lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
       "Size": 723840
     },
     "lib/arm64-v8a/libSystem.Native.so": {
-      "Size": 92800
+      "Size": 93032
     },
     "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
       "Size": 148696
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 9488
+      "Size": 9784
     },
     "META-INF/BNDLTOOL.RSA": {
       "Size": 1213
     },
     "META-INF/BNDLTOOL.SF": {
-      "Size": 2570
+      "Size": 2690
     },
     "META-INF/MANIFEST.MF": {
-      "Size": 2443
+      "Size": 2563
     },
     "res/drawable-hdpi-v4/icon.png": {
-      "Size": 4791
+      "Size": 4762
     },
     "res/drawable-mdpi-v4/icon.png": {
       "Size": 2200
@@ -83,5 +86,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 2648031
+  "PackageSize": 2664509
 }
diff --git a/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc b/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
@@ -8,121 +8,121 @@
       "Size": 7114
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 66630
+      "Size": 66533
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 441986
+      "Size": 441958
     },
     "assemblies/mscorlib.dll": {
-      "Size": 3849
+      "Size": 3857
     },
     "assemblies/netstandard.dll": {
-      "Size": 5565
+      "Size": 5570
     },
     "assemblies/rc.bin": {
-      "Size": 1129
+      "Size": 1182
     },
     "assemblies/System.Collections.Concurrent.dll": {
-      "Size": 10477
+      "Size": 10479
     },
     "assemblies/System.Collections.dll": {
-      "Size": 15298
+      "Size": 15299
     },
     "assemblies/System.Collections.NonGeneric.dll": {
-      "Size": 7426
+      "Size": 7429
     },
     "assemblies/System.ComponentModel.dll": {
-      "Size": 1930
+      "Size": 1939
     },
     "assemblies/System.ComponentModel.Primitives.dll": {
-      "Size": 2541
+      "Size": 2551
     },
     "assemblies/System.ComponentModel.TypeConverter.dll": {
-      "Size": 6022
+      "Size": 6030
     },
     "assemblies/System.Console.dll": {
-      "Size": 7290
+      "Size": 7294
     },
     "assemblies/System.Core.dll": {
-      "Size": 1973
+      "Size": 1983
     },
     "assemblies/System.Diagnostics.TraceSource.dll": {
-      "Size": 6512
+      "Size": 6549
     },
     "assemblies/System.dll": {
-      "Size": 2331
+      "Size": 2340
     },
     "assemblies/System.Drawing.dll": {
-      "Size": 2016
+      "Size": 2024
     },
     "assemblies/System.Drawing.Primitives.dll": {
-      "Size": 11967
+      "Size": 11963
     },
     "assemblies/System.IO.Compression.dll": {
-      "Size": 16804
+      "Size": 16658
     },
     "assemblies/System.IO.IsolatedStorage.dll": {
-      "Size": 9985
+      "Size": 9991
     },
     "assemblies/System.Linq.dll": {
-      "Size": 19131
+      "Size": 19133
     },
     "assemblies/System.Linq.Expressions.dll": {
-      "Size": 163892
+      "Size": 163893
     },
     "assemblies/System.Net.Http.dll": {
-      "Size": 66008
+      "Size": 65957
     },
     "assemblies/System.Net.Primitives.dll": {
-      "Size": 21947
+      "Size": 21873
     },
     "assemblies/System.Net.Requests.dll": {
-      "Size": 3593
+      "Size": 3599
     },
     "assemblies/System.ObjectModel.dll": {
-      "Size": 8095
+      "Size": 8103
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 808082
+      "Size": 769737
     },
     "assemblies/System.Private.DataContractSerialization.dll": {
-      "Size": 184896
+      "Size": 184912
     },
     "assemblies/System.Private.Uri.dll": {
-      "Size": 42577
+      "Size": 42214
     },
     "assemblies/System.Private.Xml.dll": {
-      "Size": 215501
+      "Size": 215291
     },
     "assemblies/System.Private.Xml.Linq.dll": {
-      "Size": 16627
+      "Size": 16633
     },
     "assemblies/System.Runtime.dll": {
-      "Size": 2573
+      "Size": 2578
     },
     "assemblies/System.Runtime.Serialization.dll": {
-      "Size": 1939
+      "Size": 1948
     },
     "assemblies/System.Runtime.Serialization.Formatters.dll": {
-      "Size": 2473
+      "Size": 2477
     },
     "assemblies/System.Runtime.Serialization.Primitives.dll": {
-      "Size": 3751
+      "Size": 3756
     },
     "assemblies/System.Security.Cryptography.dll": {
-      "Size": 7741
+      "Size": 7785
     },
     "assemblies/System.Text.RegularExpressions.dll": {
-      "Size": 153702
+      "Size": 153833
     },
     "assemblies/System.Xml.dll": {
-      "Size": 1827
+      "Size": 1836
     },
     "assemblies/System.Xml.Linq.dll": {
-      "Size": 1846
+      "Size": 1857
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 117278
+      "Size": 117251
     },
     "assemblies/Xamarin.AndroidX.Activity.dll": {
       "Size": 5872
@@ -193,23 +193,26 @@
     "classes.dex": {
       "Size": 3473216
     },
+    "lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
+      "Size": 96832
+    },
     "lib/arm64-v8a/libmonodroid.so": {
       "Size": 425336
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
-      "Size": 3084552
+      "Size": 3052320
     },
     "lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
       "Size": 723840
     },
     "lib/arm64-v8a/libSystem.Native.so": {
-      "Size": 92800
+      "Size": 93032
     },
     "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
       "Size": 148696
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 98912
+      "Size": 99208
     },
     "META-INF/android.support.design_material.version": {
       "Size": 12
@@ -323,13 +326,13 @@
       "Size": 1213
     },
     "META-INF/BNDLTOOL.SF": {
-      "Size": 78859
+      "Size": 78979
     },
     "META-INF/com.google.android.material_material.version": {
       "Size": 10
     },
     "META-INF/MANIFEST.MF": {
-      "Size": 78732
+      "Size": 78852
     },
     "META-INF/proguard/androidx-annotations.pro": {
       "Size": 339
@@ -776,7 +779,7 @@
       "Size": 470
     },
     "res/drawable-hdpi-v4/icon.png": {
-      "Size": 4791
+      "Size": 4762
     },
     "res/drawable-hdpi-v4/notification_bg_low_normal.9.png": {
       "Size": 212
@@ -1964,5 +1967,5 @@
       "Size": 341228
     }
   },
-  "PackageSize": 8008089
+  "PackageSize": 7995895
 }