From f05c1cde2892146b683c2bae548d40885deef831 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 13 May 2022 05:53:38 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20220511.14 (#13831)

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

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a0176bc73..3a508bb8b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -192,19 +192,19 @@
     </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>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22260.2">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22261.14">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6baad99219dda29b3c8efd7d627393cda4b38372</Sha>
+      <Sha>666b83fa183306e9adec817c903ec93da2a4703c</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22260.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22261.14">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6baad99219dda29b3c8efd7d627393cda4b38372</Sha>
+      <Sha>666b83fa183306e9adec817c903ec93da2a4703c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22261.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 5dc523cdd..b8fe00a6d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -26,7 +26,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22260.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22261.14</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
index 413adea43..24a5e65de 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 1c89dfe61..a95f99e53 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
     "cmake": "3.16.4"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22260.2",
-    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22260.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22261.14",
+    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22261.14"
   }
 }