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

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19616.4
This commit is contained in:
dotnet-maestro[bot] 2019-12-17 13:31:15 +00:00 committed by GitHub
parent a58fae07a8
commit 1e27202991
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 18 deletions

View file

@ -104,9 +104,9 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <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.19616.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>77698ebba1ab096ad9580a5d9ebefe0499ba00ce</Sha> <Sha>4736ddca60a4040447b450437cf3767c9045edc0</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

View file

@ -18,6 +18,6 @@ steps:
inputs: inputs:
PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs'
PublishLocation: Container PublishLocation: Container
ArtifactName: PostBuilLogs ArtifactName: PostBuildLogs
continueOnError: true continueOnError: true
condition: always() condition: always()

View file

@ -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) { function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
if (Test-Path variable:global:_DotNetInstallDir) { if (Test-Path variable:global:_DotNetInstallDir) {
return $global:_DotNetInstallDir return $global:_DotNetInstallDir
@ -146,21 +149,23 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
} }
$env:DOTNET_INSTALL_DIR = $dotnetRoot $env:DOTNET_INSTALL_DIR = $dotnetRoot
}
if ($createSdkLocationFile) { # Creates a temporary file under the toolset dir.
# Create a temporary file under the toolset dir and rename it to sdk.txt to avoid races. # The following code block is protecting against concurrent access so that this function can
do { # be called in parallel.
$sdkCacheFileTemp = Join-Path $ToolsetDir $([System.IO.Path]::GetRandomFileName()) if ($createSdkLocationFile) {
} do {
until (!(Test-Path $sdkCacheFileTemp)) $sdkCacheFileTemp = Join-Path $ToolsetDir $([System.IO.Path]::GetRandomFileName())
Set-Content -Path $sdkCacheFileTemp -Value $dotnetRoot }
until (!(Test-Path $sdkCacheFileTemp))
try { Set-Content -Path $sdkCacheFileTemp -Value $dotnetRoot
Rename-Item -Force -Path $sdkCacheFileTemp 'sdk.txt'
} catch { try {
# Somebody beat us Rename-Item -Force -Path $sdkCacheFileTemp 'sdk.txt'
Remove-Item -Path $sdkCacheFileTemp } catch {
} # Somebody beat us
Remove-Item -Path $sdkCacheFileTemp
} }
} }

View file

@ -3,6 +3,6 @@
"dotnet": "5.0.100-alpha1-014915" "dotnet": "5.0.100-alpha1-014915"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19615.1" "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19616.4"
} }
} }