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

dotnet-maestro[bot] · brettfo · commit d68942f26a6c · 2019-12-12T10:29:14.000-08:00
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19611.6
diff --git a/eng/Version.Details.xml b/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>
diff --git a/eng/common/tools.ps1 b/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'
     }
diff --git a/eng/common/tools.sh b/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
   }
diff --git a/global.json b/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"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ function Exec-Process([string]$command, [string]$commandArgs) {`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`-function InitializeDotNetCli([bool]$install) {`
	`101`	`+function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {`
`102`	`102`	`if (Test-Path variable:global:_DotNetInstallDir) {`
`103`	`103`	`return $global:_DotNetInstallDir`
`104`	`104`	`}`
`@@ -146,6 +146,22 @@ function InitializeDotNetCli([bool]$install) {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`$env:DOTNET_INSTALL_DIR = $dotnetRoot`
	`149`	`+`
	`150`	`+ if ($createSdkLocationFile) {`
	`151`	`+ # Create a temporary file under the toolset dir and rename it to sdk.txt to avoid races.`
	`152`	`+ do {`
	`153`	`+ $sdkCacheFileTemp = Join-Path $ToolsetDir $([System.IO.Path]::GetRandomFileName())`
	`154`	`+ }`
	`155`	`+ until (!(Test-Path $sdkCacheFileTemp))`
	`156`	`+ Set-Content -Path $sdkCacheFileTemp -Value $dotnetRoot`
	`157`	`+`
	`158`	`+ try {`
	`159`	`+ Rename-Item -Force -Path $sdkCacheFileTemp 'sdk.txt'`
	`160`	`+ } catch {`
	`161`	`+ # Somebody beat us`
	`162`	`+ Remove-Item -Path $sdkCacheFileTemp`
	`163`	`+ }`
	`164`	`+ }`
`149`	`165`	`}`
`150`	`166`
`151`	`167`	`# Add dotnet to PATH. This prevents any bare invocation of dotnet in custom`
`@@ -216,7 +232,10 @@ function InstallDotNet([string] $dotnetRoot,`
`216`	`232`	`}`
`217`	`233`	`catch {`
`218`	`234`	`Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet runtime '$runtime' from custom location '$runtimeSourceFeed'."`
	`235`	`+ ExitWithExitCode 1`
`219`	`236`	`}`
	`237`	`+ } else {`
	`238`	`+ ExitWithExitCode 1`
`220`	`239`	`}`
`221`	`240`	`}`
`222`	`241`	`}`
`@@ -274,8 +293,11 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =`
`274`	`293`	`$vsMajorVersion = $vsMinVersion.Major`
`275`	`294`	`$xcopyMSBuildVersion = "$vsMajorVersion.$($vsMinVersion.Minor).0-alpha"`
`276`	`295`	`}`
`277`		`-`
`278`		`- $vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install`
	`296`	`+`
	`297`	`+ $vsInstallDir = $null`
	`298`	`+ if ($xcopyMSBuildVersion.Trim() -ine "none") {`
	`299`	`+ $vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install`
	`300`	`+ }`
`279`	`301`	`if ($vsInstallDir -eq $null) {`
`280`	`302`	`throw 'Unable to find Visual Studio that has required version and components installed'`
`281`	`303`	`}`
Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,8 @@ function InstallDotNet {`
`211`	`211`	`Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')."`
`212`	`212`	`ExitWithExitCode $exit_code`
`213`	`213`	`}`
	`214`	`+ else`
	`215`	`+ ExitWithExitCode $exit_code`
`214`	`216`	`fi`
`215`	`217`	`fi`
`216`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`"msbuild-sdks": {`
`13`		`- "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19608.1",`
	`13`	`+ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19611.6",`
`14`	`14`	`"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"`
`15`	`15`	`}`
`16`	`16`	`}`