From 89ac219a86f7c53e6311ecdb987d718876b64211 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 24 Aug 2023 15:47:33 -0400 Subject: [PATCH 1/3] [wasm] Add a dependency on dotnet/installer to get the latest And update version from `.NET 8.0.1xx SDK` channel. (cherry picked from commit c821c361321d710aae7a24a6293a876ddcbf374e) --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 5 +++-- src/mono/wasm/README.md | 9 +++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 951d1ef1c05f97..e8237a143e5c88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -398,5 +398,9 @@ https://github.com/NuGet/NuGet.Client 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 + + https://github.com/dotnet/installer + dbeae1ac71d95355452952059f35960991cb3fd2 + diff --git a/eng/Versions.props b/eng/Versions.props index 113383aab30cf2..28bc90e3fba694 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -205,8 +205,6 @@ 2.46.3 2.45.0 2.45.0 - - 8.0.100-rc.1.23415.5 1.1.2-beta1.23323.1 8.0.0-preview-20230918.1 @@ -257,5 +255,8 @@ 3.1.7 1.0.406601 + + 8.0.100-rc.2.23470.7 + $(MicrosoftDotnetSdkInternalVersion) diff --git a/src/mono/wasm/README.md b/src/mono/wasm/README.md index 34c18bc8711468..cdace086f5603e 100644 --- a/src/mono/wasm/README.md +++ b/src/mono/wasm/README.md @@ -350,3 +350,12 @@ npm update --lockfile-version=1 | Multi-thread | linux: build only | none | * `high resource aot` runs a few specific library tests with AOT, that require more memory to AOT. + + +# Perf pipeline + +TBD + +## Updates needed + +- when the base OS is upgraded, check if the version of node installed in the `eng/pipelines/coreclr/templates/run-performance-job.yml` needs an upgrade too. From 8bc7d4ac7d27d1a5547f2c1b34f7bc7ebf1ed3aa Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 20 Sep 2023 14:14:15 -0400 Subject: [PATCH 2/3] bump emsdk to 8.0.0-rtm.23469.5 to pick up rtm fix --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8237a143e5c88..bf6d0b35499cfb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,9 +90,9 @@ 89be445dd4936157533ad96bafb95f701430653a - + https://github.com/dotnet/emsdk - 50bf805c8b5ca52abd34fde390609d8a54640246 + 9b58e7c522a7473e559c6ac15952868130425372 diff --git a/eng/Versions.props b/eng/Versions.props index 28bc90e3fba694..b9edf26f01fe1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -238,7 +238,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport --> - 8.0.0-rtm.23469.3 + 8.0.0-rtm.23469.5 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 1.1.87-gba258badda From 570d0a4e5bc0861a29cf0e6a7c1e575c8b595f0d Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 20 Sep 2023 16:41:07 -0400 Subject: [PATCH 3/3] [wasm] InstallWorkloadFromArtifacts: correctly handle rtm versions In case of a version like `8.0.100-rtm.23470.1`, we incorrectly extracted `-rtm.23470` instead of `-rtm`, which resulted in trying to install package named `Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-rtm.23470` instead of `Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-rtm`. --- src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index e520057d5b3bdf..1400781b7295ee 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -49,7 +49,7 @@ public partial class InstallWorkloadFromArtifacts : Task private string _tempDir = string.Empty; private string _nugetCachePath = string.Empty; - [GeneratedRegex(@"^\d+\.\d+\.\d+(-[A-z]*\.*\d*)?")] + [GeneratedRegex(@"^\d+\.\d+\.\d+(-rtm|-[A-z]*\.*\d*)?")] private static partial Regex bandVersionRegex(); public override bool Execute()