Update dependencies from https://github.com/dotnet/arcade build 20191216.4 (#869)

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

2 files changed, 20 insertions, 15 deletions

diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml
index 8903ba57c..f91751fe7 100644
--- 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 09c3a3325..d3a432878 100644
--- 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
     }
   }