From b55b7c1bd569252bc1b550f4d4c8cf4e67cf048a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 30 Sep 2022 12:25:51 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20220929.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.22478.2 -> To Version 8.0.0-beta.22479.2

Dependency coherency updates

Microsoft.SourceLink.GitHub
 From Version 1.2.0-beta-22477-01 -> To Version 1.2.0-beta-22478-02 (parent: Microsoft.DotNet.Arcade.Sdk
---
 eng/Version.Details.xml          | 16 ++++++++--------
 eng/Versions.props               |  2 +-
 eng/common/init-tools-native.ps1 |  1 +
 global.json                      |  4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2d9421fe5..31d95901f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -193,18 +193,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22478.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22479.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>839e1e3b415fc2747dde68f47d940faa414020ec</Sha>
+      <Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22478.2">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22479.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>839e1e3b415fc2747dde68f47d940faa414020ec</Sha>
+      <Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22478.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22479.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>839e1e3b415fc2747dde68f47d940faa414020ec</Sha>
+      <Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22462.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -219,9 +219,9 @@
       <Sha>a7794a9e26ec88739e3cfc9825cb107d53a7e6f9</Sha>
       <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22477-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22478-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>50130a9bdd1a63b0cfaa1f267d3f7bff2ca7e631</Sha>
+      <Sha>9d3d07c9b25717607023b42a5a639117eadba860</Sha>
       <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22462.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
diff --git a/eng/Versions.props b/eng/Versions.props
index 9ed831116..b122e79c9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -26,7 +26,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22478.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22479.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
index ac42f04a9..fbc67effc 100644
--- a/eng/common/init-tools-native.ps1
+++ b/eng/common/init-tools-native.ps1
@@ -113,6 +113,7 @@ try {
             $ToolPath = Convert-Path -Path $BinPath
             Write-Host "Adding $ToolName to the path ($ToolPath)..."
             Write-Host "##vso[task.prependpath]$ToolPath"
+            $env:PATH = "$ToolPath;$env:PATH"
             $InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
           }
         }
diff --git a/global.json b/global.json
index 4d3e5152f..94c0f4800 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
     "cmake": "3.21.0"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22478.2",
-    "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22478.2"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22479.2",
+    "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22479.2"
   }
 }