[release/7.0-rc1] net7.0 + net6.0 workload multitargeting changes (#7…

…4018) * WIP * Update all the workload names to be net6 versions. This is needed in 7 but NOT in 6. Dotnet workload install wasm-tools-net6 should install a different set of components than wasm-tools * Add localization to net7 and correct localization for net6 to target that workload * Update to 6.0.9 which should be the next version of emsdk. * Update the net7 and net6 workloads to rename all sdk packs * Use localize data from net7 project * Fix typo * Fix typo * Update KnownRuntimePack mono versions without clearing them all * Add net6.0 to description and fix up emscripten-net6 reference * Fix emsdk version number * depend on microsoft-net-sdk-emscripten-net7 * Fix missing .net7 renames * Update WorkloadManifest.targets.in Don't use **FromWorkload** for pack versions because it doesn't understand the name aliasing we have to use with runtime packs * Update workload manifest to fix names * Update the emscripten manifest dependencies * Use full hash * WIP: install workload combos for testing * Update Versions.props Use Pacjjag6.0.8 packages for the moment because they should be in dotnet-public * Update emsdk dependencies to `7.0.0-rc.1.22418.3` * Update emscripten to 7.0.0-rc.1.22418.6, and 6.0.4 * wip * Fix conditions in WorkloadManifest.targets * Fix up running WBT * Fix build HACK: to work around an incorrect condition in emscripten's WorkloadManifest.targets which causes emscripten packs not to get imported. * Update WorkloadManifest.targets.in * Update WorkloadManifest.targets.in * Fix dotnet path references for workload testing * InstallWorkloadFromArtifacts: don't delete the target path between different requests, clean up before starting * Fix PackageVersionNet6=6.0.8 * WorkloadManifest.targets: rename some properties to be internal, and versioned * More renames to fix builds * Update Versions.props * Fix up a condition in WorkloadManifest.targets * Work around the import troubles * Work around the import troubles * Revert broken version check * Use BrowserWorkloadDisabled which will be set in both cases * Fix typos in WorkloadManifest.targets * Wasm.Build.Tests: Workaround a msbuild bug causing mysterious failures When running a fresh build with `dotnet build`, the first one works fine. But all the subsequent builds fail with no info in the logs at all. ``` $ /workspaces/runtime/artifacts/bin/dotnet-net7/dotnet build MSBuild version 17.4.0-preview-22413-01+f0a66ec43 for .NET Build FAILED. 0 Warning(s) 0 Error(s) ``` And it seems to be related to msbuild nodes, so disable NodeReuse. * cleanup * Remove a bunch of stale logic from WBT Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com> Co-authored-by: Marc Paine <marcpop@microsoft.com> Co-authored-by: Ankit Jain <radical@gmail.com>
dotnet · Aug 22, 2022 · 754014e · 754014e
1 parent 37ddbef
commit 754014e
Show file tree

Hide file tree

Showing 59 changed files with 1,365 additions and 590 deletions.
diff --git a/docs/workflow/testing/testing-workloads.md b/docs/workflow/testing/testing-workloads.md
@@ -2,7 +2,7 @@
 
 Workloads based on packages in `artifacts` can be installed, and used for testing.
 
-- This is done by installing a specified SDK version (`$(SdkVersionForWorkloadTesting)`) in `artifacts/bin/dotnet-workload`.
+- This is done by installing a specified SDK version (`$(SdkVersionForWorkloadTesting)`) in `artifacts/bin/dotnet-net7`.
 - Then the manifest for the workload in `@(WorkloadIdForTesting)` is installed
     - Then workload packs are installed
     - packs, or manifests not generated by `runtime`, are restored from nuget

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -8,10 +8,6 @@
       <Uri>https://github.com/dotnet/msquic</Uri>
       <Sha>dc012a715ceb9b5d5258f2fda77520586af5a36a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-rc.1.22411.1">
-      <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>216093204c415b6e37dfadfcbcf183881b443636</Sha>
-    </Dependency>
     <Dependency Name="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1">
       <Uri>https://github.com/dotnet/wcf</Uri>
       <Sha>7f504aabb1988e9a093c1e74d8040bd52feb2f01</Sha>
@@ -52,6 +48,14 @@
       <Uri>https://github.com/dotnet/command-line-api</Uri>
       <Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.1.22418.6">
