From b6c734cec50c15ce213f322c0d4d560ecad9ac73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Apr 2020 12:02:34 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20200415.5 - Microsoft.DotNet.Arcade.Sdk: 1.0.0-beta.20213.4 -> 1.0.0-beta.20215.5 --- eng/Version.Details.xml | 4 ++-- eng/common/tools.ps1 | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4245ce029b8..3ff6af353fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 1a55276ab9d16792cec595ba870df39a9d97d5ca + 36fd49bf87b14b78d722179b787e6518b5205518 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 3fe7e2a0ef4..92a053bd16b 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -246,6 +246,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = if (Test-Path variable:global:_MSBuildExe) { return $global:_MSBuildExe } + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { "15.9" } $vsMinVersion = [Version]::new($vsMinVersionStr) @@ -578,7 +579,6 @@ function MSBuild-Core() { } } - Write-Host "$buildTool.Path: $buildTool.Path --- $cmdArgs" $exitCode = Exec-Process $buildTool.Path $cmdArgs if ($exitCode -ne 0) { diff --git a/global.json b/global.json index fd83988bd6d..2af6daaf5ad 100644 --- a/global.json +++ b/global.json @@ -10,7 +10,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20213.4", + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20215.5", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } }