diff --git a/eng/Subsets.props b/eng/Subsets.props
index 0674e93cf4ded7..8b1a2dafc496cd 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -761,13 +761,9 @@
             <ProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono' and ('$(TargetsMobile)' != 'true' or '$(TargetOS)' == 'browser') and '$(TargetsLinuxBionic)' != 'true' and '$(BuildHostTools)' == 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.Host.sfxproj" Category="packs" />
 
             <!--
-              The wasm-tools workload manifest declares the host crossgen2 pack, so the workload
-              testing legs need it in their local package feed. Those legs do not set
-              $(BuildHostTools), so the project above does not produce one for them. The Host variant
-              pins the RID to the build host, which is exactly the pack the workload resolves.
-
-              Opt-in only. The official build already publishes this pack from the host platform
-              legs, and building it here as well would produce a second package with the same id.
+              CoreCLR wasm workload tests need the host crossgen2 package in their local feed.
+              These legs do not set BuildHostTools, so opt in here. Keeping this opt-in avoids
+              duplicating packages produced by official host builds.
             -->
             <ProjectToBuild Condition="'$(BuildCrossgen2HostPackForWorkloadTesting)' == 'true' and '$(RuntimeFlavor)' != 'Mono' and '$(BuildHostTools)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.Host.sfxproj" Category="packs" />
           </ItemGroup>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Crossgen2/Sdk.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Crossgen2/Sdk.props
deleted file mode 100644
index a5cdb6c55a638d..00000000000000
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Crossgen2/Sdk.props
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project>
-  <!--
-    Shipped inside the crossgen2 tool pack as Sdk/Sdk.props, so that a workload can acquire the pack
-    and locate the tool with an MSBuild Sdk import.
-
-    The SDK's own ReadyToRun path does not need this: it downloads the pack itself and computes the
-    tool path in ResolveReadyToRunCompilers. Workloads that want crossgen2 for something other than
-    compiling ReadyToRun images have no such mechanism, because the pack is only ever resolved when
-    PublishReadyToRun is set.
-
-    The pack is host-specific and is selected by the workload resolver from the host RID, so the
-    executable suffix follows the machine that restored it.
-  -->
-  <PropertyGroup>
-    <_Crossgen2PackExeSuffix Condition="$([MSBuild]::IsOSPlatform('Windows'))">.exe</_Crossgen2PackExeSuffix>
-    <Crossgen2ToolPath Condition="'$(Crossgen2ToolPath)' == ''">$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)', '..', 'tools', 'crossgen2$(_Crossgen2PackExeSuffix)'))</Crossgen2ToolPath>
-  </PropertyGroup>
-</Project>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.props
index 9edd9f702fa280..7babe847a2cf92 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.props
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.props
@@ -24,10 +24,6 @@
       OutputItemType="_RawCrossgenPublishFiles"
       ReferenceOutputAssembly="false"
       Private="false" />
-
-    <!-- Lets a workload acquire this pack and find the tool with an MSBuild Sdk import. -->
-    <FilesToPackage Include="$(MSBuildThisFileDirectory)Crossgen2\Sdk.props"
-                    TargetPath="Sdk/" />
   </ItemGroup>
 
   <Target Name="PublishCrossgen"
diff --git a/src/mono/browser/build/BrowserWasmApp.CoreCLR.targets b/src/mono/browser/build/BrowserWasmApp.CoreCLR.targets
index 5a354da91dd32b..a277500ae12aa9 100644
--- a/src/mono/browser/build/BrowserWasmApp.CoreCLR.targets
+++ b/src/mono/browser/build/BrowserWasmApp.CoreCLR.targets
@@ -25,6 +25,10 @@
          native.wasm.targets uses RuntimeFlavor to gate the CoreCLR-only relink registry. -->
     <RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">CoreCLR</RuntimeFlavor>
 
+    <!-- Request crossgen2 here: WebAssembly.Pack is not imported before the first restore.
+         Only skip an explicit opt-out; otherwise native relinking may be inferred later. -->
+    <RequiresCrossgen2Pack Condition="'$(RequiresCrossgen2Pack)' == '' and '$(WasmBuildNative)' != 'false'">true</RequiresCrossgen2Pack>
+
     <!-- EH and SIMD are always enabled for CoreCLR — detect user overrides before forcing true -->
     <_CoreCLRInvalidEH Condition="'$(WasmEnableExceptionHandling)' != '' and '$(WasmEnableExceptionHandling)' != 'true'">true</_CoreCLRInvalidEH>
     <_CoreCLRInvalidSIMD Condition="'$(WasmEnableSIMD)' != '' and '$(WasmEnableSIMD)' != 'true'">true</_CoreCLRInvalidSIMD>
