Bump to dotnet/installer@53fae57 7.0.100-preview.6.22330.5 (#7137)

Changes: dotnet/installer@970be08...53fae57 Changes: dotnet/linker@618eb72...5128bae Changes: dotnet/runtime@5c5e66e...d3fa592 Changes: dotnet/emsdk@ea10b4e...3fbbd97 Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-preview.6.22316.8 to 7.0.100-preview.6.22330.5 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22310.2 to 7.0.100-1.22323.1 * Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22312.1 to 7.0.0-preview.6.22324.4 * Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-preview.6.22281.1 to 7.0.0-preview.6.22320.1 * Update `.apkdesc` files for Xamarin.Forms sample There appears to be a new System.Xml.Linq facade with: [assembly: TypeForwardedTo(typeof(XAttribute))] [assembly: TypeForwardedTo(typeof(XElement))] * Temporarily ignore `BuildBasicApplicationReleaseProfiledAot(true)` Should eventually be fixed by: dotnet/runtime#71411 Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
dotnet · Jul 1, 2022 · 27b3555 · 27b3555
1 parent e161187
commit 27b3555
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 59 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.6.22316.8">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.6.22330.5">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>970be08e7ce46452911c8638ec7d4a3c0b6bd534</Sha>
+      <Sha>53fae5749bcf082734bd175340e529c6ec27bab5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22310.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22323.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/linker</Uri>
-      <Sha>618eb724e7320fd2e4a2b6e8f7e0a22195a9e633</Sha>
+      <Sha>5128bae8dfe81adca9ad212ed73e6cc97b33f280</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.6.22312.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.6.22324.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>5c5e66e6c067f8a82d514598575011cd21655ffb</Sha>
+      <Sha>d3fa592f6d5d678edb8aea7568812b167c72e622</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.6.22281.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.6.22320.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>ea10b4e5534de1806cc2e84ddd3b00eabcab962f</Sha>
+      <Sha>3fbbd97b47b5a71d7cf3ca2e197b0b93feaf975d</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.6.22316.8</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22310.2</MicrosoftNETILLinkTasksPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.6.22312.1</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.6.22330.5</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22323.1</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.6.22324.4</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.6.22281.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
+    <MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.6.22320.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
     <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs
@@ -60,6 +60,10 @@ void AssertProfiledAotBuildMessages(ProjectBuilder b)
 		[Test, Category ("SmokeTests"), Category ("ProfiledAOT")]
 		public void BuildBasicApplicationReleaseProfiledAot ([Values (true, false)] bool enableLLVM)
 		{
+			if (Builder.UseDotNet && enableLLVM) {
+				Assert.Ignore("https://github.com/dotnet/runtime/pull/71411");
+			}
+
 			var proj = new XamarinAndroidApplicationProject () {
 				IsRelease = true,
 				AndroidEnableProfiledAot = true,

diff --git a/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc b/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
@@ -8,118 +8,121 @@
       "Size": 7114
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 66738
+      "Size": 66755
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 444811
+      "Size": 447554
     },
     "assemblies/mscorlib.dll": {
-      "Size": 3891
+      "Size": 3894
     },
     "assemblies/netstandard.dll": {
-      "Size": 5602
+      "Size": 5613
     },
     "assemblies/rc.bin": {
       "Size": 1083
     },
     "assemblies/System.Collections.Concurrent.dll": {
-      "Size": 10777
+      "Size": 10785
     },
     "assemblies/System.Collections.dll": {
-      "Size": 16153
+      "Size": 16159
     },
     "assemblies/System.Collections.NonGeneric.dll": {
-      "Size": 7932
+      "Size": 7938
     },
     "assemblies/System.ComponentModel.dll": {
-      "Size": 2014
+      "Size": 2019
     },
     "assemblies/System.ComponentModel.Primitives.dll": {
-      "Size": 2627
+      "Size": 2634
     },
     "assemblies/System.ComponentModel.TypeConverter.dll": {
-      "Size": 6106
+      "Size": 6112
     },
     "assemblies/System.Console.dll": {
-      "Size": 6677
+      "Size": 6678
     },
     "assemblies/System.Core.dll": {
-      "Size": 2055
+      "Size": 2058
     },
     "assemblies/System.Diagnostics.TraceSource.dll": {
-      "Size": 6573
+      "Size": 6581
     },
     "assemblies/System.dll": {
-      "Size": 2409
+      "Size": 2413
     },
     "assemblies/System.Drawing.dll": {
-      "Size": 2093
+      "Size": 2099
     },
     "assemblies/System.Drawing.Primitives.dll": {
-      "Size": 12123
+      "Size": 12188
     },
     "assemblies/System.IO.Compression.dll": {
-      "Size": 16741
+      "Size": 16867
     },
     "assemblies/System.IO.IsolatedStorage.dll": {
-      "Size": 10045
+      "Size": 10059
     },
     "assemblies/System.Linq.dll": {
-      "Size": 19801
+      "Size": 19800
     },
     "assemblies/System.Linq.Expressions.dll": {
-      "Size": 177473
+      "Size": 177352
     },
     "assemblies/System.Net.Http.dll": {
-      "Size": 65645
+      "Size": 66445
     },
     "assemblies/System.Net.Primitives.dll": {
-      "Size": 22070
+      "Size": 22056
     },
     "assemblies/System.Net.Requests.dll": {
-      "Size": 3660
+      "Size": 3670
     },
     "assemblies/System.ObjectModel.dll": {
-      "Size": 8540
+      "Size": 8550
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 800901
+      "Size": 808148
     },
     "assemblies/System.Private.DataContractSerialization.dll": {
-      "Size": 185328
+      "Size": 185032
     },
     "assemblies/System.Private.Uri.dll": {
-      "Size": 42655
+      "Size": 42697
     },
     "assemblies/System.Private.Xml.dll": {
-      "Size": 216473
+      "Size": 216513
     },
     "assemblies/System.Private.Xml.Linq.dll": {
-      "Size": 16698
+      "Size": 16704
     },
     "assemblies/System.Runtime.dll": {
-      "Size": 2603
+      "Size": 2606
     },
     "assemblies/System.Runtime.Serialization.dll": {
-      "Size": 2020
+      "Size": 2023
     },
     "assemblies/System.Runtime.Serialization.Formatters.dll": {
-      "Size": 2551
+      "Size": 2560
     },
     "assemblies/System.Runtime.Serialization.Primitives.dll": {
-      "Size": 3834
+      "Size": 3839
     },
     "assemblies/System.Security.Cryptography.dll": {
-      "Size": 7751
+      "Size": 7794
     },
     "assemblies/System.Text.RegularExpressions.dll": {
-      "Size": 159573
+      "Size": 152555
     },
     "assemblies/System.Xml.dll": {
-      "Size": 1910
+      "Size": 1914
+    },
+    "assemblies/System.Xml.Linq.dll": {
+      "Size": 1934
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 117243
+      "Size": 117250
     },
     "assemblies/Xamarin.AndroidX.Activity.dll": {
       "Size": 5941
@@ -188,25 +191,25 @@
       "Size": 40004
     },
     "classes.dex": {
-      "Size": 3460156
+      "Size": 3473216
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 512552
+      "Size": 512520
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
-      "Size": 4667768
+      "Size": 4692344
     },
     "lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
       "Size": 767264
     },
     "lib/arm64-v8a/libSystem.Native.so": {
-      "Size": 90168
+      "Size": 90616
     },
     "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
-      "Size": 146816
+      "Size": 146624
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 98592
+      "Size": 98976
     },
     "META-INF/android.support.design_material.version": {
       "Size": 12
@@ -320,13 +323,13 @@
       "Size": 1213
     },
     "META-INF/BNDLTOOL.SF": {
-      "Size": 78757
+      "Size": 78859
     },
     "META-INF/com.google.android.material_material.version": {
       "Size": 10
     },
     "META-INF/MANIFEST.MF": {
-      "Size": 78630
+      "Size": 78732
     },
     "META-INF/proguard/androidx-annotations.pro": {
       "Size": 339
@@ -773,7 +776,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
@@ -1961,5 +1964,5 @@
       "Size": 341228
     }
   },
-  "PackageSize": 8347981
+  "PackageSize": 8364441
 }