From a520e09c1f6d332471f9c76f13777bc0f1b38032 Mon Sep 17 00:00:00 2001
From: dotnet-maestro <@dotnet-maestro>
Date: Tue, 23 Jul 2019 12:49:02 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20190722.10
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19372.10
---
eng/Version.Details.xml | 4 ++--
eng/common/init-tools-native.ps1 | 8 +++++++-
global.json | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7228968c1..e278bed29 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
-
+
https://github.com/dotnet/arcade
- a190d4865fe3c86a168ec49c4fc61c90c96ae051
+ 0793e2df782efc9ccae387bc779b2549208fa4a1
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
index 9d18645f4..eaa05880c 100644
--- a/eng/common/init-tools-native.ps1
+++ b/eng/common/init-tools-native.ps1
@@ -103,7 +103,13 @@ try {
if ($LASTEXITCODE -Ne "0") {
$errMsg = "$ToolName installation failed"
if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
- Write-Warning $errMsg
+ $showNativeToolsWarning = $true
+ if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
+ $showNativeToolsWarning = $false
+ }
+ if ($showNativeToolsWarning) {
+ Write-Warning $errMsg
+ }
$toolInstallationFailure = $true
} else {
Write-Error $errMsg
diff --git a/global.json b/global.json
index d6e99da54..045f66564 100644
--- a/global.json
+++ b/global.json
@@ -7,6 +7,6 @@
"xcopy-msbuild": "15.9.0-alpha"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19369.2"
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19372.10"
}
}