Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 9874469

Browse files
ViktorHoferViktorHofer
committed
Manual darc update from build '20191101.2'
1 parent 5654852 commit 9874469

File tree

5 files changed

+64
-67
lines changed

5 files changed

+64
-67
lines changed

‎eng/Version.Details.xml‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,85 +18,85 @@
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
21-
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha.1.19531.19">
21+
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0">
2222
<Uri>https://github.com/dotnet/core-setup</Uri>
23-
<Sha>14e7a3b2fb40b377562d3d3e739d471841ae3316</Sha>
23+
<Sha>df350a37f999379820ad8c3a602c4e13ad8a49ee</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="5.0.0-alpha.1.19531.19">
25+
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="3.0.0">
2626
<Uri>https://github.com/dotnet/core-setup</Uri>
27-
<Sha>14e7a3b2fb40b377562d3d3e739d471841ae3316</Sha>
27+
<Sha>df350a37f999379820ad8c3a602c4e13ad8a49ee</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="5.0.0-alpha.1.19531.19">
29+
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="3.0.0">
3030
<Uri>https://github.com/dotnet/core-setup</Uri>
31-
<Sha>14e7a3b2fb40b377562d3d3e739d471841ae3316</Sha>
31+
<Sha>df350a37f999379820ad8c3a602c4e13ad8a49ee</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha.1.19531.13">
33+
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview9.19409.15">
3434
<Uri>https://github.com/dotnet/corefx</Uri>
35-
<Sha>a24db0ba5666f46f50649810fe698ad267b60331</Sha>
35+
<Sha>976b84b4d969ce5d87bc437d811ec8864b47947a</Sha>
3636
</Dependency>
37-
<Dependency Name="runtime.native.System.IO.Ports" Version="5.0.0-alpha.1.19531.13">
37+
<Dependency Name="runtime.native.System.IO.Ports" Version="4.6.0-preview9.19409.15">
3838
<Uri>https://github.com/dotnet/corefx</Uri>
39-
<Sha>a24db0ba5666f46f50649810fe698ad267b60331</Sha>
39+
<Sha>976b84b4d969ce5d87bc437d811ec8864b47947a</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19531.14">
41+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19551.2">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
43+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
4444
</Dependency>
45-
<Dependency Name="NETStandard.Library" Version="2.2.0-prerelease.19531.1">
45+
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19421.5">
4646
<Uri>https://github.com/dotnet/standard</Uri>
47-
<Sha>a2bca7f4f89c899c2c0325c2790faf6f7d29870c</Sha>
47+
<Sha>6867b9e61af1e504f34542e8a10295532850e2fc</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19531.14">
49+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19551.2">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
51+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19531.14">
53+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19551.2">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
55+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19531.14">
57+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19551.2">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
59+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19531.14">
61+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19551.2">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
63+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19531.14">
65+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19551.2">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
67+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19531.14">
69+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19551.2">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
71+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19531.14">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19551.2">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
75+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19531.14">
77+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19551.2">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
79+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="5.0.0-beta.19531.14">
81+
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="5.0.0-beta.19551.2">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
83+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19531.14">
85+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19551.2">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
87+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19531.14">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19551.2">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
91+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19531.14">
93+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19551.2">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
95+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19531.14">
97+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19551.2">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
99+
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
100100
</Dependency>
101101
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
102102
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,29 @@
2929
</PropertyGroup>
3030
<PropertyGroup>
3131
<!-- Arcade dependencies -->
32-
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.19530.15</MicrosoftDotNetApiCompatVersion>
33-
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19530.15</MicrosoftDotNetCodeAnalysisVersion>
34-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.19530.15</MicrosoftDotNetGenAPIVersion>
35-
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19530.15</MicrosoftDotNetGenFacadesVersion>
36-
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19530.15</MicrosoftDotNetXUnitExtensionsVersion>
37-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19530.15</MicrosoftDotNetXUnitConsoleRunnerVersion>
38-
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19530.15</MicrosoftDotNetBuildTasksPackagingVersion>
39-
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19530.15</MicrosoftDotNetRemoteExecutorVersion>
40-
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19530.15</MicrosoftDotNetBuildTasksFeedVersion>
41-
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19530.15</MicrosoftDotNetVersionToolsTasksVersion>
32+
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.19551.2</MicrosoftDotNetApiCompatVersion>
33+
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19551.2</MicrosoftDotNetCodeAnalysisVersion>
34+
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.19551.2</MicrosoftDotNetGenAPIVersion>
35+
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19551.2</MicrosoftDotNetGenFacadesVersion>
36+
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19551.2</MicrosoftDotNetXUnitExtensionsVersion>
37+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19551.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
38+
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19551.2</MicrosoftDotNetBuildTasksPackagingVersion>
39+
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19551.2</MicrosoftDotNetRemoteExecutorVersion>
40+
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19551.2</MicrosoftDotNetBuildTasksFeedVersion>
41+
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19551.2</MicrosoftDotNetVersionToolsTasksVersion>
4242
<!-- Core-setup dependencies -->
43-
<MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19530.10</MicrosoftNETCoreAppVersion>
44-
<MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19530.10</MicrosoftNETCoreDotNetHostVersion>
45-
<MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19530.10</MicrosoftNETCoreDotNetHostPolicyVersion>
43+
<MicrosoftNETCoreAppVersion>3.0.0</MicrosoftNETCoreAppVersion>
44+
<MicrosoftNETCoreDotNetHostVersion>3.0.0</MicrosoftNETCoreDotNetHostVersion>
45+
<MicrosoftNETCoreDotNetHostPolicyVersion>3.0.0</MicrosoftNETCoreDotNetHostPolicyVersion>
4646
<!-- Coreclr dependencies -->
4747
<MicrosoftNETCoreILAsmVersion>5.0.0-alpha1.19525.1</MicrosoftNETCoreILAsmVersion>
4848
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19525.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
4949
<MicrosoftNETSdkILVersion>5.0.0-alpha1.19525.1</MicrosoftNETSdkILVersion>
5050
<!-- Corefx dependencies -->
51-
<MicrosoftNETCorePlatformsVersion>5.0.0-alpha.1.19531.1</MicrosoftNETCorePlatformsVersion>
52-
<runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19531.1</runtimenativeSystemIOPortsVersion>
51+
<MicrosoftNETCorePlatformsVersion>3.0.0-preview9.19409.15</MicrosoftNETCorePlatformsVersion>
52+
<runtimenativeSystemIOPortsVersion>4.6.0-preview9.19409.15</runtimenativeSystemIOPortsVersion>
5353
<!-- Standard dependencies -->
54-
<NETStandardLibraryVersion>2.2.0-prerelease.19530.2</NETStandardLibraryVersion>
54+
<NETStandardLibraryVersion>2.1.0-prerelease.19421.5</NETStandardLibraryVersion>
5555
<!-- dotnet-optimization dependencies -->
5656
<optimizationwindows_ntx64IBCCoreFxVersion>99.99.99-master-20190716.1</optimizationwindows_ntx64IBCCoreFxVersion>
5757
<!-- sni -->

