From 33d783a8e9aedd0372b5ec6e237e3d5015f670a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 18:19:41 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20211013.1 (#26334) [release/5.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64baf3339b9..d5b3fa042a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,13 +51,13 @@ - + https://github.com/dotnet/arcade - 1f8b5698fa4c1307d9db78cd45345e0160a746fb + f7347c7eda15739dbbc6b031364729938b041b14 - + https://github.com/dotnet/arcade - 1f8b5698fa4c1307d9db78cd45345e0160a746fb + f7347c7eda15739dbbc6b031364729938b041b14 diff --git a/global.json b/global.json index 8b7e2cc871c..2268c744227 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21509.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21509.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21513.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21513.1" } } From 7eb337c4c60d115487dd573fb2b7c235739ae45d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 19:44:48 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20211005.12 (#26358) [release/3.1] Update dependencies from dotnet/arcade --- NuGet.config | 4 ---- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6611dfcd037..138e99ee50c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,11 +4,8 @@ - - - @@ -23,7 +20,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d92a8cf955..fe95baea17f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,9 +321,9 @@ - + https://github.com/dotnet/arcade - 98e2fbaad9f2f7bbe091bb0b9dd37d03206becc9 + 62ba17e4a1901b89bfbc7de7b47cef9150cfb413 https://github.com/dotnet/roslyn diff --git a/global.json b/global.json index 225e2eb5a95..7760c77b27a 100644 --- a/global.json +++ b/global.json @@ -12,6 +12,6 @@ "version": "3.1.120" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21427.4" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21505.12" } } From 3d216b47625501af1b1eff22ffc320cab6039b4e Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 2 Nov 2021 12:27:11 -0700 Subject: [PATCH 3/4] Update branding for 5.0.13 (#26513) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f77d6da2151..a09a71e5212 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,6 +1,6 @@ - 5.0.12 + 5.0.13 servicing False true From 893af6e6ab222ba67b47dbd3539935ec36c74b20 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 2 Nov 2021 13:34:29 -0700 Subject: [PATCH 4/4] Update branding for 3.1.22 (#26512) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 848594139b4..2137de6ba36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,6 +1,6 @@ - 3.1.21 + 3.1.22 servicing False true