Update dependencies from https://github.com/dotnet/arcade build 20221…

…010.3 (#2644) [release/3.1.4xx] Update dependencies from dotnet/arcade
dotnet · Oct 11, 2022 · d5f782c · d5f782c
1 parent 2512dbc
commit d5f782c
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 46 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -19,13 +19,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22507.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22510.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>04a9873936e31619e347ed731c91d70a2413d691</Sha>
+      <Sha>b060d20cfdec48c2576334f6009e4c0031560885</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.22507.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.22510.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>04a9873936e31619e347ed731c91d70a2413d691</Sha>
+      <Sha>b060d20cfdec48c2576334f6009e4c0031560885</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
@@ -120,52 +120,61 @@ try {
         $NativeTools.PSObject.Properties | ForEach-Object {
           $ToolName = $_.Name
           $ToolVersion = $_.Value
-          $LocalInstallerArguments =  @{ ToolName = "$ToolName" }
-          $LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
-          $LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
-          $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
-          $LocalInstallerArguments += @{ Version = "$ToolVersion" }
-
-          if ($Verbose) {
-            $LocalInstallerArguments += @{ Verbose = $True }
-          }
-          if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
-            if($Force) {
-              $LocalInstallerArguments += @{ Force = $True }
-            }
-          }
-          if ($Clean) {
-            $LocalInstallerArguments += @{ Clean = $True }
+
+          if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
+            Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding."
           }
-
-          Write-Verbose "Installing $ToolName version $ToolVersion"
-          Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
-          & $InstallerPath @LocalInstallerArguments
-          if ($LASTEXITCODE -Ne "0") {
-            $errMsg = "$ToolName installation failed"
-            if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
-                $showNativeToolsWarning = $true
-                if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
-                    $showNativeToolsWarning = $false
-                }
-                if ($showNativeToolsWarning) {
-                    Write-Warning $errMsg
-                }
-                $toolInstallationFailure = $true
-            } else {
-                Write-Error $errMsg
-                exit 1
-            }
+        }
+        exit 0
+      }
+    } else {
+      $NativeTools.PSObject.Properties | ForEach-Object {
+        $ToolName = $_.Name
+        $ToolVersion = $_.Value
+        $LocalInstallerArguments =  @{ ToolName = "$ToolName" }
+        $LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
+        $LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
+        $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
+        $LocalInstallerArguments += @{ Version = "$ToolVersion" }
+
+        if ($Verbose) {
+          $LocalInstallerArguments += @{ Verbose = $True }
+        }
+        if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
+          if($Force) {
+            $LocalInstallerArguments += @{ Force = $True }
           }
         }
-
-        if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
-            exit 1
+        if ($Clean) {
+          $LocalInstallerArguments += @{ Clean = $True }
         }
+
+        Write-Verbose "Installing $ToolName version $ToolVersion"
+        Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
+        & $InstallerPath @LocalInstallerArguments
+        if ($LASTEXITCODE -Ne "0") {
+          $errMsg = "$ToolName installation failed"
+          if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
+              $showNativeToolsWarning = $true
+              if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
+                  $showNativeToolsWarning = $false
+              }
+              if ($showNativeToolsWarning) {
+                  Write-Warning $errMsg
+              }
+              $toolInstallationFailure = $true
+          } else {
+              Write-Error $errMsg
+              exit 1
+          }
+        }
+      }
+
+      if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
+          exit 1
       }
     }
-  }
-  else {
+  } else {
     Write-Host "No native tools defined in global.json"
     exit 0
   }

diff --git a/global.json b/global.json
@@ -3,8 +3,8 @@
     "dotnet": "5.0.100-rc.2.20479.15"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22507.3",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.22507.3"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22510.3",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.22510.3"
   },
   "native-tools": {
     "python3": "3.7.1"