Update dependencies from https://github.com/dotnet/arcade build 20191213.1 (#694)

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19613.1
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.19613.1

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1a7b99b5a53f4fe54df6fd5dd8769dbe19bdc4c9..e5c086eb81cf8e272b2a6d42c76b2cde1db5db1c 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -4,15 +4,15 @@
       <Uri>https://github.com/dotnet/command-line-api</Uri>
       <Sha>166610c56ff732093f0145a2911d4f6c40b786da</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="&gt;5.0.0-beta.19562.5">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19613.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>993af9410c505680b9a260f3bfd79515c936de12</Sha>
+      <Sha>acd18a717ab18e484addef602e2af2b2bc4c4bd1</Sha>
     </Dependency>
   </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.19613.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>71ce4c736b882e6112b395a0e92313be5dcb4328</Sha>
+      <Sha>acd18a717ab18e484addef602e2af2b2bc4c4bd1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha.1.19564.1">
       <Uri>https://github.com/dotnet/core-setup</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
index fbf10ae24e88be4c6706f4a45c1c1e3816adef73..2134ee4093fd4b431854c04834c142e4286bd97e 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -41,7 +41,7 @@
     <SystemMemoryVersion>4.5.3</SystemMemoryVersion>
     <XUnitVersion>2.4.1</XUnitVersion>
     <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19562.5</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19613.1</MicrosoftDotNetRemoteExecutorVersion>
     <cdbsosversion>10.0.18362</cdbsosversion>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index d762c9f044a652d2e9dc199a1cbc4a3c3373268a..09c3a3325eac7b7e0a2b91a37b4e0dbb83dec1e1 100644 (file)
--- 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
index f58db5e25d16fb7cfc3a70af2794f5f540c374c3..e071af4ee494e9b1bbe2b191b51de580f35818ab 100644 (file)
--- 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
index 43d26258cb7843ad29a1ca2a4fd9421c4898d92d..02300a96d3117208e33f661447e0805500f3745d 100644 (file)
--- a/global.json
+++ b/global.json
@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "version": "3.0.100"
+    "version": "3.0.101"
   },
   "tools": {
-    "dotnet": "3.0.100"
+    "dotnet": "3.0.101"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19608.1"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19613.1"
   }
 }