Update dependencies from https://github.com/dotnet/arcade build 20191211.6 (#7957)

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19611.6

eng/Version.Details.xml

@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19608.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19611.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>71ce4c736b882e6112b395a0e92313be5dcb4328</Sha>
+      <Sha>71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/common/tools.ps1

@@ -98,7 +98,7 @@ function Exec-Process([string]$command, [string]$commandArgs) {
   }
 }
 
-function InitializeDotNetCli([bool]$install) {
+function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
   if (Test-Path variable:global:_DotNetInstallDir) {
     return $global:_DotNetInstallDir
   }
@@ -146,6 +146,22 @@ function InitializeDotNetCli([bool]$install) {
     }
 
     $env:DOTNET_INSTALL_DIR = $dotnetRoot
+
+    if ($createSdkLocationFile) {
+      # Create a temporary file under the toolset dir and rename it to sdk.txt to avoid races.
+      do { 
+        $sdkCacheFileTemp = Join-Path $ToolsetDir $([System.IO.Path]::GetRandomFileName())
+      } 
+      until (!(Test-Path $sdkCacheFileTemp))
+      Set-Content -Path $sdkCacheFileTemp -Value $dotnetRoot
+
+      try {
+        Rename-Item -Force -Path $sdkCacheFileTemp 'sdk.txt'
+      } catch {
+        # Somebody beat us
+        Remove-Item -Path $sdkCacheFileTemp
+      }
+    }
   }
 
   # Add dotnet to PATH. This prevents any bare invocation of dotnet in custom
@@ -216,7 +232,10 @@ function InstallDotNet([string] $dotnetRoot,
       }
       catch {
         Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet runtime '$runtime' from custom location '$runtimeSourceFeed'."
+        ExitWithExitCode 1
       }
+    } else {
+      ExitWithExitCode 1
     }
   }
 }
@@ -274,8 +293,11 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
       $vsMajorVersion = $vsMinVersion.Major
       $xcopyMSBuildVersion = "$vsMajorVersion.$($vsMinVersion.Minor).0-alpha"
     }
-
-    $vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install
+    
+    $vsInstallDir = $null
+    if ($xcopyMSBuildVersion.Trim() -ine "none") {
+        $vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install
+    }
     if ($vsInstallDir -eq $null) {
       throw 'Unable to find Visual Studio that has required version and components installed'
     }

eng/common/tools.sh

@@ -211,6 +211,8 @@ function InstallDotNet {
           Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')."
           ExitWithExitCode $exit_code
         }
+      else
+        ExitWithExitCode $exit_code
       fi
     fi
   }

global.json

@@ -10,7 +10,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19608.1",
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19611.6",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
   }
 }