[release/6.0.1xx-preview6] Update dependencies from dotnet/installer

eng/Version.Details.xml

@@ -1,16 +1,16 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.6.21313.2">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.6.21323.1">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>abb57b4610404b011c76ca8ea1d7ab40c58991d4</Sha>
+      <Sha>12636f6fdf5aa015bc0a1183936e5458f9ae85e3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21304.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21314.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>21df7dbbf881507c98026c1b9e7532303b3c0a06</Sha>
+      <Sha>f90f5c929054d4b4b69da0a21db4f69aa64d63af</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21306.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21317.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>5b8e1780ad7740e632c285bc2af13a8d0b20c5a9</Sha>
+      <Sha>8bb087d5f77f133d74797b91bb539ec0e2eb3910</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -1,11 +1,11 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.6.21313.2</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21304.2</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.6.21323.1</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21314.2</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21306.1</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21317.12</MicrosoftNETCoreAppRefPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Trim all characters after first `-` or `+` is encountered. -->

src/Microsoft.Android.Templates/android/.template.config/template.json

@@ -11,6 +11,13 @@
     "type": "project"
   },
   "sourceName": "AndroidApp1",
+  "sources": [
+      {
+        "source": "./",
+        "target": "./",
+        "copyOnly": "**/Resources/**/*.png"
+      }
+  ],
   "preferNameDirectory": true,
   "primaryOutputs": [
     { "path": "AndroidApp1.csproj" }

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.RuntimeConfig.targets

@@ -10,11 +10,7 @@ See: https://github.com/dotnet/runtime/blob/b13715b6984889a709ba29ea8a1961db469f
 -->
 <Project>
 
-  <Import Sdk="Microsoft.NET.Runtime.RuntimeConfigParser.Task" Project="Sdk.props" />
-
   <PropertyGroup>
-    <!-- HACK: workaround https://github.com/dotnet/runtime/issues/53811 -->
-    <RuntimeConfigParserTasksAssemblyPath>$([System.IO.Path]::GetDirectoryName($(RuntimeConfigParserTasksAssemblyPath)))/net6.0/$([System.IO.Path]::GetFileName($(RuntimeConfigParserTasksAssemblyPath)))</RuntimeConfigParserTasksAssemblyPath>
     <_BinaryRuntimeConfigPath>$(IntermediateOutputPath)$(ProjectRuntimeConfigFileName).bin</_BinaryRuntimeConfigPath>
   </PropertyGroup>
 

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs

@@ -56,15 +56,18 @@ public void BuildBasicBindingLibrary (string classParser)
 					Assert.IsNotNull (type, $"{assemblyPath} should contain {typeName}");
 				}
 
-				//A list of properties we check exist in binding projects
-				var properties = new [] {
-					"AndroidSdkBuildToolsVersion",
-					"AndroidSdkPlatformToolsVersion",
-					"AndroidSdkToolsVersion",
-					"AndroidNdkVersion",
-				};
-				foreach (var property in properties) {
-					Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, property + " = "), $"$({property}) should be set!");
+				//TODO: see https://github.com/dotnet/msbuild/issues/6609
+				if (!Builder.UseDotNet) {
+					//A list of properties we check exist in binding projects
+					var properties = new [] {
+						"AndroidSdkBuildToolsVersion",
+						"AndroidSdkPlatformToolsVersion",
+						"AndroidSdkToolsVersion",
+						"AndroidNdkVersion",
+					};
+					foreach (var property in properties) {
+						Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, property + " = "), $"$({property}) should be set!");
+					}
 				}
 
 				Assert.IsTrue (b.Build (proj, doNotCleanupOnUpdate: true, saveProject: false), "second build should succeed");

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc

@@ -8,37 +8,40 @@
       "Size": 54406
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 78827
+      "Size": 78836
+    },
+    "assemblies/rc.bin": {
+      "Size": 802
     },
     "assemblies/System.Linq.dll": {
-      "Size": 10163
+      "Size": 10158
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 492821
+      "Size": 495474
     },
     "assemblies/System.Runtime.dll": {
-      "Size": 2269
+      "Size": 2267
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 3176
+      "Size": 3174
     },
     "classes.dex": {
       "Size": 316792
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 336656
+      "Size": 337816
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
-      "Size": 3959384
+      "Size": 3257648
     },
     "lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
       "Size": 776216
     },
     "lib/arm64-v8a/libSystem.Native.so": {
-      "Size": 75872
+      "Size": 79968
     },
     "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
-      "Size": 162312
+      "Size": 150024
     },
     "lib/arm64-v8a/libxamarin-app.so": {
       "Size": 11504
@@ -47,10 +50,10 @@
       "Size": 1213
     },
     "META-INF/ANDROIDD.SF": {
-      "Size": 2289
+      "Size": 2378
     },
     "META-INF/MANIFEST.MF": {
-      "Size": 2162
+      "Size": 2251
     },
     "res/drawable-hdpi-v4/icon.png": {
       "Size": 4762
@@ -74,5 +77,5 @@
       "Size": 1724
     }
   },
-  "PackageSize": 2873108
+  "PackageSize": 2692947
 }