@@ -640,6 +644,15 @@
 
   <!-- ======================== Generate Managed-to-Native ======================== -->
 
+  <!-- Check overrides after all imports; the SDK resolver cannot use the in-repo crossgen2 layout.
+       Keep CallTarget separate so its output items reach the generator. -->
+  <Target Name="_CoreCLRResolvePortableCallHelpersGenerator"
+          BeforeTargets="_CoreCLRGenerateManagedToNative"
+          DependsOnTargets="ResolveFrameworkReferences">
+    <CallTarget Targets="ResolveReadyToRunCompilers"
+                Condition="'$(Crossgen2Path)' == '' and '$(Crossgen2InBuildDir)' == '' and '$(Crossgen2ToolPath)' == '' and '@(ResolvedCrossgen2Pack)' != ''" />
+  </Target>
+
   <Target Name="_CoreCLRGenerateManagedToNative">
     <PropertyGroup>
       <_WasmPInvokeTablePath>$(_WasmIntermediateOutputPath)callhelpers-pinvoke.cpp</_WasmPInvokeTablePath>
@@ -694,21 +707,20 @@
       <_WasmManagedAssemblies Include="$(_CoreLibPath)" />
     </ItemGroup>
 
-    <!-- crossgen2 has the type system that knows the wasm ABI, so it generates the helpers itself.
-         In the repo it comes from the build output; outside it, from the crossgen2 pack
-         the wasm-tools workload acquires, which sets $(Crossgen2ToolPath) from its Sdk.props. -->
+    <!-- crossgen2 provides the wasm type layout needed to generate call helpers. -->
     <PropertyGroup>
       <_Crossgen2ExeSuffix Condition="'$(OS)' == 'Windows_NT'">.exe</_Crossgen2ExeSuffix>
       <Crossgen2Path Condition="'$(Crossgen2Path)' == '' and '$(Crossgen2InBuildDir)' != ''">$([MSBuild]::NormalizePath('$(Crossgen2InBuildDir)', 'crossgen2$(_Crossgen2ExeSuffix)'))</Crossgen2Path>
       <Crossgen2Path Condition="'$(Crossgen2Path)' == ''">$(Crossgen2ToolPath)</Crossgen2Path>
+      <Crossgen2Path Condition="'$(Crossgen2Path)' == ''">@(Crossgen2Tool)</Crossgen2Path>
     </PropertyGroup>
 
     <Error Condition="'$(Crossgen2Path)' == ''"
-           Text="crossgen2 was not found, so the portable call helpers cannot be generated. Install the 'wasm-tools' workload, or set %24(Crossgen2Path) to a crossgen2 executable." />
+           Text="Could not resolve crossgen2. Update the .NET SDK and restore the project, or set %24(Crossgen2Path) to a crossgen2 executable." />
     <Error Condition="'$([System.IO.Path]::GetExtension(`$(Crossgen2Path)`))' == '.dll'"
-           Text="%24(Crossgen2Path) is '$(Crossgen2Path)'. It has to name a crossgen2 executable; an IL assembly cannot be launched directly." />
+           Text="Set %24(Crossgen2Path) to a crossgen2 executable, not the DLL '$(Crossgen2Path)'." />
     <Error Condition="!Exists('$(Crossgen2Path)')"
-           Text="%24(Crossgen2Path) is '$(Crossgen2Path)', which does not exist. In the repo, build crossgen2 first; outside it, install the 'wasm-tools' workload." />
+           Text="crossgen2 executable not found: '$(Crossgen2Path)'. Build or restore crossgen2, or correct %24(Crossgen2Path)." />
 
     <PropertyGroup>
       <_Crossgen2GeneratorRsp>$(_WasmIntermediateOutputPath)callhelpers-generator.rsp</_Crossgen2GeneratorRsp>
diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in
index 48286c531fca63..7b600623e798d8 100644
--- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in
+++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in
@@ -11,8 +11,7 @@
         "Microsoft.NET.Sdk.WebAssembly.Pack.${NetVersion}",
         "Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.browser-wasm",
         "Microsoft.NETCore.App.Runtime.${NetVersion}.browser-wasm",
-        "Microsoft.NETCore.App.Runtime.AOT.Cross.${NetVersion}.browser-wasm",
-        "Microsoft.NETCore.App.Crossgen2.${NetVersion}"
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.${NetVersion}.browser-wasm"
       ],
       "extends": [ "microsoft-net-runtime-mono-tooling", "microsoft-net-sdk-emscripten" ],
       "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64", "osx-x64", "osx-arm64" ]
