Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Commit

Permalink
Manual darc update from build '20191101.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ViktorHofer
ViktorHofer committed Nov 1, 2019
1 parent 5654852 commit 17ba1f9
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 67 deletions.
80 changes: 40 additions & 40 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,85 +18,85 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha.1.19531.19">
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>14e7a3b2fb40b377562d3d3e739d471841ae3316</Sha>
<Sha>e460275e7463fdc900bf5c9e0a574ec8946ac6c2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="5.0.0-alpha.1.19531.19">
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>14e7a3b2fb40b377562d3d3e739d471841ae3316</Sha>
<Sha>e460275e7463fdc900bf5c9e0a574ec8946ac6c2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="5.0.0-alpha.1.19531.19">
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>14e7a3b2fb40b377562d3d3e739d471841ae3316</Sha>
<Sha>e460275e7463fdc900bf5c9e0a574ec8946ac6c2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha.1.19531.13">
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>a24db0ba5666f46f50649810fe698ad267b60331</Sha>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="runtime.native.System.IO.Ports" Version="5.0.0-alpha.1.19531.13">
<Dependency Name="runtime.native.System.IO.Ports" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>a24db0ba5666f46f50649810fe698ad267b60331</Sha>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19531.14">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.2.0-prerelease.19531.1">
<Dependency Name="NETStandard.Library" Version="2.2.0-prerelease.19551.1">
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>a2bca7f4f89c899c2c0325c2790faf6f7d29870c</Sha>
<Sha>1063b6811691a2e009d7733cbf68f897511f00b2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19531.14">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19531.14">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19531.14">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19531.14">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19531.14">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19531.14">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19531.14">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19531.14">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="5.0.0-beta.19531.14">
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="5.0.0-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19531.14">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19531.14">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19531.14">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19531.14">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19551.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
<Sha>d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,29 @@
</PropertyGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.19530.15</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19530.15</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.19530.15</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19530.15</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19530.15</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19530.15</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19530.15</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19530.15</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19530.15</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19530.15</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.19551.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19551.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.19551.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19551.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19551.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19551.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19551.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19551.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19551.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19551.2</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Core-setup dependencies -->
<MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19530.10</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19530.10</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19530.10</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19551.1</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19551.1</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19551.1</MicrosoftNETCoreDotNetHostPolicyVersion>
<!-- Coreclr dependencies -->
<MicrosoftNETCoreILAsmVersion>5.0.0-alpha1.19525.1</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19525.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETSdkILVersion>5.0.0-alpha1.19525.1</MicrosoftNETSdkILVersion>
<!-- Corefx dependencies -->
<MicrosoftNETCorePlatformsVersion>5.0.0-alpha.1.19531.1</MicrosoftNETCorePlatformsVersion>
<runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19531.1</runtimenativeSystemIOPortsVersion>
<MicrosoftNETCorePlatformsVersion>5.0.0-alpha.1.19551.1</MicrosoftNETCorePlatformsVersion>
<runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19551.1</runtimenativeSystemIOPortsVersion>
<!-- Standard dependencies -->
<NETStandardLibraryVersion>2.2.0-prerelease.19530.2</NETStandardLibraryVersion>
<NETStandardLibraryVersion>2.2.0-prerelease.19551.1</NETStandardLibraryVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64IBCCoreFxVersion>99.99.99-master-20190716.1</optimizationwindows_ntx64IBCCoreFxVersion>
<!-- sni -->
Expand Down
5 changes: 1 addition & 4 deletions eng/common/tools.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,10 +446,7 @@ function GetSdkTaskProject([string]$taskName) {
}

function InitializeNativeTools() {
if ($null -eq $env:DisableNativeToolsetInstalls) {
return
}
if (Get-Member -InputObject $GlobalJson -Name "native-tools") {
if (-Not (Test-Path variable:DisableNativeToolsetInstalls) -And (Get-Member -InputObject $GlobalJson -Name "native-tools")) {
$nativeArgs= @{}
if ($ci) {
$nativeArgs = @{
Expand Down
6 changes: 3 additions & 3 deletions eng/common/tools.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

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

function InitializeNativeTools() {
if [[ -z "${DisableNativeToolsetInstalls:-}" ]]; then
if [[ -n "${DisableNativeToolsetInstalls:-}" ]]; then
return
fi
if grep -Fq "native-tools" $global_json_file
Expand Down Expand Up @@ -437,7 +437,7 @@ Write-PipelineSetVariable -name "Temp" -value "$temp_dir"
Write-PipelineSetVariable -name "TMP" -value "$temp_dir"

# Import custom tools configuration, if present in the repo.
if [[ "$disable_configure_toolset_import" != null ]]; then
if [[ -z "$disable_configure_toolset_import" ]]; then
configure_toolset_script="$eng_root/configure-toolset.sh"
if [[ -a "$configure_toolset_script" ]]; then
. "$configure_toolset_script"
Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"dotnet": "3.0.100"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19531.14",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19531.14",
"Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19531.14",
"Microsoft.DotNet.CoreFxTesting": "5.0.0-beta.19531.14",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19551.2",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19551.2",
"Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19551.2",
"Microsoft.DotNet.CoreFxTesting": "5.0.0-beta.19551.2",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19525.1"
}
Expand Down

0 comments on commit 17ba1f9

Please sign in to comment.