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

[release/3.0] Update dependencies from 3 repositories #40308

Merged
merged 3 commits into from
Aug 14, 2019
Merged

[release/3.0] Update dependencies from 3 repositories #40308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83bcfb2
Update dependencies from https://github.com/dotnet/core-setup build 2…
Aug 14, 2019
4902b6a
Update dependencies from https://github.com/dotnet/arcade build 20190…
Aug 14, 2019
f4e7c1e
Update dependencies from https://github.com/dotnet/standard build 201…
Aug 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview9-19412-05">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview9-19414-02">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>16d0c88cff0642a49013048ea24980d65eeed626</Sha>
<Sha>f1de07d0abab3899bd7e1facb7e375d6100a2ac8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="3.0.0-preview9-19412-05">
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="3.0.0-preview9-19414-02">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>16d0c88cff0642a49013048ea24980d65eeed626</Sha>
<Sha>f1de07d0abab3899bd7e1facb7e375d6100a2ac8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="3.0.0-preview9-19412-05">
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="3.0.0-preview9-19414-02">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>16d0c88cff0642a49013048ea24980d65eeed626</Sha>
<Sha>f1de07d0abab3899bd7e1facb7e375d6100a2ac8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview9.19409.15">
<Uri>https://github.com/dotnet/corefx</Uri>
Expand All @@ -34,65 +34,65 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>976b84b4d969ce5d87bc437d811ec8864b47947a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19412.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19413.3">
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19414.3">
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>f27dd1491378aa0da5b15aac881fc4de2ea357a8</Sha>
<Sha>7d56086e753abe6d9a99f67a9b6c021bf7c809ce</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19412.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19412.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19412.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19412.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19412.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19412.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19412.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19412.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19412.1">
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19412.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19412.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19412.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19412.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190807.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
28 changes: 14 additions & 14 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,30 @@
</PropertyGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.19412.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19412.1</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19412.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetVersionToolsTasksPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.19412.7</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19412.7</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19412.7</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetVersionToolsTasksPackageVersion>
<!-- roslyn -->
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
<!-- Core-setup dependencies -->
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview9-19412-05</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview9-19412-05</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview9-19412-05</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview9-19414-02</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview9-19414-02</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview9-19414-02</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<!-- Coreclr dependencies -->
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview9.19409.2</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview9.19409.2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<!-- Corefx dependencies -->
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19409.15</MicrosoftNETCorePlatformsPackageVersion>
<runtimenativeSystemIOPortsPackageVersion>4.6.0-preview9.19409.15</runtimenativeSystemIOPortsPackageVersion>
<!-- Standard dependencies -->
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19413.3</NETStandardLibraryPackageVersion>
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19414.3</NETStandardLibraryPackageVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64IBCCoreFxPackageVersion>99.99.99-master-20190807.1</optimizationwindows_ntx64IBCCoreFxPackageVersion>
<!-- sni -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/performance/performance-setup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if ($Framework.StartsWith("netcoreapp")) {
}

if ($Internal) {
$Queue = "Windows.10.Amd64.ClientRS5.Perf"
$Queue = "Windows.10.Amd64.19H1.Tiger.Perf"
$PerfLabArguments = "--upload-to-perflab-container"
$ExtraBenchmarkDotNetArguments = ""
$Creator = ""
Expand Down
36 changes: 18 additions & 18 deletions eng/common/performance/performance-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ if [[ "$internal" == true ]]; then
if [[ "$architecture" = "arm64" ]]; then
queue=Ubuntu.1804.Arm64.Perf
else
queue=Ubuntu.1804.Amd64.Perf
queue=Ubuntu.1804.Amd64.Tiger.Perf
fi
fi

Expand All @@ -157,20 +157,20 @@ if [[ "$use_core_run" = true ]]; then
fi

# Make sure all of our variables are available for future steps
echo "##vso[task.setvariable variable=UseCoreRun]$use_core_run"
echo "##vso[task.setvariable variable=Architecture]$architecture"
echo "##vso[task.setvariable variable=PayloadDirectory]$payload_directory"
echo "##vso[task.setvariable variable=PerformanceDirectory]$performance_directory"
echo "##vso[task.setvariable variable=WorkItemDirectory]$workitem_directory"
echo "##vso[task.setvariable variable=Queue]$queue"
echo "##vso[task.setvariable variable=SetupArguments]$setup_arguments"
echo "##vso[task.setvariable variable=Python]python3"
echo "##vso[task.setvariable variable=PerfLabArguments]$perflab_arguments"
echo "##vso[task.setvariable variable=ExtraBenchmarkDotNetArguments]$extra_benchmark_dotnet_arguments"
echo "##vso[task.setvariable variable=BDNCategories]$run_categories"
echo "##vso[task.setvariable variable=TargetCsproj]$csproj"
echo "##vso[task.setvariable variable=RunFromPerfRepo]$run_from_perf_repo"
echo "##vso[task.setvariable variable=Creator]$creator"
echo "##vso[task.setvariable variable=HelixSourcePrefix]$helix_source_prefix"
echo "##vso[task.setvariable variable=Kind]$kind"
echo "##vso[task.setvariable variable=_BuildConfig]$architecture.$kind.$framework"
Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false
Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false
Write-PipelineSetVariable -name "PayloadDirectory" -value "$payload_directory" -is_multi_job_variable false
Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_directory" -is_multi_job_variable false
Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false
Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false
Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false
Write-PipelineSetVariable -name "Python" -value "$python3" -is_multi_job_variable false
Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false
Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false
Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false
Write-PipelineSetVariable -name "TargetCsproj" -value "$csproj" -is_multi_job_variable false
Write-PipelineSetVariable -name "RunFromPerfRepo" -value "$run_from_perf_repo" -is_multi_job_variable false
Write-PipelineSetVariable -name "Creator" -value "$creator" -is_multi_job_variable false
Write-PipelineSetVariable -name "HelixSourcePrefix" -value "$helix_source_prefix" -is_multi_job_variable false
Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable false
Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"dotnet": "3.0.100-preview7-012630"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19412.1",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19412.1",
"Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.19412.1",
"Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.19412.1",
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19412.7",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19412.7",
"Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.19412.7",
"Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.19412.7",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "3.0.0-preview9.19409.2"
}
Expand Down