@@ -453,20 +452,6 @@
         "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.wasi-wasm"
       }
     },
-    "Microsoft.NETCore.App.Crossgen2.${NetVersion}": {
-      "kind": "Sdk",
-      "version": "${PackageVersion}",
-      "alias-to": {
-        "win-x64": "Microsoft.NETCore.App.Crossgen2.win-x64",
-        "win-arm64": "Microsoft.NETCore.App.Crossgen2.win-arm64",
-        "linux-x64": "Microsoft.NETCore.App.Crossgen2.linux-x64",
-        "linux-arm64": "Microsoft.NETCore.App.Crossgen2.linux-arm64",
-        "linux-musl-x64": "Microsoft.NETCore.App.Crossgen2.linux-musl-x64",
-        "linux-musl-arm64": "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64",
-        "osx-x64": "Microsoft.NETCore.App.Crossgen2.osx-x64",
-        "osx-arm64": "Microsoft.NETCore.App.Crossgen2.osx-arm64"
-      }
-    },
     "Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.browser-wasm" : {
       "kind": "framework",
       "version": "${PackageVersion}",
diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in
index 7420fab69354c2..e1b3a6351ae054 100644
--- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in
+++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in
@@ -212,18 +212,11 @@
     <Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.${NetVersion}" />
   </ImportGroup>
 
-  <!-- CoreCLR browser-wasm: only needs the WebAssembly.Sdk (build targets + emscripten).
-       No MonoTargets.Sdk, no MonoAOTCompiler, no AOT.Cross pack — the SDK resolves
-       the CoreCLR runtime pack via its own KnownRuntimePack.
-
-       crossgen2 is imported for its type system, not to compile ReadyToRun images: it generates the
-       wasm P/Invoke call helpers, which encode struct sizes that cannot be derived from metadata
-       alone. The SDK only resolves its own KnownCrossgen2Pack when PublishReadyToRun is set, so the
-       pack is acquired through the workload instead. -->
+  <!-- CoreCLR uses WebAssembly.Sdk for native builds, without Mono tooling.
+       The .NET SDK resolves the runtime and crossgen2 packs. -->
   <ImportGroup Condition="'$(TargetsCurrent)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true' and '$(UseMonoRuntime)' == 'false'">
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.WebAssembly.Sdk.${NetVersion}" />
     <Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.WebAssembly.Sdk.${NetVersion}" />
-    <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Crossgen2.${NetVersion}" />
   </ImportGroup>
 
   <ImportGroup Condition="'$(TargetsCurrent)' == 'true' and '$(RuntimeIdentifier)' == 'wasi-wasm' and '$(UsingWasiRuntimeWorkload)' == 'true'">
diff --git a/src/mono/wasi/build/WasiApp.CoreCLR.targets b/src/mono/wasi/build/WasiApp.CoreCLR.targets
index 78fcf6424eb0a2..e5ac90b0191c98 100644
--- a/src/mono/wasi/build/WasiApp.CoreCLR.targets
+++ b/src/mono/wasi/build/WasiApp.CoreCLR.targets
@@ -26,6 +26,7 @@
   <PropertyGroup>
     <WasmAppRuntimeFlavor>CoreCLR</WasmAppRuntimeFlavor>
     <UseMonoRuntime>false</UseMonoRuntime>
+    <RequiresCrossgen2Pack Condition="'$(RequiresCrossgen2Pack)' == ''">true</RequiresCrossgen2Pack>
     <!-- The Mono per-app clang relink (WasmBuildNative) is not used; CoreCLR links the
          wasihost corehost (libWasiHost.a) per-app through its own targets below. -->
     <WasmBuildNative>false</WasmBuildNative>
@@ -86,6 +87,16 @@
 
   <!-- ============================ Per-app wasihost link ============================ -->
 
+  <!-- Check overrides after all imports; the SDK resolver cannot use the in-repo crossgen2 layout.
+       Keep CallTarget separate so its output items reach the relink target. -->
+  <Target Name="_WasiResolvePortableCallHelpersGenerator"
+          BeforeTargets="_WasiCoreCLRRelinkCoreRun"
+          Condition="'$(WasmGenerateAppBundle)' == 'true' and '$(WasmSingleFileBundle)' != 'true'"
+          DependsOnTargets="ResolveFrameworkReferences">
+    <CallTarget Targets="ResolveReadyToRunCompilers"
+                Condition="'$(Crossgen2Path)' == '' and '$(Crossgen2InBuildDir)' == '' and '$(Crossgen2ToolPath)' == '' and '@(ResolvedCrossgen2Pack)' != ''" />
+  </Target>
+
   <Target Name="_WasiCoreCLRRelinkCoreRun"
           AfterTargets="_WasiCopyFrameworkToManaged"
           DependsOnTargets="_SetupWasiSdk"
@@ -152,23 +163,20 @@
       <Output TaskParameter="ManagedAssemblies" ItemName="_WasiManagedAssemblies" />
     </FilterManagedAssemblies>
 
-    <!-- crossgen2 has the type system that knows the wasm ABI, so it generates the helpers itself.
-         In the repo it comes from the build output; outside it, from a crossgen2 pack
-         that sets $(Crossgen2ToolPath). The wasi-experimental workload does not acquire that pack
-         today, so out-of-repo wasi relink needs $(Crossgen2Path) or
-         $(Crossgen2ToolPath) to be set explicitly. -->
+    <!-- crossgen2 provides the wasm type layout needed to generate call helpers. -->
     <PropertyGroup>
       <_Crossgen2ExeSuffix Condition="'$(OS)' == 'Windows_NT'">.exe</_Crossgen2ExeSuffix>
       <Crossgen2Path Condition="'$(Crossgen2Path)' == '' and '$(Crossgen2InBuildDir)' != ''">$([MSBuild]::NormalizePath('$(Crossgen2InBuildDir)', 'crossgen2$(_Crossgen2ExeSuffix)'))</Crossgen2Path>
       <Crossgen2Path Condition="'$(Crossgen2Path)' == ''">$(Crossgen2ToolPath)</Crossgen2Path>
+      <Crossgen2Path Condition="'$(Crossgen2Path)' == ''">@(Crossgen2Tool)</Crossgen2Path>
     </PropertyGroup>
 
     <Error Condition="'$(Crossgen2Path)' == ''"
-           Text="crossgen2 was not found, so the portable call helpers cannot be generated. Set %24(Crossgen2Path) to a crossgen2 executable." />
+           Text="Could not resolve crossgen2. Update the .NET SDK and restore the project, or set %24(Crossgen2Path) to a crossgen2 executable." />
     <Error Condition="'$([System.IO.Path]::GetExtension(`$(Crossgen2Path)`))' == '.dll'"
-           Text="%24(Crossgen2Path) is '$(Crossgen2Path)'. It has to name a crossgen2 executable; an IL assembly cannot be launched directly." />
+           Text="Set %24(Crossgen2Path) to a crossgen2 executable, not the DLL '$(Crossgen2Path)'." />
     <Error Condition="!Exists('$(Crossgen2Path)')"
-           Text="%24(Crossgen2Path) is '$(Crossgen2Path)', which does not exist. In the repo, build crossgen2 first; outside it, set it to a crossgen2 executable." />
+           Text="crossgen2 executable not found: '$(Crossgen2Path)'. Build or restore crossgen2, or correct %24(Crossgen2Path)." />
 
     <PropertyGroup>
       <_Crossgen2GeneratorRsp>$(_WasiRelinkObjDir)callhelpers-generator.rsp</_Crossgen2GeneratorRsp>
diff --git a/src/mono/wasm/Wasm.Build.Tests/CoreCLRWasmNativeDefaultsTests.cs b/src/mono/wasm/Wasm.Build.Tests/CoreCLRWasmNativeDefaultsTests.cs
index 883cfbbab3d7d8..b99fee0e087c78 100644
--- a/src/mono/wasm/Wasm.Build.Tests/CoreCLRWasmNativeDefaultsTests.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/CoreCLRWasmNativeDefaultsTests.cs
@@ -151,6 +151,72 @@ public void PublishReadyToRunDirectoryMatchesSdkOutputCasing()
             Assert.Equal(Path.Combine(GetObjDir(config), "R2R") + Path.DirectorySeparatorChar, match.Groups[1].Value);
         }
 
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void NativeRelinkResolvesCrossgen2WithoutReadyToRun(bool publish)
+        {
+            ProjectInfo info = CopyTestAsset(
+                Configuration.Debug,
+                aot: false,
+                TestAsset.WasmBasicTestApp,
+                "coreclr_sdk_crossgen2",
+                extraProperties: """
+                    <PublishReadyToRun>false</PublishReadyToRun>
+                    <WasmBuildNative>true</WasmBuildNative>
+                    """,
+                insertAtEnd: $$"""
+                    <Target Name="CheckCrossgen2PackRequest" BeforeTargets="ProcessFrameworkReferences">
+                        <Error Condition="'$(RequiresCrossgen2Pack)' != 'true'"
+                               Text="Expected RequiresCrossgen2Pack=true before restore." />
+                    </Target>
+                    <Target Name="CheckSdkCrossgen2" AfterTargets="_CoreCLRGenerateManagedToNative">
+                        <Error Condition="'{{publish}}' == 'true' and '$(WasmBuildingForNestedPublish)' != 'true'"
+                               Text="Expected helper generation during nested publish." />
+                        <Error Condition="'$(PublishReadyToRun)' == 'true'"
+                               Text="Expected PublishReadyToRun=false." />
+                        <Error Condition="'$(Crossgen2InBuildDir)' != '' or '$(Crossgen2ToolPath)' != ''"
+                               Text="Expected SDK resolution without crossgen2 path overrides." />
+                        <Error Condition="'@(Crossgen2Tool)' == '' or '$(Crossgen2Path)' != '@(Crossgen2Tool)'"
+                               Text="Expected the generator path to match the SDK Crossgen2Tool item." />
+                        <Error Condition="!Exists('$(_WasmPInvokeTablePath)') or !Exists('$(_WasmReversePInvokeTablePath)') or !Exists('$(_WasmInterpToNativeTablePath)')"
+                               Text="A generated call-helper table is missing." />
+                        <Error Text="Stopping after validating SDK crossgen2" />
+                    </Target>
+                    """);
+
+            // Run the generator, then stop before native compilation.
+            string output = publish
+                ? PublishProject(info, Configuration.Debug, new PublishOptions(ExpectSuccess: false)).buildOutput
+                : BuildProject(info, Configuration.Debug, new BuildOptions(ExpectSuccess: false)).buildOutput;
+
+            Assert.Contains("Stopping after validating SDK crossgen2", output);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void NativeRelinkWithoutCrossgen2PackReportsMissingGenerator(bool publish)
+        {
+            ProjectInfo info = CopyTestAsset(
+                Configuration.Debug,
+                aot: false,
+                TestAsset.WasmBasicTestApp,
+                "coreclr_missing_crossgen2",
+                extraProperties: """
+                    <PublishReadyToRun>false</PublishReadyToRun>
+                    <RequiresCrossgen2Pack>false</RequiresCrossgen2Pack>
+                    <WasmBuildNative>true</WasmBuildNative>
+                    """);
+
+            string output = publish
+                ? PublishProject(info, Configuration.Debug, new PublishOptions(ExpectSuccess: false)).buildOutput
+                : BuildProject(info, Configuration.Debug, new BuildOptions(ExpectSuccess: false)).buildOutput;
+
+            Assert.Contains("Could not resolve crossgen2. Update the .NET SDK and restore the project, or set $(Crossgen2Path) to a crossgen2 executable.", output);
+            Assert.DoesNotContain("NETSDK1094", output);
+        }
+
         private string? BuildAndGetWasmBuildNativeLine(string projectPrefix, string extraProperties, bool expectSuccess)
             => BuildAndGetOutput(projectPrefix, extraProperties, extraItems: "", expectSuccess).line;
 
diff --git a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs
index f9842bed1047b4..6603a8338ddf86 100644
--- a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs
@@ -175,12 +175,15 @@ private static void AddCoreClrProjectProperties(ref string extraProperties, ref
         """;
         insertAtEnd +=
         $$"""
-            <Target Name="_UpdateKnownWebAssemblySdkPack" BeforeTargets="ProcessFrameworkReferences"
+            <Target Name="_UpdateKnownCoreClrWebAssemblyPacks" BeforeTargets="ProcessFrameworkReferences"
                     Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
                 <ItemGroup>
                 <KnownWebAssemblySdkPack Update="@(KnownWebAssemblySdkPack)">
                     <WebAssemblySdkPackVersion Condition="'%(KnownWebAssemblySdkPack.TargetFramework)' == '{{DefaultTargetFramework}}'">{{runtimePackVersion}}</WebAssemblySdkPackVersion>
                 </KnownWebAssemblySdkPack>
+                <KnownCrossgen2Pack Update="@(KnownCrossgen2Pack)">
+                    <Crossgen2PackVersion Condition="'%(KnownCrossgen2Pack.TargetFramework)' == '{{DefaultTargetFramework}}'">{{runtimePackVersion}}</Crossgen2PackVersion>
+                </KnownCrossgen2Pack>
                 </ItemGroup>
             </Target>
         """;