Bump to dotnet/installer@2071f2c 7.0.100-preview.5.22263.22 (dotnet#6986

) Changes: dotnet/installer@c7afae6...2071f2c Changes: dotnet/linker@04c49c9...b9c9da2 Changes: dotnet/runtime@c5d40c9...3e5517b Changes: dotnet/emsdk@b8e7143...f41e658 Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-preview.4.22174.1 to 7.0.100-preview.5.22263.22 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22173.2 to 7.0.100-1.22259.1 * Microsoft.NETCore.App.Ref: from 7.0.0-preview.4.22172.7 to 7.0.0-preview.5.22258.4 * Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-preview.3.22121.1 to 7.0.0-preview.4.22215.1 ~~ Changes ~~ We can use `mono_opt_aot_lazy_assembly_load` now, as this change is in this .NET 7 version. Updated `.apkdesc` files, since `.apk` size has improved (gotten smaller). ~~ Known Issues ~~ * Force invariant globalization by default to workaround: dotnet/linker#2759 * Ignore tests that were hitting `InvalidProgramException`: dotnet/linker#2799 Co-authored-by: Jonathan Peppers <[email protected]>
simonrozsival · May 31, 2022 · f94121e · f94121e
1 parent 31c9994
commit f94121e
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 87 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,20 +1,20 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.4.22174.1">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.5.22263.22">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>c7afae6936bf80239aa93bfd3b6f68513d9876d4</Sha>
+      <Sha>2071f2cdca14396b68b38d719f291e3767f70d46</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22173.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22259.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/linker</Uri>
-      <Sha>04c49c9d7c244d7c73d6dbb438c4885fa72e830b</Sha>
+      <Sha>b9c9da264c5bc24a8e32fc5d2bda239dffc01fdb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.4.22172.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.5.22258.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>c5d40c9e703fd257db1b26ef4fd1399bbae73ab0</Sha>
+      <Sha>3e5517beb897faf4592d23f036446561da1e5c23</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.3.22121.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.4.22215.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>b8e71431b3eaa024afad7886699f8ac6bca2ba01</Sha>
+      <Sha>f41e658e85769eef222f5f7571038edbd2d1d9d8</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,12 +1,12 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.4.22174.1</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22173.2</MicrosoftNETILLinkTasksPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.4.22172.7</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.5.22263.22</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22259.1</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.5.22258.4</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.3.22121.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
+    <MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.4.22215.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
     <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/...Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets b/...Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
@@ -89,7 +89,8 @@
     <EventSourceSupport Condition="'$(EventSourceSupport)' == ''">false</EventSourceSupport>
     <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == '' and '$(PublishTrimmed)' == 'true'">true</UseSystemResourceKeys>
     <HttpActivityPropagationSupport Condition="'$(HttpActivityPropagationSupport)' == ''">false</HttpActivityPropagationSupport>
-    <InvariantGlobalization Condition="'$(InvariantGlobalization)' == ''">false</InvariantGlobalization>
+    <!-- TODO: should default to false when we get a fix for: https://github.com/dotnet/linker/issues/2759 -->
+    <InvariantGlobalization Condition="'$(InvariantGlobalization)' == ''">true</InvariantGlobalization>
     <StartupHookSupport Condition="'$(StartupHookSupport)' == ''">false</StartupHookSupport>
     <UseNativeHttpHandler Condition="'$(UseNativeHttpHandler)' == ''">true</UseNativeHttpHandler>
     <_AggressiveAttributeTrimming Condition="'$(_AggressiveAttributeTrimming)' == ''">true</_AggressiveAttributeTrimming>

diff --git a/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
@@ -5,46 +5,46 @@
       "Size": 3032
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 54979
+      "Size": 55100
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 88763
+      "Size": 88786
     },
     "assemblies/rc.bin": {
-      "Size": 1083
+      "Size": 1131
     },
     "assemblies/System.Linq.dll": {
-      "Size": 10111
+      "Size": 9970
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 537771
+      "Size": 484888
     },
     "assemblies/System.Runtime.dll": {
-      "Size": 2415
+      "Size": 2412
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 3550
+      "Size": 3553
     },
     "classes.dex": {
-      "Size": 347628
+      "Size": 347544
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 483840
+      "Size": 483888
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
-      "Size": 4693664
+      "Size": 4667280
     },
     "lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
       "Size": 767264
     },
     "lib/arm64-v8a/libSystem.Native.so": {
-      "Size": 88288
+      "Size": 90168
     },
     "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
       "Size": 146816
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 9232
+      "Size": 9272
     },
     "META-INF/BNDLTOOL.RSA": {
       "Size": 1213
@@ -56,7 +56,7 @@
       "Size": 2342
     },
     "res/drawable-hdpi-v4/icon.png": {
-      "Size": 4762
+      "Size": 4791
     },
     "res/drawable-mdpi-v4/icon.png": {
       "Size": 2200
@@ -80,5 +80,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 3020692
+  "PackageSize": 2959252
 }