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 - - + 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 @@ https://github.com/dotnet/linker d0662ed8db919642177ddfd06a1c33895a69015f - + https://github.com/dotnet/runtime - 37e3ee473ad4886ef758636c13dabf1ed4d3e73b + b96f5608dab85cdf87fb8c0b88c233808538d2d0 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 @@ 6.0.100-1.21519.4 5.0.0-beta.20181.7 6.0.0-beta.21212.6 - 6.0.2-mauipre.1.21622.4 + 6.0.2-mauipre.1.22054.8