From abb54e6a0955a7df1c017475425e23896348193e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 12 May 2022 12:43:54 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20220511.14 (#1385)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/common/init-tools-native.ps1 | 11 ++++++-----
global.json | 2 +-
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 25c1967d..d8287e6b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- 6baad99219dda29b3c8efd7d627393cda4b38372
+ 666b83fa183306e9adec817c903ec93da2a4703c
-
+
https://github.com/dotnet/arcade
- 6baad99219dda29b3c8efd7d627393cda4b38372
+ 666b83fa183306e9adec817c903ec93da2a4703c
-
+
https://github.com/dotnet/arcade
- 6baad99219dda29b3c8efd7d627393cda4b38372
+ 666b83fa183306e9adec817c903ec93da2a4703c
-
+
https://github.com/dotnet/arcade
- 6baad99219dda29b3c8efd7d627393cda4b38372
+ 666b83fa183306e9adec817c903ec93da2a4703c
-
+
https://github.com/dotnet/arcade
- 6baad99219dda29b3c8efd7d627393cda4b38372
+ 666b83fa183306e9adec817c903ec93da2a4703c
https://github.com/dotnet/arcade-services
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
index 413adea4..24a5e65d 100644
--- a/eng/common/init-tools-native.ps1
+++ b/eng/common/init-tools-native.ps1
@@ -93,7 +93,7 @@ try {
$ToolVersion = ""
}
$ArcadeToolsDirectory = "C:\arcade-tools"
- if (Test-Path $ArcadeToolsDirectory -eq $False) {
+ if (-not (Test-Path $ArcadeToolsDirectory)) {
Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
exit 1
}
@@ -103,13 +103,14 @@ try {
exit 1
}
$BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
- if (Test-Path -Path "$BinPathFile" -eq $False) {
+ if (-not (Test-Path -Path "$BinPathFile")) {
Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."
exit 1
}
$BinPath = Get-Content "$BinPathFile"
- Write-Host "Adding $ToolName to the path ($(Convert-Path -Path $BinPath))..."
- Write-Host "##vso[task.prependpath]$(Convert-Path -Path $BinPath)"
+ $ToolPath = Convert-Path -Path $BinPath
+ Write-Host "Adding $ToolName to the path ($ToolPath)..."
+ Write-Host "##vso[task.prependpath]$ToolPath"
}
}
exit 0
@@ -188,7 +189,7 @@ try {
Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)"
return $InstallBin
}
- else {
+ elseif (-not ($PathPromotion)) {
Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed'
exit 1
}
diff --git a/global.json b/global.json
index 7c154e40..6e46e9e7 100644
--- a/global.json
+++ b/global.json
@@ -14,6 +14,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22260.2"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22261.14"
}
}