From 0519d1544df66b424c05fbcc40a531d38ce69bb8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Aug 2021 12:02:30 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20210827.6 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21426.2 -> To Version 6.0.0-beta.21427.6 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/job/job.yml | 2 +- global.json | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ad70966319..7ae34793e2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - e737b1f920e7e1a37f99dae198bbd957c293b9c8 + 474307e526160c813c9fd58060eb8356ccca6099 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 86696793480..37dceb1bab0 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -103,7 +103,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@2 + - task: MicroBuildSigningPlugin@3 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) diff --git a/global.json b/global.json index aad263205e5..e4a01aa0b10 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.7.21379.14", + "version": "6.0.100-rc.1.21379.2", "allowPrerelease": true, "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-preview.7.21379.14", + "dotnet": "6.0.100-rc.1.21379.2", "vs": { "version": "16.8", "components": [ @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21426.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } } From 3672007dc2b3de3a6e1bc413a5aff7e24e5f79fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 31 Aug 2021 12:02:34 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/arcade build 20210830.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21426.2 -> To Version 6.0.0-beta.21430.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ae34793e2d..25e1b9de619 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - 474307e526160c813c9fd58060eb8356ccca6099 + e0260cb677c04cb0244aad7537c33bec4adce422 diff --git a/global.json b/global.json index e4a01aa0b10..e36fcced04f 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21430.1", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } } From 6a1dc56d0ce9b40c1951ebbb9bf7b307dbf8773e Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Tue, 31 Aug 2021 14:23:10 +0200 Subject: [PATCH 3/3] Sticking to public SDK version --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index e36fcced04f..a6e9de7f44e 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-rc.1.21379.2", + "version": "6.0.100-preview.7.21379.14", "allowPrerelease": true, "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-rc.1.21379.2", + "dotnet": "6.0.100-preview.7.21379.14", "vs": { "version": "16.8", "components": [