From 8d0d6d44f56420ce81140335b2ac77ce20021e98 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Thu, 31 Aug 2023 16:39:18 -0700 Subject: [PATCH 1/3] Update branding to 7.0.12 (#91405) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0b087c84a5136b..037e8efe160493 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.11 + 7.0.12 7 0 - 11 + 12 7.0.100 6.0.$([MSBuild]::Add($(PatchVersion), 11)) servicing From 45161fb0b325fdf02d7e9a2a794b0780b50dc173 Mon Sep 17 00:00:00 2001 From: Drew Scoggins Date: Thu, 31 Aug 2023 16:45:00 -0700 Subject: [PATCH 2/3] Update 7.0 to use Ubuntu 22.04 queues for Perf runs (#90767) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Put crossgen perf into "Ubuntu.1804.Amd64.Tiger.Perf". (#90091) * Because crossgen need LTTng and 22.04 is not compatible. * Windows using same queue. * Remove artifacts of bad merge * Add 22.04 queue --------- Co-authored-by: Jiri Cincura ↹ --- eng/pipelines/coreclr/perf-non-wasm-jobs.yml | 2 +- eng/testing/performance/performance-setup.ps1 | 7 ++++--- eng/testing/performance/performance-setup.sh | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml index 39a8b0527b1e78..9a60000c79d08a 100644 --- a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml +++ b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml @@ -314,4 +314,4 @@ jobs: projectFile: crossgen_perf.proj runKind: crossgen_scenarios runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml - logicalmachine: 'perftiger' + logicalmachine: 'perftiger_crossgen' \ No newline at end of file diff --git a/eng/testing/performance/performance-setup.ps1 b/eng/testing/performance/performance-setup.ps1 index 1590b5f1e36d09..bd67e15fecdc9a 100644 --- a/eng/testing/performance/performance-setup.ps1 +++ b/eng/testing/performance/performance-setup.ps1 @@ -46,9 +46,10 @@ $Queue = "" if ($Internal) { switch ($LogicalMachine) { - "perftiger" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" } - "perfowl" { $Queue = "Windows.10.Amd64.20H2.Owl.Perf" } - "perfsurf" { $Queue = "Windows.10.Arm64.Perf.Surf" } + "perftiger" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" } + "perftiger_crossgen" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" } + "perfowl" { $Queue = "Windows.10.Amd64.20H2.Owl.Perf" } + "perfsurf" { $Queue = "Windows.10.Arm64.Perf.Surf" } "perfpixel4a" { $Queue = "Windows.10.Amd64.Pixel.Perf" } "perfampere" { $Queue = "Windows.Server.Arm64.Perf" } Default { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" } diff --git a/eng/testing/performance/performance-setup.sh b/eng/testing/performance/performance-setup.sh index 5af80ba888d62c..09e3a5980eec5f 100755 --- a/eng/testing/performance/performance-setup.sh +++ b/eng/testing/performance/performance-setup.sh @@ -253,8 +253,10 @@ if [[ "$internal" == true ]]; then else if [[ "$logical_machine" == "perfowl" ]]; then queue=Ubuntu.1804.Amd64.Owl.Perf - else + elif [[ "$logical_machine" == "perftiger_crossgen" ]]; then queue=Ubuntu.1804.Amd64.Tiger.Perf + else + queue=Ubuntu.2204.Amd64.Tiger.Perf fi fi From 26e0f8225a2919944e9e50e87e3b0e296cf20a41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 15:27:31 -0600 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/emsdk build 20230831.2 (#91430) Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.11 -> To Version 7.0.12 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index b258f815f5f2eb..9c77e9437dd4b1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - +