From f99a061ccbd595922e5824bbb61b9d8a57d5a21a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Dec 2021 15:25:06 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/installer build 20211213.4 Microsoft.Dotnet.Sdk.Internal From Version 6.0.102-servicing.21609.9 -> To Version 6.0.200-preview.21613.4 --- 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 9faf2881fc7..ce3f1be1f3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 65bbb444f839ba116ca561390aa8725d0d198130 + d8c9c22117ca2db1d42f0d2c367450c818202a06 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 443915128d7..dbd7f22bdb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.102-servicing.21609.9 + 6.0.200-preview.21613.4 6.0.100-1.21519.4 5.0.0-beta.20181.7 6.0.0-beta.21212.6 From ea35bee6e07c6fc4c64f1a58db6a08d72829cfed Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 14 Dec 2021 09:27:46 -0600 Subject: [PATCH 2/5] Don't hardcode 6.0.100 --- eng/Versions.props | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index dbd7f22bdb1..08e76d18b99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,9 +8,7 @@ 6.0.1-mauipre.1.21602.7 - - 6.0.100 - + $([System.Text.RegularExpressions.Regex]::Replace($(MicrosoftDotnetSdkInternalPackageVersion), `[-+].*$`, "")) From 0ce619bf1652e11bdf3dd6620e254a6e0a179dde Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 14 Dec 2021 12:09:40 -0600 Subject: [PATCH 3/5] Temporarily use Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100 --- build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs | 3 ++- build-tools/xaprepare/xaprepare/package-download.proj | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs index e9955f00fc6..6c69abe1fb8 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs @@ -326,7 +326,8 @@ public static partial class Paths public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine ( XAPackagesDir, - $"microsoft.net.workload.mono.toolchain.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetPreviewVersionBand)}", + //TODO: use $(DotNetPreviewVersionBand) after we get: https://github.com/dotnet/runtime/pull/62787 + $"microsoft.net.workload.mono.toolchain.manifest-6.0.100", ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETCoreAppRefPackageVersion) ); diff --git a/build-tools/xaprepare/xaprepare/package-download.proj b/build-tools/xaprepare/xaprepare/package-download.proj index 72e69a482ed..beaa6944897 100644 --- a/build-tools/xaprepare/xaprepare/package-download.proj +++ b/build-tools/xaprepare/xaprepare/package-download.proj @@ -20,7 +20,8 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will - + + From 7072bbce876b322e7fe47c52362ba291bf5bc8da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Dec 2021 13:43:28 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/installer build 20211214.17 Microsoft.Dotnet.Sdk.Internal From Version 6.0.102-servicing.21609.9 -> To Version 6.0.200-preview.21614.17 --- 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 ce3f1be1f3b..b80d0f15758 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - d8c9c22117ca2db1d42f0d2c367450c818202a06 + 0ce201ed68d1fa0b397531084d12ccf6bc82b91f https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 08e76d18b99..859b07f6905 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.200-preview.21613.4 + 6.0.200-preview.21614.17 6.0.100-1.21519.4 5.0.0-beta.20181.7 6.0.0-beta.21212.6 From b88e9dc9949cdf38572e6be862fd7f26fc51ae92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Dec 2021 13:42:31 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/installer build 20211215.3 Microsoft.Dotnet.Sdk.Internal From Version 6.0.102-servicing.21609.9 -> To Version 6.0.200-preview.21615.3 --- 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 b80d0f15758..8ad8ce888ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 0ce201ed68d1fa0b397531084d12ccf6bc82b91f + 2dc0c5a0c9e30b861916e288676dc81d09ec9454 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 859b07f6905..fb92df7a1e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.200-preview.21614.17 + 6.0.200-preview.21615.3 6.0.100-1.21519.4 5.0.0-beta.20181.7 6.0.0-beta.21212.6