From 8c51c54fe1faaf0d331120c269a99c4786daf1c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Mar 2021 23:02:22 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20210315.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21160.7 -> To Version 6.0.0-beta.21165.1 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/steps/perf-send-to-helix.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 c94e80fa7..2002f6601 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 7f13798e5f567b72ffe63205bf49839245f0f8c1 + d88b466beb295e15b5e3bcb36b02b7900d4fd0ca diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index 3427b311a..0fb786fab 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -29,7 +29,7 @@ steps: sendParams: $(Build.SourcesDirectory)/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog displayName: ${{ parameters.DisplayNamePrefix }} condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} + shouldContinueOnError: ${{ parameters.continueOnError }} environment: BuildConfig: $(_BuildConfig) HelixSource: ${{ parameters.HelixSource }} diff --git a/global.json b/global.json index 84680d3f6..03dc09387 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.1.21103.13", + "version": "6.0.100-preview.2.21155.3", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.1.21103.13", + "dotnet": "6.0.100-preview.2.21155.3", "runtimes": { "dotnet": [ "3.1.0" @@ -17,6 +17,6 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21160.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21165.1" } }