+      <Uri>https://github.com/dotnet/emsdk</Uri>
+      <Sha>eb3232eb90aac35a31134464fc498a5f1ddb239f</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.1.22418.6">
+      <Uri>https://github.com/dotnet/emsdk</Uri>
+      <Sha>eb3232eb90aac35a31134464fc498a5f1ddb239f</Sha>
+    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4">
@@ -126,85 +130,85 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
+    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22415.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
+      <Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.22409.1">
+    <Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.22415.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
+      <Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
     </Dependency>
-    <Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.22409.1">
+    <Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.22415.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
+      <Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.22409.1">
+    <Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.22415.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
+      <Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.22409.1">
+    <Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.22415.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
+      <Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
     </Dependency>
-    <Dependency Name="System.Net.TestData" Version="7.0.0-beta.22409.1">
+    <Dependency Name="System.Net.TestData" Version="7.0.0-beta.22415.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
+      <Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
     </Dependency>
-    <Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.22409.1">
+    <Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.22415.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
+      <Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.22409.1">
+    <Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.22415.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
+      <Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.22409.1">
+    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.22415.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
+      <Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
     </Dependency>
-    <Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.22409.1">
+    <Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.22415.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
+      <Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.22409.1">
+    <Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.22415.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
+      <Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.22409.1">
+    <Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.22415.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
+      <Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
     </Dependency>
-    <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22412.3">
+    <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22415.2">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
-      <Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
+      <Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
     </Dependency>
-    <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22412.3">
+    <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22415.2">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
-      <Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
+      <Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
     </Dependency>
-    <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22412.3">
+    <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22415.2">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
-      <Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
+      <Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
     </Dependency>
-    <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22412.3">
+    <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22415.2">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
-      <Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
+      <Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
     </Dependency>
-    <Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22412.3">
+    <Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22415.2">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
-      <Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
+      <Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
     </Dependency>
-    <Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22412.3">
+    <Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22415.2">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
-      <Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
+      <Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
     </Dependency>
-    <Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22412.3">
+    <Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22415.2">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
-      <Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
+      <Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
     </Dependency>
-    <Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22412.3">
+    <Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22415.2">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
-      <Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
+      <Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22414.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
@@ -270,13 +274,13 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
       <Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.1.0-alpha.0.22408.2">
+    <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.1.0-alpha.0.22415.2">
       <Uri>https://github.com/dotnet/hotreload-utils</Uri>
-      <Sha>f82b82000caf3e7a9789e1425a0baa12fdc70d09</Sha>
+      <Sha>beb43eebb0bb4bd299d562cedd54714528962add</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.22409.1">
+    <Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.22415.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
+      <Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22403.2">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -7,6 +7,7 @@
     <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <SdkBandVersion>7.0.100</SdkBandVersion>
+    <PackageVersionNet6>6.0.8</PackageVersionNet6>
     <PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
     <!-- Set assembly version to align with major and minor version,
@@ -21,6 +22,8 @@
     <UsingToolXliff>false</UsingToolXliff>
     <LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
     <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
+    <MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.0-rc.1.22418.6</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
+    <MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.0-rc.1.22418.6</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
   </PropertyGroup>
   <!--
     For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
@@ -119,19 +122,19 @@
     <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
     <runtimenativeSystemIOPortsVersion>7.0.0-rc.1.22414.6</runtimenativeSystemIOPortsVersion>
     <!-- Runtime-Assets dependencies -->
