diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b1f8a8e0a..385d775ddc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - 7f13798e5f567b72ffe63205bf49839245f0f8c1 + d88b466beb295e15b5e3bcb36b02b7900d4fd0ca - + https://github.com/dotnet/arcade - 7f13798e5f567b72ffe63205bf49839245f0f8c1 + d88b466beb295e15b5e3bcb36b02b7900d4fd0ca - + https://github.com/dotnet/arcade - 7f13798e5f567b72ffe63205bf49839245f0f8c1 + d88b466beb295e15b5e3bcb36b02b7900d4fd0ca diff --git a/eng/Versions.props b/eng/Versions.props index 06e5add345..3d07afad1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ prerelease - 6.0.0-beta.21160.7 + 6.0.0-beta.21165.1 5.0.2 5.0.1 diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index 3427b311a7..0fb786fabf 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 89b0f1eb1a..cc691386e1 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-preview.1.21103.13", + "dotnet": "6.0.100-preview.2.21155.3", "runtimes": { "dotnet/x64": [ "2.1.25", @@ -9,10 +9,10 @@ } }, "sdk": { - "version": "6.0.100-preview.1.21103.13" + "version": "6.0.100-preview.2.21155.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21160.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21160.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21165.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21165.1" } }