From f577471f0d2d338721676cd78b007ae696795de4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 May 2021 12:35:08 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20210525.5 (#4979) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/sdk-task.ps1 | 4 ++-- global.json | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95881662beb..55277efb915 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -150,25 +150,25 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 diff --git a/eng/Versions.props b/eng/Versions.props index 5a3481bdeff..d944b4c3ad4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ - 6.0.0-beta.21274.6 - 6.0.0-beta.21274.6 - 6.0.0-beta.21274.6 + 6.0.0-beta.21275.5 + 6.0.0-beta.21275.5 + 6.0.0-beta.21275.5 16.5.0 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index f55c43c6f47..65f1d75f3d3 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -53,7 +53,7 @@ try { } if ($task -eq "") { - Write-PipelineTelemetryError -Category 'Build' -Message "Missing required parameter '-task '" -ForegroundColor Red + Write-PipelineTelemetryError -Category 'Build' -Message "Missing required parameter '-task '" Print-Usage ExitWithExitCode 1 } @@ -78,7 +78,7 @@ try { $taskProject = GetSdkTaskProject $task if (!(Test-Path $taskProject)) { - Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task" -ForegroundColor Red + Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task" ExitWithExitCode 1 } diff --git a/global.json b/global.json index 081d4d697ae..d9c87072fa8 100644 --- a/global.json +++ b/global.json @@ -14,9 +14,9 @@ "version": "6.0.100-preview.3.21202.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21274.6", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21275.5", "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21076.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21274.6", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21275.5", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21275.1" },