‎eng/common/tools.ps1‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,10 +446,7 @@ function GetSdkTaskProject([string]$taskName) {
446446
}
447447

448448
function InitializeNativeTools() {
449-
if ($null -eq $env:DisableNativeToolsetInstalls) {
450-
return
451-
}
452-
if (Get-Member -InputObject $GlobalJson -Name "native-tools") {
449+
if (-Not (Test-Path variable:DisableNativeToolsetInstalls) -And (Get-Member -InputObject $GlobalJson -Name "native-tools")) {
453450
$nativeArgs= @{}
454451
if ($ci) {
455452
$nativeArgs = @{

‎eng/common/tools.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# CI mode - set to true on CI server for PR validation build or official build.
66
ci=${ci:-false}
7-
disable_configure_toolset_import=${disable_configure_toolset_import:-null}
7+
disable_configure_toolset_import=${disable_configure_toolset_import:-}
88

99
# Set to true to use the pipelines logger which will enable Azure logging output.
1010
# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
@@ -273,7 +273,7 @@ function GetNuGetPackageCachePath {
273273
}
274274

275275
function InitializeNativeTools() {
276-
if [[ -z "${DisableNativeToolsetInstalls:-}" ]]; then
276+
if [[ -n "${DisableNativeToolsetInstalls:-}" ]]; then
277277
return
278278
fi
279279
if grep -Fq "native-tools" $global_json_file
@@ -437,7 +437,7 @@ Write-PipelineSetVariable -name "Temp" -value "$temp_dir"
437437
Write-PipelineSetVariable -name "TMP" -value "$temp_dir"
438438

439439
# Import custom tools configuration, if present in the repo.
440-
if [[ "$disable_configure_toolset_import" != null ]]; then
440+
if [[ -z "$disable_configure_toolset_import" ]]; then
441441
configure_toolset_script="$eng_root/configure-toolset.sh"
442442
if [[ -a "$configure_toolset_script" ]]; then
443443
. "$configure_toolset_script"

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"dotnet": "3.0.100"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19531.14",
12-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19531.14",
13-
"Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19531.14",
14-
"Microsoft.DotNet.CoreFxTesting": "5.0.0-beta.19531.14",
11+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19551.2",
12+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19551.2",
13+
"Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19551.2",
14+
"Microsoft.DotNet.CoreFxTesting": "5.0.0-beta.19551.2",
1515
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
1616
"Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19525.1"
1717
}

0 commit comments

Comments
 (0)