Skip to content

Commit ef528e5

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[master] Update dependencies from dotnet/arcade mono/linker dotnet/xharness (#36445)
* Update dependencies from https://github.com/dotnet/arcade build 20200511.9 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.GenFacades From Version 5.0.0-beta.20258.8 -> To Version 5.0.0-beta.20261.9 * Update dependencies from https://github.com/mono/linker build 20200514.1 Microsoft.NET.ILLink.Tasks From Version 5.0.0-preview.3.20262.1 -> To Version 5.0.0-preview.3.20264.1 * Update dependencies from https://github.com/dotnet/xharness build 20200514.1 Microsoft.DotNet.XHarness.Tests.Runners From Version 1.0.0-prerelease.20263.4 -> To Version 1.0.0-prerelease.20264.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent f53c156 commit ef528e5

File tree

4 files changed

+65
-55
lines changed

4 files changed

+65
-55
lines changed

‎eng/Version.Details.xml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,61 +6,61 @@
66
</Dependency>
77
</ProductDependencies>
88
<ToolsetDependencies>
9-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20258.8">
9+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20261.9">
1010
<Uri>https://github.com/dotnet/arcade</Uri>
11-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
11+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20258.8">
13+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20261.9">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
15+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20258.8">
17+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20261.9">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
19+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20258.8">
21+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20261.9">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
23+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20258.8">
25+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20261.9">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
27+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20258.8">
29+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20261.9">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
31+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20258.8">
33+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20261.9">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
35+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20258.8">
37+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20261.9">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
39+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20258.8">
41+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20261.9">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
43+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20258.8">
45+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20261.9">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
47+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20258.8">
49+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20261.9">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
51+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20258.8">
53+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20261.9">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
55+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20258.8">
57+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20261.9">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
59+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20258.8">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20261.9">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355</Sha>
63+
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
6464
</Dependency>
6565
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
6666
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -170,13 +170,13 @@
170170
<Uri>https://github.com/dotnet/runtime</Uri>
171171
<Sha>0375524a91a47ca4db3ee1be548f74bab7e26e76</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-preview.3.20262.1">
173+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-preview.3.20264.1">
174174
<Uri>https://github.com/mono/linker</Uri>
175-
<Sha>df72dcfc27e27735c84c68507426a568799b66e9</Sha>
175+
<Sha>e9f0009b3bd7e42fdc7db6e416b9182828006309</Sha>
176176
</Dependency>
177-
<Dependency Name="Microsoft.DotNet.XHarness.Tests.Runners" Version="1.0.0-prerelease.20263.4">
177+
<Dependency Name="Microsoft.DotNet.XHarness.Tests.Runners" Version="1.0.0-prerelease.20264.1">
178178
<Uri>https://github.com/dotnet/xharness</Uri>
179-
<Sha>1111899797c23fe4039cad22afd640522519306d</Sha>
179+
<Sha>c6fd4f291bfc2a8dfb7d46577959e3a9ba0fa132</Sha>
180180
</Dependency>
181181
</ToolsetDependencies>
182182
</Dependencies>

‎eng/Versions.props‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@
5757
</ItemGroup>
5858
<PropertyGroup>
5959
<!-- Arcade dependencies -->
60-
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20258.8</MicrosoftDotNetApiCompatVersion>
61-
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20258.8</MicrosoftDotNetBuildTasksFeedVersion>
62-
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20258.8</MicrosoftDotNetCodeAnalysisVersion>
63-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20258.8</MicrosoftDotNetGenAPIVersion>
64-
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20258.8</MicrosoftDotNetGenFacadesVersion>
65-
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20258.8</MicrosoftDotNetXUnitExtensionsVersion>
66-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20258.8</MicrosoftDotNetXUnitConsoleRunnerVersion>
67-
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20258.8</MicrosoftDotNetBuildTasksPackagingVersion>
68-
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20258.8</MicrosoftDotNetRemoteExecutorVersion>
69-
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20258.8</MicrosoftDotNetVersionToolsTasksVersion>
60+
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20261.9</MicrosoftDotNetApiCompatVersion>
61+
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20261.9</MicrosoftDotNetBuildTasksFeedVersion>
62+
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20261.9</MicrosoftDotNetCodeAnalysisVersion>
63+
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20261.9</MicrosoftDotNetGenAPIVersion>
64+
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20261.9</MicrosoftDotNetGenFacadesVersion>
65+
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20261.9</MicrosoftDotNetXUnitExtensionsVersion>
66+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20261.9</MicrosoftDotNetXUnitConsoleRunnerVersion>
67+
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20261.9</MicrosoftDotNetBuildTasksPackagingVersion>
68+
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20261.9</MicrosoftDotNetRemoteExecutorVersion>
69+
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20261.9</MicrosoftDotNetVersionToolsTasksVersion>
7070
<!-- Installer dependencies -->
7171
<MicrosoftNETCoreAppVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreAppVersion>
7272
<MicrosoftNETCoreDotNetHostVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreDotNetHostVersion>
@@ -113,7 +113,7 @@
113113
<SystemDataSqlClientVersion>4.8.0</SystemDataSqlClientVersion>
114114
<!-- Testing -->
115115
<MicrosoftNETTestSdkVersion>16.7.0-preview-20200429-01</MicrosoftNETTestSdkVersion>
116-
<MicrosoftDotNetXHarnessTestsRunnersVersion>1.0.0-prerelease.20263.4</MicrosoftDotNetXHarnessTestsRunnersVersion>
116+
<MicrosoftDotNetXHarnessTestsRunnersVersion>1.0.0-prerelease.20264.1</MicrosoftDotNetXHarnessTestsRunnersVersion>
117117
<XUnitVersion>2.4.1</XUnitVersion>
118118
<CoverletCollectorVersion>1.2.1</CoverletCollectorVersion>
119119
<TraceEventVersion>2.0.5</TraceEventVersion>
@@ -122,7 +122,7 @@
122122
<!-- Docs -->
123123
<MicrosoftPrivateIntellisenseVersion>3.1.0-preview-20200129.1</MicrosoftPrivateIntellisenseVersion>
124124
<!-- ILLink -->
125-
<MicrosoftNETILLinkTasksVersion>5.0.0-preview.3.20262.1</MicrosoftNETILLinkTasksVersion>
125+
<MicrosoftNETILLinkTasksVersion>5.0.0-preview.3.20264.1</MicrosoftNETILLinkTasksVersion>
126126
<!-- Mono LLVM -->
127127
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20262.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
128128
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20262.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>

‎eng/common/native/CommonLibrary.psm1‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,12 @@ function Get-File {
145145
New-Item -path $DownloadDirectory -force -itemType "Directory" | Out-Null
146146
}
147147

148+
$TempPath = "$Path.tmp"
148149
if (Test-Path -IsValid -Path $Uri) {
149-
Write-Verbose "'$Uri' is a file path, copying file to '$Path'"
150-
Copy-Item -Path $Uri -Destination $Path
150+
Write-Verbose "'$Uri' is a file path, copying temporarily to '$TempPath'"
151+
Copy-Item -Path $Uri -Destination $TempPath
152+
Write-Verbose "Moving temporary file to '$Path'"
153+
Move-Item -Path $TempPath -Destination $Path
151154
return $?
152155
}
153156
else {
@@ -157,8 +160,10 @@ function Get-File {
157160
while($Attempt -Lt $DownloadRetries)
158161
{
159162
try {
160-
Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $Path
161-
Write-Verbose "Downloaded to '$Path'"
163+
Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $TempPath
164+
Write-Verbose "Downloaded to temporary location '$TempPath'"
165+
Move-Item -Path $TempPath -Destination $Path
166+
Write-Verbose "Moved temporary file to '$Path'"
162167
return $True
163168
}
164169
catch {
@@ -359,16 +364,21 @@ function Expand-Zip {
359364
return $False
360365
}
361366
}
362-
if (-Not (Test-Path $OutputDirectory)) {
363-
New-Item -path $OutputDirectory -Force -itemType "Directory" | Out-Null
367+
368+
$TempOutputDirectory = Join-Path "$(Split-Path -Parent $OutputDirectory)" "$(Split-Path -Leaf $OutputDirectory).tmp"
369+
if (Test-Path $TempOutputDirectory) {
370+
Remove-Item $TempOutputDirectory -Force -Recurse
364371
}
372+
New-Item -Path $TempOutputDirectory -Force -ItemType "Directory" | Out-Null
365373

366374
Add-Type -assembly "system.io.compression.filesystem"
367-
[io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$OutputDirectory")
375+
[io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$TempOutputDirectory")
368376
if ($? -Eq $False) {
369377
Write-Error "Unable to extract '$ZipPath'"
370378
return $False
371379
}
380+
381+
Move-Item -Path $TempOutputDirectory -Destination $OutputDirectory
372382
}
373383
catch {
374384
Write-Host $_

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"python3": "3.7.1"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20258.8",
16-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20258.8",
17-
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20258.8",
18-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20258.8",
15+
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20261.9",
16+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20261.9",
17+
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20261.9",
18+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20261.9",
1919
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2020
"Microsoft.NET.Sdk.IL": "5.0.0-preview.4.20202.18",
2121
"Microsoft.Build.NoTargets": "1.0.53",

0 commit comments

Comments
 (0)