[master] Update dependencies from dotnet/arcade (#719)

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

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

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

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

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 68e941403a729edcbc328488f7b0717cf235db84..2a9fc634ed218627cc0e5d484eae8f00104ee455 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="5.0.0-beta.19615.1">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19629.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>77698ebba1ab096ad9580a5d9ebefe0499ba00ce</Sha>
+      <Sha>f40849c5bbdfd1f1b99801f5a40343f8d4a192c9</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19615.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19629.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>77698ebba1ab096ad9580a5d9ebefe0499ba00ce</Sha>
+      <Sha>f40849c5bbdfd1f1b99801f5a40343f8d4a192c9</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 3fba42b94659c455a2213dd2c5ecde9e767e3792..41c92569ea02d26c01483d69ccf3cb3b77f2dadc 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -38,7 +38,7 @@
     <SystemMemoryVersion>4.5.3</SystemMemoryVersion>
     <XUnitVersion>2.4.1</XUnitVersion>
     <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19615.1</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19629.1</MicrosoftDotNetRemoteExecutorVersion>
     <cdbsosversion>10.0.18362</cdbsosversion>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml
index 8903ba57c00642e47a89be31585bbf37927bdca0..f91751fe78e17eca4ce714bac58740d476b97a25 100644 (file)
--- a/eng/common/templates/steps/publish-logs.yml
+++ b/eng/common/templates/steps/publish-logs.yml
@@ -18,6 +18,6 @@ steps:
   inputs:
     PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs'
     PublishLocation: Container
-    ArtifactName: PostBuilLogs
+    ArtifactName: PostBuildLogs
   continueOnError: true
   condition: always()

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 09c3a3325eac7b7e0a2b91a37b4e0dbb83dec1e1..d3a432878e2167979b469effee13ffa597a0f565 100644 (file)
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -98,6 +98,9 @@ function Exec-Process([string]$command, [string]$commandArgs) {
   }
 }
 
+# createSdkLocationFile parameter enables a file being generated under the toolset directory
+# which writes the sdk's location into. This is only necessary for cmd --> powershell invocations
+# as dot sourcing isn't possible.
 function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
   if (Test-Path variable:global:_DotNetInstallDir) {
     return $global:_DotNetInstallDir
@@ -146,21 +149,23 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
     }
 
     $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
-      }
+  # Creates a temporary file under the toolset dir.
+  # The following code block is protecting against concurrent access so that this function can
+  # be called in parallel.
+  if ($createSdkLocationFile) {
+    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
     }
   }
 

diff --git a/global.json b/global.json
index bc3abbd6dcb13bf157c29cb109334e47d9a03c2d..7509420c879834d7eb6aa3289544facb967f25a3 100644 (file)
--- a/global.json
+++ b/global.json
@@ -3,6 +3,6 @@
     "dotnet": "3.0.101"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19615.1"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19629.1"
   }
 }