diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cd35c4340f982..668b9bba02fb9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,61 +6,61 @@ - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d - + https://github.com/dotnet/arcade - 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355 + 898e51ed5fdcc4871087ac5754ca9056e58e575d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -170,13 +170,13 @@ https://github.com/dotnet/runtime 0375524a91a47ca4db3ee1be548f74bab7e26e76 - + https://github.com/mono/linker - df72dcfc27e27735c84c68507426a568799b66e9 + e9f0009b3bd7e42fdc7db6e416b9182828006309 - + https://github.com/dotnet/xharness - 1111899797c23fe4039cad22afd640522519306d + c6fd4f291bfc2a8dfb7d46577959e3a9ba0fa132 diff --git a/eng/Versions.props b/eng/Versions.props index 1fc593d2792ea3..3588f19c0d159c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,16 +57,16 @@ - 5.0.0-beta.20258.8 - 5.0.0-beta.20258.8 - 5.0.0-beta.20258.8 - 5.0.0-beta.20258.8 - 5.0.0-beta.20258.8 - 5.0.0-beta.20258.8 - 2.5.1-beta.20258.8 - 5.0.0-beta.20258.8 - 5.0.0-beta.20258.8 - 5.0.0-beta.20258.8 + 5.0.0-beta.20261.9 + 5.0.0-beta.20261.9 + 5.0.0-beta.20261.9 + 5.0.0-beta.20261.9 + 5.0.0-beta.20261.9 + 5.0.0-beta.20261.9 + 2.5.1-beta.20261.9 + 5.0.0-beta.20261.9 + 5.0.0-beta.20261.9 + 5.0.0-beta.20261.9 5.0.0-preview.4.20202.18 5.0.0-preview.4.20202.18 @@ -113,7 +113,7 @@ 4.8.0 16.7.0-preview-20200429-01 - 1.0.0-prerelease.20263.4 + 1.0.0-prerelease.20264.1 2.4.1 1.2.1 2.0.5 @@ -122,7 +122,7 @@ 3.1.0-preview-20200129.1 - 5.0.0-preview.3.20262.1 + 5.0.0-preview.3.20264.1 9.0.1-alpha.1.20262.1 9.0.1-alpha.1.20262.1 diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1 index 41416862d9132f..d7d1a6510949af 100644 --- a/eng/common/native/CommonLibrary.psm1 +++ b/eng/common/native/CommonLibrary.psm1 @@ -145,9 +145,12 @@ function Get-File { New-Item -path $DownloadDirectory -force -itemType "Directory" | Out-Null } + $TempPath = "$Path.tmp" if (Test-Path -IsValid -Path $Uri) { - Write-Verbose "'$Uri' is a file path, copying file to '$Path'" - Copy-Item -Path $Uri -Destination $Path + Write-Verbose "'$Uri' is a file path, copying temporarily to '$TempPath'" + Copy-Item -Path $Uri -Destination $TempPath + Write-Verbose "Moving temporary file to '$Path'" + Move-Item -Path $TempPath -Destination $Path return $? } else { @@ -157,8 +160,10 @@ function Get-File { while($Attempt -Lt $DownloadRetries) { try { - Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $Path - Write-Verbose "Downloaded to '$Path'" + Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $TempPath + Write-Verbose "Downloaded to temporary location '$TempPath'" + Move-Item -Path $TempPath -Destination $Path + Write-Verbose "Moved temporary file to '$Path'" return $True } catch { @@ -359,16 +364,21 @@ function Expand-Zip { 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" - [io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$OutputDirectory") + [io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$TempOutputDirectory") if ($? -Eq $False) { Write-Error "Unable to extract '$ZipPath'" return $False } + + Move-Item -Path $TempOutputDirectory -Destination $OutputDirectory } catch { Write-Host $_ diff --git a/global.json b/global.json index e4fb17844fd35e..1f55cf7ca46f2f 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20258.8", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20258.8", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20258.8", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20258.8", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20261.9", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20261.9", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20261.9", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20261.9", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.4.20202.18", "Microsoft.Build.NoTargets": "1.0.53",