Bump to dotnet/installer@c83bef2f 6.0.100-preview.6.21306.2 (#6007)

Fixes: #5997 Context: dotnet/linker#2082 Changes: dotnet/installer@46b17bd...c83bef2 Changes: dotnet/linker@50901f9...21df7db Changes: dotnet/runtime@6e5f722...5b8e178 Update the `*.apkdesc` files; looks like `libmonosgen-2.0.so` increased in size by ~20KB. Update the `@(_TrimmerCustomSteps)` ordering so that we use { RemoveResourceDesignerStep, GetAssembliesStep } instead of { GetAssembliesStep, RemoveResourceDesignerStep }. This change is needed because of dotnet/linker#2082. Otherwise we get a `RemoveDesigner` test failure that looks like it is related: RemoveDesigner All Nested Resource Types should be removed. Expected: 0 But was: 5 Co-authored-by: Jonathan Pryor <jonpryor@vt.edu> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
dotnet · Jun 8, 2021 · 002b5f9 · 002b5f9
1 parent bf63c3d
commit 002b5f9
Show file tree

Hide file tree

Showing 5 changed files with 521 additions and 521 deletions.
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="6.0.100-preview.6.21280.2">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.6.21306.2">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>46b17bd1587380d190dcdfd45a61a5b5c1eb6c93</Sha>
+      <Sha>c83bef2f34e5302bfc651d12df2f8bbcd2a981dc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21277.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21304.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>50901f9ba5c8672c2758577a61f45fea3cc6cd76</Sha>
+      <Sha>21df7dbbf881507c98026c1b9e7532303b3c0a06</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21276.13" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21306.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>6e5f722a9dab49f9626ea95326ef6e74129621ca</Sha>
+      <Sha>5b8e1780ad7740e632c285bc2af13a8d0b20c5a9</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,11 +1,11 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.6.21280.2</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21277.2</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.6.21306.2</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21304.2</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21276.13</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21306.1</MicrosoftNETCoreAppRefPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Trim all characters after first `-` or `+` is encountered. -->

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
@@ -83,13 +83,13 @@ This file contains the .NET 5-specific targets to customize ILLink
           Condition=" '$(AndroidLinkResources)' == 'true' "
           Include="$(_AndroidLinkerCustomStepAssembly)"
           AfterStep="CleanStep"
-          Type="MonoDroid.Tuner.GetAssembliesStep"
+          Type="MonoDroid.Tuner.RemoveResourceDesignerStep"
       />
       <_TrimmerCustomSteps
           Condition=" '$(AndroidLinkResources)' == 'true' "
           Include="$(_AndroidLinkerCustomStepAssembly)"
           AfterStep="CleanStep"
-          Type="MonoDroid.Tuner.RemoveResourceDesignerStep"
+          Type="MonoDroid.Tuner.GetAssembliesStep"
       />
 
       <_PreserveLists Include="$(MSBuildThisFileDirectory)..\PreserveLists\*.xml" />

diff --git a/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
@@ -8,19 +8,19 @@
       "Size": 54406
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 78828
+      "Size": 78827
     },
     "assemblies/System.Linq.dll": {
-      "Size": 10155
+      "Size": 10163
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 488969
+      "Size": 492821
     },
     "assemblies/System.Runtime.dll": {
-      "Size": 2263
+      "Size": 2269
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 3160
+      "Size": 3176
     },
     "classes.dex": {
       "Size": 316792
@@ -29,7 +29,7 @@
       "Size": 336656
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
-      "Size": 3939352
+      "Size": 3959384
     },
     "lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
       "Size": 776216
@@ -38,7 +38,7 @@
       "Size": 75872
     },
     "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
-      "Size": 166408
+      "Size": 162312
     },
     "lib/arm64-v8a/libxamarin-app.so": {
       "Size": 11504
@@ -53,7 +53,7 @@
       "Size": 2162
     },
     "res/drawable-hdpi-v4/icon.png": {
-      "Size": 4791
+      "Size": 4762
     },
     "res/drawable-mdpi-v4/icon.png": {
       "Size": 2200
@@ -74,5 +74,5 @@
       "Size": 1724
     }
   },
-  "PackageSize": 2864916
+  "PackageSize": 2873108
 }