Update dependency files (#21560)

* Update dependencies from https://github.com/dotnet/arcade build 802

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.18615.1
- Microsoft.DotNet.Helix.Sdk - 1.0.0-beta.18615.1

* Update dependencies from https://github.com/dotnet/arcade build 817

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.18616.5
- Microsoft.DotNet.Helix.Sdk - 1.0.0-beta.18616.5

5 files changed, 25 insertions, 15 deletions

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b27431dc4a..10bc8f8485 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -2,13 +2,13 @@
 <Dependencies>
   <ProductDependencies></ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18614.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18616.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f30a96104c5be5720c74934d37d76b91959ec60d</Sha>
+      <Sha>8694eb83a2c13057a8da3c80f829363de4dc8c9c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18614.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18616.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f30a96104c5be5720c74934d37d76b91959ec60d</Sha>
+      <Sha>8694eb83a2c13057a8da3c80f829363de4dc8c9c</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh
index bd799af2a4..54b70f678b 100644
--- a/eng/common/init-tools-native.sh
+++ b/eng/common/init-tools-native.sh
@@ -10,7 +10,7 @@ force=false
 download_retries=5
 retry_wait_time_seconds=30
 global_json_file="${scriptroot}/../../global.json"
-declare -a native_assets
+declare -A native_assets
 
 . $scriptroot/native/common-library.sh
 
diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1
index 5810a746b1..b37fd3d5e9 100644
--- a/eng/common/msbuild.ps1
+++ b/eng/common/msbuild.ps1
@@ -24,4 +24,4 @@ catch {
   ExitWithExitCode 1
 }
 
-ExitWithExitCode 0
+ExitWithExitCode 0
\ No newline at end of file
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 416eb30c8c..a607ec6080 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -136,6 +136,11 @@ function InitializeDotNetCli([bool]$install) {
     $env:DOTNET_INSTALL_DIR = $dotnetRoot
   }
 
+  # Add dotnet to PATH. This prevents any bare invocation of dotnet in custom
+  # build steps from using anything other than what we've downloaded.
+  # It also ensures that VS msbuild will use the downloaded sdk targets.
+  $env:PATH = "$dotnetRoot;$env:PATH"
+
   return $global:_DotNetInstallDir = $dotnetRoot
 }
 
@@ -169,12 +174,13 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version) {
 # Returns full path to msbuild.exe.
 # Throws on failure.
 #
-function InitializeVisualStudioMSBuild([bool]$install) {
+function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $null) {
   if (Test-Path variable:global:_MSBuildExe) {
     return $global:_MSBuildExe
   }
 
-  $vsMinVersionStr = if (!$GlobalJson.tools.vs.version) { $GlobalJson.tools.vs.version } else { "15.9" }
+  if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
+  $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { "15.9" }
   $vsMinVersion = [Version]::new($vsMinVersionStr) 
 
   # Try msbuild command available in the environment.
@@ -191,7 +197,7 @@ function InitializeVisualStudioMSBuild([bool]$install) {
   }
 
   # Locate Visual Studio installation or download x-copy msbuild.
-  $vsInfo = LocateVisualStudio  
+  $vsInfo = LocateVisualStudio $vsRequirements
   if ($vsInfo -ne $null) {
     $vsInstallDir = $vsInfo.installationPath
     $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
@@ -255,7 +261,7 @@ function InstallXCopyMSBuild([string] $packageVersion) {
 # Returns JSON describing the located VS instance (same format as returned by vswhere), 
 # or $null if no instance meeting the requirements is found on the machine.
 #
-function LocateVisualStudio {
+function LocateVisualStudio([object]$vsRequirements = $null){
   if (Get-Member -InputObject $GlobalJson.tools -Name "vswhere") {
     $vswhereVersion = $GlobalJson.tools.vswhere
   } else {
@@ -271,16 +277,16 @@ function LocateVisualStudio {
     Invoke-WebRequest "https://github.com/Microsoft/vswhere/releases/download/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
   }
 
-  $vs = $GlobalJson.tools.vs
+  if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
   $args = @("-latest", "-prerelease", "-format", "json", "-requires", "Microsoft.Component.MSBuild")
   
-  if (Get-Member -InputObject $vs -Name "version") { 
+  if (Get-Member -InputObject $vsRequirements -Name "version") {
     $args += "-version"
-    $args += $vs.version
+    $args += $vsRequirements.version
   }
 
-  if (Get-Member -InputObject $vs -Name "components") { 
-    foreach ($component in $vs.components) {
+  if (Get-Member -InputObject $vsRequirements -Name "components") {
+    foreach ($component in $vsRequirements.components) {
       $args += "-requires"
       $args += $component
     }    
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 4d7e304f13..65f689775c 100644
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -136,6 +136,10 @@ function InitializeDotNetCli {
     fi
   fi
 
+  # Add dotnet to PATH. This prevents any bare invocation of dotnet in custom
+  # build steps from using anything other than what we've downloaded.
+  export PATH="$dotnet_root:$PATH"
+
   # return value
   _InitializeDotNetCli="$dotnet_root"
 }