-    <SystemRuntimeNumericsTestDataVersion>7.0.0-beta.22409.1</SystemRuntimeNumericsTestDataVersion>
-    <SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.22409.1</SystemComponentModelTypeConverterTestDataVersion>
-    <SystemDrawingCommonTestDataVersion>7.0.0-beta.22409.1</SystemDrawingCommonTestDataVersion>
-    <SystemFormatsTarTestDataVersion>7.0.0-beta.22409.1</SystemFormatsTarTestDataVersion>
-    <SystemIOCompressionTestDataVersion>7.0.0-beta.22409.1</SystemIOCompressionTestDataVersion>
-    <SystemIOPackagingTestDataVersion>7.0.0-beta.22409.1</SystemIOPackagingTestDataVersion>
-    <SystemNetTestDataVersion>7.0.0-beta.22409.1</SystemNetTestDataVersion>
-    <SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.22409.1</SystemPrivateRuntimeUnicodeDataVersion>
-    <SystemRuntimeTimeZoneDataVersion>7.0.0-beta.22409.1</SystemRuntimeTimeZoneDataVersion>
-    <SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.22409.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
-    <SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.22409.1</SystemTextRegularExpressionsTestDataVersion>
-    <SystemWindowsExtensionsTestDataVersion>7.0.0-beta.22409.1</SystemWindowsExtensionsTestDataVersion>
-    <MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.22409.1</MicrosoftDotNetCilStripSourcesVersion>
+    <SystemRuntimeNumericsTestDataVersion>7.0.0-beta.22415.3</SystemRuntimeNumericsTestDataVersion>
+    <SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.22415.3</SystemComponentModelTypeConverterTestDataVersion>
+    <SystemDrawingCommonTestDataVersion>7.0.0-beta.22415.3</SystemDrawingCommonTestDataVersion>
+    <SystemFormatsTarTestDataVersion>7.0.0-beta.22415.3</SystemFormatsTarTestDataVersion>
+    <SystemIOCompressionTestDataVersion>7.0.0-beta.22415.3</SystemIOCompressionTestDataVersion>
+    <SystemIOPackagingTestDataVersion>7.0.0-beta.22415.3</SystemIOPackagingTestDataVersion>
+    <SystemNetTestDataVersion>7.0.0-beta.22415.3</SystemNetTestDataVersion>
+    <SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.22415.3</SystemPrivateRuntimeUnicodeDataVersion>
+    <SystemRuntimeTimeZoneDataVersion>7.0.0-beta.22415.3</SystemRuntimeTimeZoneDataVersion>
+    <SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.22415.3</SystemSecurityCryptographyX509CertificatesTestDataVersion>
+    <SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.22415.3</SystemTextRegularExpressionsTestDataVersion>
+    <SystemWindowsExtensionsTestDataVersion>7.0.0-beta.22415.3</SystemWindowsExtensionsTestDataVersion>
+    <MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.22415.3</MicrosoftDotNetCilStripSourcesVersion>
     <!-- dotnet-optimization dependencies -->
     <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx64MIBCRuntimeVersion>
     <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -157,7 +160,7 @@
     <MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22411.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
     <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22411.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
     <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22411.1</MicrosoftDotNetXHarnessCLIVersion>
-    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.1.0-alpha.0.22408.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
+    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.1.0-alpha.0.22415.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
     <XUnitVersion>2.4.2</XUnitVersion>
     <XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
     <XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
@@ -181,17 +184,16 @@
     <MicrosoftNativeQuicMsQuicVersion>2.1</MicrosoftNativeQuicMsQuicVersion>
     <SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22406.1</SystemNetMsQuicTransportVersion>
     <!-- Mono LLVM -->
-    <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22412.3</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
-    <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22412.3</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
-    <runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22412.3</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
-    <runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22412.3</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
-    <runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22412.3</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
-    <runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22412.3</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
-    <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22412.3</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
-    <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22412.3</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
+    <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22415.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
+    <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22415.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
+    <runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22415.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
+    <runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22415.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
+    <runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22415.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
+    <runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22415.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
+    <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22415.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
+    <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22415.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
     <!-- emscripten / Node -->
-    <MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-rc.1.22411.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
-    <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion>
+    <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion>
     <!-- workloads -->
     <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
     <WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion>

diff --git a/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml b/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml
@@ -12,7 +12,7 @@ steps:
 
   - script: >-
       mkdir -p $(Build.SourcesDirectory)/artifacts/staging &&
-      cp -r $(Build.SourcesDirectory)/artifacts/bin/dotnet-workload $(Build.SourcesDirectory)/artifacts/staging &&
+      cp -r $(Build.SourcesDirectory)/artifacts/bin/dotnet-net7 $(Build.SourcesDirectory)/artifacts/staging &&
       cp -r $(Build.SourcesDirectory)/artifacts/bin/microsoft.netcore.app.runtime.browser-wasm $(Build.SourcesDirectory)/artifacts/staging &&
       cp -r $(Build.SourcesDirectory)/artifacts/bin/microsoft.netcore.app.ref $(Build.SourcesDirectory)/artifacts/staging
     displayName: "Prepare artifacts staging directory"