mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update dependencies from https://github.com/dotnet/arcade build 20200511.9 (#7476)

Browse source 
Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20258.8 -> To Version 5.0.0-beta.20261.9

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
dotnet-maestro[bot] 2020-05-14 12:52:27 +00:00 committed by GitHub
parent 031360d1d7
commit 19f450c831
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -104,9 +104,9 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20258.8"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20261.9">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha> <Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

24
eng/common/native/CommonLibrary.psm1
View file

@ -145,9 +145,12 @@ function Get-File {
New-Item -path $DownloadDirectory -force -itemType "Directory" | Out-Null New-Item -path $DownloadDirectory -force -itemType "Directory" | Out-Null
} }
$TempPath = "$Path.tmp"
if (Test-Path -IsValid -Path $Uri) { if (Test-Path -IsValid -Path $Uri) {
Write-Verbose "'$Uri' is a file path, copying file to '$Path'" Write-Verbose "'$Uri' is a file path, copying temporarily to '$TempPath'"
Copy-Item -Path $Uri -Destination $Path Copy-Item -Path $Uri -Destination $TempPath
Write-Verbose "Moving temporary file to '$Path'"
Move-Item -Path $TempPath -Destination $Path
return $? return $?
} }
else { else {
@ -157,8 +160,10 @@ function Get-File {
while($Attempt -Lt $DownloadRetries) while($Attempt -Lt $DownloadRetries)
{ {
try { try {
Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $Path Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $TempPath
Write-Verbose "Downloaded to '$Path'" Write-Verbose "Downloaded to temporary location '$TempPath'"
Move-Item -Path $TempPath -Destination $Path
Write-Verbose "Moved temporary file to '$Path'"
return $True return $True
} }
catch { catch {
@ -359,16 +364,21 @@ function Expand-Zip {
return $False return $False
} }
} }
if (-Not (Test-Path $OutputDirectory)) {
New-Item -path $OutputDirectory -Force -itemType "Directory" | Out-Null $TempOutputDirectory = Join-Path "$(Split-Path -Parent $OutputDirectory)" "$(Split-Path -Leaf $OutputDirectory).tmp"
if (Test-Path $TempOutputDirectory) {
Remove-Item $TempOutputDirectory -Force -Recurse
} }
New-Item -Path $TempOutputDirectory -Force -ItemType "Directory" | Out-Null
Add-Type -assembly "system.io.compression.filesystem" Add-Type -assembly "system.io.compression.filesystem"
[io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$OutputDirectory") [io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$TempOutputDirectory")
if ($? -Eq $False) { if ($? -Eq $False) {
Write-Error "Unable to extract '$ZipPath'" Write-Error "Unable to extract '$ZipPath'"
return $False return $False
} }
Move-Item -Path $TempOutputDirectory -Destination $OutputDirectory
} }
catch { catch {
Write-Host $_ Write-Host $_

2
global.json
View file

@ -8,6 +8,6 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20258.8" "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20261.9"
} }
} }