From 01c1cd2a7db762bc42dca2f676abcdfb6e412b44 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 12 May 2022 13:23:31 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20220511.14 (#2434)

[main] Update dependencies from dotnet/arcade
---
 eng/Version.Details.xml          |  8 ++++----
 eng/common/init-tools-native.ps1 | 11 ++++++-----
 global.json                      |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 61c2f981b83..a86f1e7ba84 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -19,13 +19,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22260.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22261.14">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6baad99219dda29b3c8efd7d627393cda4b38372</Sha>
+      <Sha>666b83fa183306e9adec817c903ec93da2a4703c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22260.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22261.14">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6baad99219dda29b3c8efd7d627393cda4b38372</Sha>
+      <Sha>666b83fa183306e9adec817c903ec93da2a4703c</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
index 413adea4365..24a5e65de1b 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 c70a87c745b..dd71c0adf68 100644
--- a/global.json
+++ b/global.json
@@ -3,8 +3,8 @@
     "dotnet": "7.0.100-preview.2.22153.17"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22260.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22260.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22261.14",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22261.14"
   },
   "native-tools": {
     "python3": "3.7.1"