From b777b15033ac925185942e7b90a91f233cbeebcb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2020 13:38:48 +0000 Subject: [PATCH] [master] Update dependencies from dotnet/arcade (#6635) * Update dependencies from https://github.com/dotnet/arcade build 20200301.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20151.1 * Update dependencies from https://github.com/dotnet/arcade build 20200302.4 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20152.4 --- eng/Version.Details.xml | 4 ++-- eng/common/build.ps1 | 5 +++++ global.json | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2f38b2d7..75d04f870 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 86e54fb5076d46a6f959f0329d53c1c72e2280df + d8c2d041341ea7974fd3f2057e9d6afdd4f37598 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 88814514d..813d440d2 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,11 @@ Param( [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) +# Unset 'Platform' environment variable to avoid unwanted collision in InstallDotNetCore.targets file +# some computer has this env var defined (e.g. Some HP) +if($env:Platform) { + $env:Platform="" +} function Print-Usage() { Write-Host "Common settings:" Write-Host " -configuration Build configuration: 'Debug' or 'Release' (short: -c)" diff --git a/global.json b/global.json index f540e31f2..7622b2cfa 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20129.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20152.4" } }