From b9c99a93f2a9f2750ff401ccf6be7257a44f6044 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 5 Jan 2022 13:42:52 +0000
Subject: [PATCH 1/2] Update dependencies from
 https://github.com/dotnet/runtime build 20220104.8

Microsoft.NETCore.App.Ref
 From Version 6.0.2-mauipre.1.21622.4 -> To Version 6.0.2-mauipre.1.22054.8
---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 07163f1b639..fa5cd3d937d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -8,9 +8,9 @@
       <Uri>https://github.com/dotnet/linker</Uri>
       <Sha>d0662ed8db919642177ddfd06a1c33895a69015f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.2-mauipre.1.21622.4">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.2-mauipre.1.22054.8">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>37e3ee473ad4886ef758636c13dabf1ed4d3e73b</Sha>
+      <Sha>b96f5608dab85cdf87fb8c0b88c233808538d2d0</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 8d4359d2ac6..9370422732e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,7 +5,7 @@
     <MicrosoftNETILLinkTasksPackageVersion>6.0.100-1.21519.4</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>6.0.2-mauipre.1.21622.4</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>6.0.2-mauipre.1.22054.8</MicrosoftNETCoreAppRefPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Trim all characters after first `-` or `+` is encountered. -->

From f164ae735883904ba0bb05012d4492884098a4ea Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 5 Jan 2022 08:26:12 -0600
Subject: [PATCH 2/2] [build] don't hardcode 6.0.100 for dotnet/runtime packs

Context: https://github.com/dotnet/runtime/pull/62787

This partially reverts c457b1ed1d0bddd286a575f2a250f9023fce13ea.
---
 .../Xamarin.Android.Tools.BootstrapTasks/GenerateWixFile.cs    | 2 +-
 build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs | 3 +--
 build-tools/xaprepare/xaprepare/package-download.proj          | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/GenerateWixFile.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/GenerateWixFile.cs
index b251b393107..454ac3ee248 100644
--- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/GenerateWixFile.cs
+++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/GenerateWixFile.cs
@@ -54,7 +54,7 @@ public override bool Execute ()
 				packWriter.WriteAttributeString ("Id", "sdk_manifests");
 				packWriter.WriteAttributeString ("Name", "sdk-manifests");
 
-				// $(DotNetPreviewVersionBand) 6.0.100
+				// $(DotNetPreviewVersionBand) such as 6.0.200
 				var sdk_manifests = Directory.EnumerateDirectories (sdk_manifests_root).FirstOrDefault ();
 				if (string.IsNullOrEmpty (sdk_manifests)) {
 					Log.LogError ($"Cannot find child directory of: {sdk_manifests_root}");
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
index 6c69abe1fb8..e9955f00fc6 100644
--- a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
+++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
@@ -326,8 +326,7 @@ public static partial class Paths
 
 			public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine (
 				XAPackagesDir,
-				//TODO: use $(DotNetPreviewVersionBand) after we get: https://github.com/dotnet/runtime/pull/62787
-				$"microsoft.net.workload.mono.toolchain.manifest-6.0.100",
+				$"microsoft.net.workload.mono.toolchain.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetPreviewVersionBand)}",
 				ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETCoreAppRefPackageVersion)
 			);
 
diff --git a/build-tools/xaprepare/xaprepare/package-download.proj b/build-tools/xaprepare/xaprepare/package-download.proj
index beaa6944897..72e69a482ed 100644
--- a/build-tools/xaprepare/xaprepare/package-download.proj
+++ b/build-tools/xaprepare/xaprepare/package-download.proj
@@ -20,8 +20,7 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will
     <PackageDownload Include="Microsoft.NETCore.App.Runtime.Mono.android-arm64" Version="[$(DotNetRuntimePacksVersion)]" />
     <PackageDownload Include="Microsoft.NETCore.App.Runtime.Mono.android-x86" Version="[$(DotNetRuntimePacksVersion)]" />
     <PackageDownload Include="Microsoft.NETCore.App.Runtime.Mono.android-x64" Version="[$(DotNetRuntimePacksVersion)]" />
-    <!-- TODO: use $(DotNetPreviewVersionBand) after we get: https://github.com/dotnet/runtime/pull/62787 -->
-    <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100" Version="[$(DotNetRuntimePacksVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-$(DotNetPreviewVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
   </ItemGroup>
 
 </Project>