From 10700195e94f9ade9480d6dd406fe998b9e017d3 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 14 Aug 2019 08:22:33 -0700 Subject: [PATCH] [automated] Merge branch 'release/3.0' => 'release/3.1' (#26170) * [release/3.0] Update dependencies from dotnet/arcade (#26143) * Update dependencies from https://github.com/dotnet/arcade build 20190812.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19412.1 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19412.1 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19412.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19412.1 * Update dependencies from https://github.com/dotnet/arcade build 20190812.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19412.7 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19412.7 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19412.7 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19412.7 * Update dependencies from https://github.com/dotnet/core-setup build 20190807.10 (#26074) - Microsoft.NETCore.App - 3.0.0-preview9-19407-10 --- eng/Version.Details.xml | 16 ++++++------- eng/Versions.props | 6 +++-- eng/common/performance/performance-setup.ps1 | 2 +- eng/common/performance/performance-setup.sh | 36 ++++++++++++++-------------- global.json | 4 ++-- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f43ab98..2e92fff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,21 +2,21 @@ - + https://github.com/dotnet/arcade - a11024c8c22cc762011addafc30c653c938048f4 + 82c822ee7db08f5347e6ac44e3ed465248394a9e - + https://github.com/dotnet/arcade - a11024c8c22cc762011addafc30c653c938048f4 + 82c822ee7db08f5347e6ac44e3ed465248394a9e - + https://github.com/dotnet/arcade - a11024c8c22cc762011addafc30c653c938048f4 + 82c822ee7db08f5347e6ac44e3ed465248394a9e - + https://github.com/dotnet/arcade - a11024c8c22cc762011addafc30c653c938048f4 + 82c822ee7db08f5347e6ac44e3ed465248394a9e https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index b902b40..6e71ee6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,8 +15,8 @@ false - 2.2.0-beta.19411.1 - 1.0.0-beta.19411.1 + 2.2.0-beta.19412.7 + 1.0.0-beta.19412.7 2.5.1-beta.19278.1 3.3.0-beta2-19367-02 @@ -26,6 +26,8 @@ 1.0.0-preview7.19326.2 3.0.0-preview9-19412-05 + + 5.0.6-beta.19203.1 99.99.99-master-20190807.1 99.99.99-master-20190807.1 diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 7e5441f..ac05256 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -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 = "" diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 126da5f..dc6fd21 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -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 @@ -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" \ No newline at end of file +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 \ No newline at end of file diff --git a/global.json b/global.json index d29e353..d9b51ce 100644 --- a/global.json +++ b/global.json @@ -7,8 +7,8 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19411.1", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19411.1", + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19412.7", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19412.7", "Microsoft.Build.NoTargets": "1.0.53", "Microsoft.Build.Traversal": "2.0.2" } -- 2.7.4