diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj
index 23b97ea1b3b4..b233630a252a 100644
--- a/src/SourceBuild/content/repo-projects/aspnetcore.proj
+++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj
@@ -33,8 +33,6 @@
 
   <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
     <BuildArgs>$(BuildArgs) $(FlagParameterPrefix)no-build-repo-tasks</BuildArgs>
-    <!-- A source-build build can have a separate RID from the SDK that we're building against. This will cause the SDK to not be able to find a crossgen tool pack and fail to R2R: https://github.com/dotnet/source-build/issues/3793 -->
-    <BuildArgs>$(BuildArgs) /p:CrossgenOutput=false</BuildArgs>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SourceBuild/patches/aspnetcore/0001-Use-host-live-crossgen2.patch b/src/SourceBuild/patches/aspnetcore/0001-Use-host-live-crossgen2.patch
new file mode 100644
index 000000000000..d20e7fa9a1bd
--- /dev/null
+++ b/src/SourceBuild/patches/aspnetcore/0001-Use-host-live-crossgen2.patch
@@ -0,0 +1,75 @@
+From d37bcaf1cc55f4dd34ddad48ad726fc413c1a25b Mon Sep 17 00:00:00 2001
+From: Jeremy Koritzinsky <jekoritz@microsoft.com>
+Date: Fri, 13 Dec 2024 13:33:17 -0800
+Subject: [PATCH] In VMR builds, a host-SDK crossgen will always be
+ available.
+
+Backport: https://github.com/dotnet/aspnetcore/pull/59551
+---
+diff --git a/eng/targets/Sfx.Common.targets b/eng/targets/Sfx.Common.targets
+index 5ff818b44f..f97b379391 100644
+--- a/eng/targets/Sfx.Common.targets
++++ b/eng/targets/Sfx.Common.targets
+@@ -36,4 +36,13 @@
+       <PublishReadyToRunPgoFiles Include="%(MIBCPackage.PackagePath)/**/*.mibc" />
+     </ItemGroup>
+   </Target>
++
++  <!-- We need to reference the live RID graph to get a graph with any additionally supported RIDs for this build. -->
++  <ItemGroup>
++    <PackageDownload Include="Microsoft.NETCore.Platforms" Version="[$(MicrosoftNETCorePlatformsVersion)]" />
++  </ItemGroup>
++
++  <PropertyGroup Condition="Exists('$(NuGetPackageRoot)microsoft.netcore.platforms/$(MicrosoftNETCorePlatformsVersion)')">
++    <RuntimeIdentifierGraphPath>$(NuGetPackageRoot)microsoft.netcore.platforms/$(MicrosoftNETCorePlatformsVersion)/PortableRuntimeIdentifierGraph.json</RuntimeIdentifierGraphPath>
++  </PropertyGroup>
+ </Project>
+diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in
+index 88f09a8c89..4d56e7e3f1 100644
+--- a/eng/tools/GenerateFiles/Directory.Build.targets.in
++++ b/eng/tools/GenerateFiles/Directory.Build.targets.in
+@@ -80,7 +80,8 @@
+       <DefaultRuntimeFrameworkVersion Condition=" '$(IsServicingBuild)' != 'true' AND
+           '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' AND
+           '$(TargetLatestDotNetRuntime)' != 'false' ">${MicrosoftNETCoreAppRuntimeVersion}</DefaultRuntimeFrameworkVersion>
+-      <RuntimePackRuntimeIdentifiers Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</RuntimePackRuntimeIdentifiers>
++      <!-- Workaround https://github.com/dotnet/sdk/pull/45487: The .NET SDK requires the crossgen2 host runtime identifier to be in the runtime pack runtime identifiers list. -->
++      <RuntimePackRuntimeIdentifiers Condition="'$(DotNetBuild)' == 'true'">%(RuntimePackRuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier);$(TargetRuntimeIdentifier)</RuntimePackRuntimeIdentifiers>
+     </KnownFrameworkReference>
+ 
+     <KnownAppHostPack Update="Microsoft.NETCore.App">
+@@ -108,7 +109,7 @@
+     <KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2">
+       <Crossgen2PackVersion
+           Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</Crossgen2PackVersion>
+-      <Crossgen2RuntimeIdentifiers Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</Crossgen2RuntimeIdentifiers>
++      <Crossgen2RuntimeIdentifiers Condition="'$(DotNetBuild)' == 'true'">%(Crossgen2RuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier);$(TargetRuntimeIdentifier)</Crossgen2RuntimeIdentifiers>
+     </KnownCrossgen2Pack>
+ 
+     <KnownILLinkPack Update="Microsoft.NET.ILLink.Tasks" Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">
+diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj
+index 68d2861437..7d75aa7f8c 100644
+--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj
++++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj
+@@ -15,8 +15,6 @@
+     <RollForward>LatestPatch</RollForward>
+     <!-- Precompile the shared framework with ReadyToRun. ReadyToRun is not currently supported on s390x or ppc64le or armv6 or loongarch64. -->
+     <PublishReadyToRun Condition=" '$(TargetArchitecture)' == 's390x' OR '$(TargetArchitecture)' == 'armv6' OR '$(TargetArchitecture)' == 'ppc64le' OR '$(TargetArchitecture)' == 'loongarch64' ">false</PublishReadyToRun>
+-    <!-- VMR doesn't produce valid crossgen for the host/build machine https://github.com/dotnet/source-build/issues/3793 -->
+-    <PublishReadyToRun Condition=" '$(DotNetBuild)' == 'true' AND '$(Crossbuild)' == 'true' ">false</PublishReadyToRun>
+     <PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' AND '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
+     <!-- Don't use ReadyToRun when explicitly opted out -->
+     <PublishReadyToRun Condition="'$(CrossgenOutput)' == 'false'">false</PublishReadyToRun>
+diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj
+index d3160de441..533c6840f9 100644
+--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj
++++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj
+@@ -15,8 +15,6 @@
+     <RollForward>LatestPatch</RollForward>
+     <!-- Precompile the shared framework with ReadyToRun. ReadyToRun is not currently supported on s390x or ppc64le or armv6 or loongarch64. -->
+     <PublishReadyToRun Condition=" '$(TargetArchitecture)' == 's390x' OR '$(TargetArchitecture)' == 'armv6' OR '$(TargetArchitecture)' == 'ppc64le' OR '$(TargetArchitecture)' == 'loongarch64' ">false</PublishReadyToRun>
+-    <!-- VMR doesn't produce valid crossgen for the host/build machine https://github.com/dotnet/source-build/issues/3793 -->
+-    <PublishReadyToRun Condition=" '$(DotNetBuild)' == 'true' AND '$(Crossbuild)' == 'true' ">false</PublishReadyToRun>
+     <PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' AND '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
+     <!-- Don't use ReadyToRun when explicitly opted out -->
+     <PublishReadyToRun Condition="'$(CrossgenOutput)' == 'false'">false</PublishReadyToRun>
diff --git a/src/SourceBuild/patches/runtime/0001-add-new-crossgen2-build-variant.patch b/src/SourceBuild/patches/runtime/0001-add-new-crossgen2-build-variant.patch
new file mode 100644
index 000000000000..62651713c2d4
--- /dev/null
+++ b/src/SourceBuild/patches/runtime/0001-add-new-crossgen2-build-variant.patch
@@ -0,0 +1,538 @@
+From 25efc5179a47fcdb3551167ecd56b6af950abdc9 Mon Sep 17 00:00:00 2001
+From: Jeremy Koritzinsky <jekoritz@microsoft.com>
+Date: Tue, 10 Dec 2024 13:40:42 -0800
+Subject: [PATCH] Add a new crossgen2 build variant for a published
+ crossgen2 targetting the host OS
+
+Backport: https://github.com/dotnet/runtime/pull/110676
+---
+diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
+index 86f8ce3b0ff..d4ace3ebb7c 100644
+--- a/eng/DotNetBuild.props
++++ b/eng/DotNetBuild.props
+@@ -107,6 +107,9 @@
+ 
+       <!-- Needed until https://github.com/dotnet/runtime/issues/109329 is fixed. -->
+       <InnerBuildArgs Condition="'$(NetCoreAppToolCurrentVersion)' != ''">$(InnerBuildArgs) /p:NetCoreAppToolCurrentVersion=$(NetCoreAppToolCurrentVersion)</InnerBuildArgs>
++
++      <!-- Pass ShortStack to the inner build so we can skip building host-machine components for downstream repos when we're the last repo. -->
++      <InnerBuildArgs Condition="'$(ShortStack)' == 'true'">$(InnerBuildArgs) /p:ShortStack=true</InnerBuildArgs>
+     </PropertyGroup>
+   </Target>
+ 
+diff --git a/eng/Signing.props b/eng/Signing.props
+index c1ff2d8ba47..83d46fd57a7 100644
+--- a/eng/Signing.props
++++ b/eng/Signing.props
+@@ -1,6 +1,6 @@
+ <Project>
+   <PropertyGroup>
+-    <EnableDefaultArtifacts Condition="'$(DotNetBuild)' != 'true'">false</EnableDefaultArtifacts>
++    <EnableDefaultArtifacts>false</EnableDefaultArtifacts>
+   </PropertyGroup>
+ 
+   <ItemGroup>
+@@ -27,10 +27,10 @@
+ 
+     <FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" />
+ 
+-    <!-- 
++    <!--
+       Removal is temporarily needed as we integrate support for these extensions into SignTool.
+       Should be cleaned up after https://github.com/dotnet/arcade/issues/14432,
+-      https://github.com/dotnet/arcade/issues/14433, and 
++      https://github.com/dotnet/arcade/issues/14433, and
+       https://github.com/dotnet/arcade/issues/14435 are completed.
+      -->
+     <FileExtensionSignInfo Remove=".deb;.rpm;.pkg" />
+@@ -45,20 +45,37 @@
+     <FileSignInfo Update="@(FileSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
+   </ItemGroup>
+ 
++  <ItemGroup Condition="'$(DotNetBuildOrchestrator)' == 'true'">
++    <VerticalVisibilityNuGetPackages Condition="'$(RuntimeFlavor)' != 'Mono' and '$(ShortStack)' != 'true' and '$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)'"
++                                     Include="$(ArtifactsPackagesDir)**\Microsoft.NETCore.App.Crossgen2.$(NETCoreSdkRuntimeIdentifier).*.nupkg" />
++  </ItemGroup>
++
+   <!-- In build signing and publishing without a join point -->
+   <ItemGroup Condition="'$(DotNetBuild)' == 'true'">
+-    <Artifact Include="$(ArtifactsPackagesDir)**\*.tar.gz;
+-                       $(ArtifactsPackagesDir)**\*.zip;
+-                       $(ArtifactsPackagesDir)**\*.deb;
+-                       $(ArtifactsPackagesDir)**\*.rpm;
+-                       $(ArtifactsPackagesDir)**\*.pkg;
+-                       $(ArtifactsPackagesDir)**\*.exe;
+-                       $(ArtifactsPackagesDir)**\*.msi"
+-              Exclude="$(ArtifactsPackagesDir)**\Symbols.runtime.tar.gz"
+-              IsShipping="$([System.String]::Copy('%(RecursiveDir)').StartsWith('Shipping'))">
+-      <!-- Exclude wixpack.zip files from checksum generation -->
+-      <ChecksumPath Condition="$([System.String]::Copy('%(Filename)%(Extension)').EndsWith('.wixpack.zip')) != 'true'">%(FullPath).sha512</ChecksumPath>
+-    </Artifact>
++    <NuGetPackages Include="@(VerticalVisibilityNuGetPackages)" Visibility="Vertical" />
++    <NuGetPackages Include="$(ArtifactsPackagesDir)**\*.nupkg" Exclude="@(NuGetPackages)" />
++
++    <NuGetPackages Update="@(NuGetPackages)" PublishFlatContainer="false" />
++
++    <Archives Include="$(ArtifactsPackagesDir)**\*.tar.gz;
++                       $(ArtifactsPackagesDir)**\*.zip"
++              Exclude="$(ArtifactsPackagesDir)**\Symbols.runtime.tar.gz;
++                       $(ArtifactsPackagesDir)**\*.wixpack.zip">
++      <ChecksumPath>%(FullPath).sha512</ChecksumPath>
++    </Archives>
++
++    <WixPacks Include="$(ArtifactsPackagesDir)**\*.wixpack.zip" />
++
++    <Installers Include="$(ArtifactsPackagesDir)**\*.deb;
++                         $(ArtifactsPackagesDir)**\*.rpm;
++                         $(ArtifactsPackagesDir)**\*.pkg;
++                         $(ArtifactsPackagesDir)**\*.exe;
++                         $(ArtifactsPackagesDir)**\*.msi">
++      <ChecksumPath>%(FullPath).sha512</ChecksumPath>
++    </Installers>
++
++    <Artifact Include="@(NuGetPackages);@(Archives);@(WixPacks);@(Installers)"
++              IsShipping="$([System.String]::Copy('%(RecursiveDir)').StartsWith('Shipping'))" />
+   </ItemGroup>
+ 
+   <!-- Only the following artifacts should be signed.
+@@ -71,4 +88,4 @@
+               SkipPublish="true" />
+   </ItemGroup>
+ 
+-</Project>
+\ No newline at end of file
++</Project>
+diff --git a/eng/Subsets.props b/eng/Subsets.props
+index 1491a0aeba8..ca25439fafa 100644
+--- a/eng/Subsets.props
++++ b/eng/Subsets.props
+@@ -548,6 +548,13 @@
+       <ItemGroup>
+         <ProjectToBuild Condition="'$(NativeAotSupported)' == 'true' and '$(RuntimeFlavor)' != 'Mono' and '$(BuildOnlyPgoInstrumentedAssets)' != 'true'" Include="$(InstallerProjectRoot)\pkg\projects\nativeaot-packages.proj" Category="packs" />
+       </ItemGroup>
++      <ItemGroup>
++        <!--
++          When we're building in the VMR, we need to provide a crossgen2 that runs on the host machine for downstream repos to use to R2R their code.
++          In non-VMR builds, downstream repos can use the crossgen2 built for the target host SDK from another build leg, but in the VMR we need to provide one to use.
++        -->
++        <ProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono' and '$(DotNetBuildOrchestrator)' == 'true' and '$(ShortStack)' != 'true' and '$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.Host.sfxproj" Category="packs" />
++      </ItemGroup>
+       <ItemGroup>
+         <SharedFrameworkProjectToBuild Condition="'$(BuildMonoAOTCrossCompilerOnly)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Runtime.sfxproj" />
+         <SharedFrameworkProjectToBuild Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\bundle\Microsoft.NETCore.App.Bundle.bundleproj" />
+diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj
+index 714c1efafd5..ed54fc3cf11 100644
+--- a/src/coreclr/crossgen-corelib.proj
++++ b/src/coreclr/crossgen-corelib.proj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.Build.NoTargets">
+ 
+   <ItemGroup>
+-    <ProjectReference Include="$(CoreClrProjectRoot)/tools/aot/crossgen2/crossgen2_inbuild.csproj" OutputItemType="Crossgen2" />
++    <ProjectReference Include="$(CoreClrProjectRoot)/tools/aot/crossgen2/crossgen2_inbuild.csproj" OutputItemType="Crossgen2Files" />
+     <ProjectReference Include="$(CoreClrProjectRoot)/tools/dotnet-pgo/dotnet-pgo.csproj" OutputItemType="DotNetPgo" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
+     <ProjectReference Include="$([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))" OutputItemType="CoreLib" />
+   </ItemGroup>
+@@ -92,21 +92,13 @@
+     <ItemGroup>
+       <Crossgen2Inputs Include="@(CoreLib)" />
+       <Crossgen2Inputs Include="$(MergedMibcPath)" />
+-    </ItemGroup>
+-
+-    <PropertyGroup>
+-      <Crossgen2OutputPath>%(Crossgen2.RootDir)/%(Crossgen2.Directory)</Crossgen2OutputPath>
+-    </PropertyGroup>
+-    <ItemGroup>
+-      <Crossgen2Files Include="$(Crossgen2OutputPath)/*.dll" />
+-      <Crossgen2Files Include="$(Crossgen2OutputPath)/*.so" />
+-      <Crossgen2Files Include="$(Crossgen2OutputPath)/*.dylib" />
++      <Crossgen2Inputs Include="@(Crossgen2Files->Metadata('OutputPath'))" />
+     </ItemGroup>
+   </Target>
+ 
+   <Target Name="InvokeCrossgen"
+           DependsOnTargets="PrepareInvokeCrossgen;CreateMergedMibcFile"
+-          Inputs="@(Crossgen2Inputs);@(Crossgen2Files)"
++          Inputs="@(Crossgen2Inputs)"
+           Outputs="$(CoreLibOutputPath);$(CoreLibNiPdbPath);$(CoreLibPerfMapPath)"
+           AfterTargets="Build">
+ 
+@@ -117,7 +109,7 @@
+       Text="Generating native image of System.Private.CoreLib for $(OSPlatformConfig). Logging to $(CrossGenCoreLibLog)" />
+ 
+     <PropertyGroup>
+-      <CrossGenDllCmd>$(DotNetCli) @(Crossgen2)</CrossGenDllCmd>
++      <CrossGenDllCmd>@(Crossgen2Files->Metadata('OutputPath')->WithMetadataValue('Filename','crossgen2')->WithMetadataValue('Extension','$(ExeSuffix)'))</CrossGenDllCmd>
+       <CrossGenDllCmd>$(CrossGenDllCmd) -o:$(CoreLibOutputPath)</CrossGenDllCmd>
+       <CrossGenDllCmd>$(CrossGenDllCmd) -r:$([MSBuild]::NormalizePath('$(BinDir)', 'IL', '*.dll'))</CrossGenDllCmd>
+       <CrossGenDllCmd>$(CrossGenDllCmd) --targetarch:$(TargetArchitecture)</CrossGenDllCmd>
+diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2_inbuild.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2_inbuild.csproj
+index bf997aa8ebb..5e19365fad1 100644
+--- a/src/coreclr/tools/aot/crossgen2/crossgen2_inbuild.csproj
++++ b/src/coreclr/tools/aot/crossgen2/crossgen2_inbuild.csproj
+@@ -1,9 +1,20 @@
+-<Project Sdk="Microsoft.NET.Sdk">
++<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Publish;PublishItemsOutputGroup">
+   <PropertyGroup>
+     <CrossHostArch Condition="'$(CrossBuild)' == 'true' or '$(TargetArchitecture)' != '$(BuildArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(EnableNativeSanitizers)' != ''">$(BuildArchitecture)</CrossHostArch>
+-    <OutputPath>$(RuntimeBinDir)/$(BuildArchitecture)/crossgen2/</OutputPath>
+-    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
+-    <UseAppHost>false</UseAppHost>
++    <_IsPublishing>true</_IsPublishing>
++    <RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
++    <PublishDir>$(RuntimeBinDir)$(BuildArchitecture)/crossgen2/</PublishDir>
++    <SelfContained>true</SelfContained>
++    <PublishTrimmed>true</PublishTrimmed>
++    <!--
++      Publish with AOT on Windows as Single file doesn't work well when an app has to include DiaSymReader.Native.
++      Publish single-file elsewhere so we don't need to adjust our "AOT in build" logic to handle targeting the SDK RID.
++    -->
++    <PublishAot Condition="$(NETCoreSdkPortableRuntimeIdentifier.StartsWith('win-'))">true</PublishAot>
++    <PublishSingleFile Condition="'$(PublishAot)' != 'true'">true</PublishSingleFile>
++    <PublishReadyToRun>true</PublishReadyToRun>
++    <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
++    <TrimmerSingleWarn>false</TrimmerSingleWarn>
+   </PropertyGroup>
+   <Import Project="crossgen2.props" />
+ </Project>
+diff --git a/src/installer/pkg/Directory.Build.props b/src/installer/pkg/Directory.Build.props
+deleted file mode 100644
+index f5171867636..00000000000
+--- a/src/installer/pkg/Directory.Build.props
++++ /dev/null
+@@ -1,21 +0,0 @@
+-<Project>
+-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
+-
+-  <PropertyGroup>
+-    <Platform>$(TargetArchitecture)</Platform>
+-  </PropertyGroup>
+-
+-  <PropertyGroup>
+-    <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform>
+-    <PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform>
+-
+-    <PackageIndexFile>$(MSBuildThisFileDirectory)packageIndex.json</PackageIndexFile>
+-
+-    <!-- this repo doesn't currently use the index so don't force it to be in sync -->
+-    <SkipIndexCheck>true</SkipIndexCheck>
+-  </PropertyGroup>
+-
+-  <ItemGroup>
+-    <PackageIndex Include="$(PackageIndexFile)" />
+-  </ItemGroup>
+-</Project>
+diff --git a/src/installer/pkg/Directory.Build.targets b/src/installer/pkg/Directory.Build.targets
+deleted file mode 100644
+index 9a502b2705e..00000000000
+--- a/src/installer/pkg/Directory.Build.targets
++++ /dev/null
+@@ -1,19 +0,0 @@
+-<Project>
+-  <Import Project="..\Directory.Build.targets" />
+-
+-  <!--
+-    Add hook for depproj build to respect OrderProjectReferences like pkgproj does. "BeforeTargets"
+-    runs after "DependsOnTargets", so hook each crossgen target individually to ensure this happens
+-    before any of them.
+-
+-    TODO: (Consolidation) Add this target properly to the sharedfx tooling. https://github.com/dotnet/runtime/issues/749
+-  -->
+-  <Target Name="EnsureOrderProjectReferencesBuilt"
+-          BeforeTargets="
+-            CrossGen;
+-            CreateCrossGenImages;
+-            CreateCrossGenSymbols">
+-    <MSBuild Projects="@(OrderProjectReference)" Targets="Build" />
+-  </Target>
+-
+-</Project>
+diff --git a/src/installer/pkg/projects/Directory.Build.props b/src/installer/pkg/projects/Directory.Build.props
+index a07b360efc0..08e5bde54a5 100644
+--- a/src/installer/pkg/projects/Directory.Build.props
++++ b/src/installer/pkg/projects/Directory.Build.props
+@@ -2,6 +2,19 @@
+   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
+ 
+   <PropertyGroup>
++
++    <PackageIndexFile>$(MSBuildThisFileDirectory)packageIndex.json</PackageIndexFile>
++
++    <!-- this repo doesn't currently use the index so don't force it to be in sync -->
++    <SkipIndexCheck>true</SkipIndexCheck>
++  </PropertyGroup>
++
++  <ItemGroup>
++    <PackageIndex Include="$(PackageIndexFile)" />
++  </ItemGroup>
++
++  <PropertyGroup>
++    <Platform>$(TargetArchitecture)</Platform>
+     <PackagePlatform>AnyCPU</PackagePlatform>
+ 
+     <SkipPackageFileCheck>true</SkipPackageFileCheck>
+diff --git a/src/installer/pkg/packageIndex.json b/src/installer/pkg/projects/packageIndex.json
+similarity index 100%
+rename from src/installer/pkg/packageIndex.json
+rename to src/installer/pkg/projects/packageIndex.json
+diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.Host.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.Host.sfxproj
+new file mode 100644
+index 00000000000..6f7c19cda2d
+--- /dev/null
++++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.Host.sfxproj
+@@ -0,0 +1,11 @@
++<Project Sdk="Microsoft.NET.Sdk">
++  <Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" />
++
++  <PropertyGroup>
++    <CrossgenPublishProject>$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2_inbuild.csproj</CrossgenPublishProject>
++    <RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
++    <IsShipping>false</IsShipping>
++  </PropertyGroup>
++
++  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NETCore.App.Crossgen2.props" />
++</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
+new file mode 100644
+index 00000000000..a400c42adf2
+--- /dev/null
++++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.props
+@@ -0,0 +1,53 @@
++<Project>
++  <PropertyGroup>
++    <!-- Crossgen is not used for Mono -->
++    <SkipBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</SkipBuild>
++    <PlatformPackageType>ToolPack</PlatformPackageType>
++    <SharedFrameworkName>$(SharedFrameworkName).Crossgen2</SharedFrameworkName>
++    <OverridePackageId>$(SharedFrameworkName).$(RuntimeIdentifier)</OverridePackageId>
++    <ArchiveName>dotnet-crossgen2</ArchiveName>
++    <SharedFrameworkHostFileNameOverride>crossgen2</SharedFrameworkHostFileNameOverride>
++    <GenerateInstallers>false</GenerateInstallers>
++    <PermitDllAndExeFilesLackingFileVersion>true</PermitDllAndExeFilesLackingFileVersion>
++    <!-- Publishing as single-file or NativeAOT means we can't examine the interior DLLs -->
++    <ShouldVerifyClosure>false</ShouldVerifyClosure>
++  </PropertyGroup>
++
++  <ItemGroup>
++    <ProjectReference
++      Include="$(CrossgenPublishProject)"
++      OutputItemType="_RawCrossgenPublishFiles"
++      ReferenceOutputAssembly="false" />
++  </ItemGroup>
++
++  <Target Name="PublishCrossgen"
++          BeforeTargets="GetFilesToPackage">
++    <ItemGroup>
++      <_CrossgenPublishFiles Include="@(_RawCrossgenPublishFiles->'%(OutputPath)')"
++                             KeepMetadata="REMOVE_ALL" />
++    </ItemGroup>
++    <ItemGroup Condition="'$(NativeAotSupported)' != 'true'">
++      <FilesToPackage Include="@(_CrossgenPublishFiles)"
++                      Exclude="*.pdb;*.h;*.lib"
++                      TargetPath="tools/" />
++    </ItemGroup>
++    <ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
++      <!-- Treat all native aot assets as native runtime assets -->
++      <FilesToPackage Include="@(_CrossgenPublishFiles->Distinct())"
++                          Condition="'%(Extension)' != '.pdb'"
++                          TargetPath="tools/" />
++    </ItemGroup>
++  </Target>
++
++  <Target Name="AddCrossgen2SymbolFilesToPackage" BeforeTargets="GetFilesToPackage" DependsOnTargets="PublishCrossgen">
++    <ItemGroup>
++      <_Crossgen2SymbolFilesToPackage Include="@(_CrossgenPublishFiles)" Condition="'%(Extension)' == '.pdb'" />
++      <!-- Symbol files for JIT libraries are placed in a different location for Windows builds -->
++      <_Crossgen2SymbolFilesToPackage Include="@(NativeRuntimeAsset->'$(CoreCLRArtifactsPdbDir)%(FileName).pdb')" Condition="'$(TargetOS)' == 'windows' and '%(FileName)' != 'crossgen2'" />
++      <_Crossgen2SymbolFilesToPackage Include="@(NativeRuntimeAsset->'$(CoreCLRArtifactsPath)%(FileName)%(Extension)$(SymbolsSuffix)')" Condition="'$(TargetOS)' != 'windows' and '%(FileName)' != 'crossgen2'" />
++      <_Crossgen2SymbolFilesToPackage Remove="@(_Crossgen2SymbolFilesToPackage)" Condition="!Exists('%(Identity)')" />
++
++      <_SymbolFilesToPackage Include="@(_Crossgen2SymbolFilesToPackage)" TargetPath="tools/" />
++    </ItemGroup>
++  </Target>
++</Project>
+diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj
+index c9d40b79d38..97e6737c777 100644
+--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj
++++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj
+@@ -1,51 +1,15 @@
+-<Project>
+-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+-  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
++<Project Sdk="Microsoft.NET.Sdk">
++  <Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" />
+ 
+   <PropertyGroup>
+-    <!-- Crossgen is not used for Mono -->
+-    <SkipBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</SkipBuild>
+-    <PlatformPackageType>ToolPack</PlatformPackageType>
+-    <SharedFrameworkName>$(SharedFrameworkName).Crossgen2</SharedFrameworkName>
+-    <OverridePackageId>$(SharedFrameworkName).$(RuntimeIdentifier)</OverridePackageId>
+-    <ArchiveName>dotnet-crossgen2</ArchiveName>
+-    <SharedFrameworkHostFileNameOverride>crossgen2</SharedFrameworkHostFileNameOverride>
+-    <GenerateInstallers>false</GenerateInstallers>
+-    <HostJsonTargetPath>tools/</HostJsonTargetPath>
+-    <PermitDllAndExeFilesLackingFileVersion>true</PermitDllAndExeFilesLackingFileVersion>
+-    <!-- Publishing as single-file or NativeAOT means we can't examine the interior DLLs -->
+-    <ShouldVerifyClosure>false</ShouldVerifyClosure>
++    <CrossgenPublishProject>$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj</CrossgenPublishProject>
+   </PropertyGroup>
+ 
+   <ItemGroup>
+     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
+   </ItemGroup>
+ 
+-  <ItemGroup>
+-    <ProjectReference
+-      Include="$(RepoRoot)src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj"
+-      OutputItemType="_RawCrossgenPublishFiles"
+-      ReferenceOutputAssembly="false" />
+-  </ItemGroup>
+-
+-  <Target Name="PublishCrossgen"
+-          BeforeTargets="GetFilesToPackage">
+-    <ItemGroup>
+-      <_CrossgenPublishFiles Include="@(_RawCrossgenPublishFiles->'%(OutputPath)')"
+-                             KeepMetadata="REMOVE_ALL" />
+-    </ItemGroup>
+-    <ItemGroup Condition="'$(NativeAotSupported)' != 'true'">
+-      <FilesToPackage Include="@(_CrossgenPublishFiles)"
+-                      Exclude="*.pdb;*.h;*.lib"
+-                      TargetPath="tools/" />
+-    </ItemGroup>
+-    <ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
+-      <!-- Treat all native aot assets as native runtime assets -->
+-      <FilesToPackage Include="@(_CrossgenPublishFiles->Distinct())"
+-                          Condition="'%(Extension)' != '.pdb'"
+-                          TargetPath="tools/" />
+-    </ItemGroup>
+-  </Target>
++  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NETCore.App.Crossgen2.props" />
+ 
+   <Target Name="RunPublishedCrossgen" AfterTargets="PublishCrossgen"
+           Condition="'$(TargetOS)' == '$(HostOS)' and '$(TargetArchitecture)' == '$(BuildArchitecture)' and '$(CrossBuild)' != 'true'">
+@@ -54,41 +18,4 @@
+       <Output TaskParameter="ExitCode" PropertyName="CrossgenExitCode" />
+     </Exec>
+   </Target>
+-
+-  <PropertyGroup>
+-    <TargetOSComponent>unix</TargetOSComponent>
+-    <TargetOSComponent Condition="'$(TargetOS)' == 'windows'">win</TargetOSComponent>
+-    <TargetSpec>$(TargetOSComponent)-$(TargetArchitecture)</TargetSpec>
+-  </PropertyGroup>
+-
+-  <Target Name="AddCrossgen2SymbolFilesToPackage" BeforeTargets="GetFilesToPackage" DependsOnTargets="PublishCrossgen">
+-    <ItemGroup>
+-      <_Crossgen2SymbolFilesToPackage Include="@(_CrossgenPublishFiles)" Condition="'%(Extension)' == '.pdb'" />
+-      <!-- Symbol files for JIT libraries are placed in a different location for Windows builds -->
+-      <_Crossgen2SymbolFilesToPackage Include="@(NativeRuntimeAsset->'$(CoreCLRArtifactsPdbDir)%(FileName).pdb')" Condition="'$(TargetOS)' == 'windows' and '%(FileName)' != 'crossgen2'" />
+-      <_Crossgen2SymbolFilesToPackage Include="@(NativeRuntimeAsset->'$(CoreCLRArtifactsPath)%(FileName)%(Extension)$(SymbolsSuffix)')" Condition="'$(TargetOS)' != 'windows' and '%(FileName)' != 'crossgen2'" />
+-      <_Crossgen2SymbolFilesToPackage Remove="@(_Crossgen2SymbolFilesToPackage)" Condition="!Exists('%(Identity)')" />
+-
+-      <_SymbolFilesToPackage Include="@(_Crossgen2SymbolFilesToPackage)" TargetPath="tools/" />
+-    </ItemGroup>
+-  </Target>
+-
+-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+-  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
+-
+-  <Target Name="GetFilesToPublish">
+-    <MSBuild Projects="$(MSBuildProjectFullPath)"
+-          Targets="_GetAllSharedFrameworkFiles"
+-          RemoveProperties="OutputPath;SymbolsOutputPath">
+-      <Output TaskParameter="TargetOutputs" ItemName="_FilesToPackage" />
+-    </MSBuild>
+-    <ItemGroup>
+-      <_PackagedFilesToPublish Include="@(_FilesToPackage)" Condition="'%(_FilesToPackage.PackOnly)' != 'true'" />
+-    </ItemGroup>
+-    <ItemGroup>
+-      <FilesToPublish Include="@(_PackagedFilesToPublish)"
+-                       TargetPath="" />
+-    </ItemGroup>
+-  </Target>
+-
+ </Project>
+diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets b/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets
+index 09730ed2265..1e27f828c5b 100644
+--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets
++++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets
+@@ -2,16 +2,14 @@
+   <Target Name="ResolveReadyToRunCompilers" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild">
+     <PropertyGroup>
+       <PublishReadyToRunPerfmapFormatVersion Condition="'$(PublishReadyToRunPerfmapFormatVersion)' == ''">1</PublishReadyToRunPerfmapFormatVersion>
+-      <Crossgen2Path>$([MSBuild]::NormalizePath('$(Crossgen2InBuildDir)', 'crossgen2.dll'))</Crossgen2Path>
+-      <R2RDotnetHostPath>$(DotNetTool)</R2RDotnetHostPath>
++      <Crossgen2Path>$([MSBuild]::NormalizePath('$(Crossgen2InBuildDir)', 'crossgen2$(ExeSuffix)'))</Crossgen2Path>
+     </PropertyGroup>
+ 
+     <ItemGroup>
+       <Crossgen2Tool Include="$(Crossgen2Path)"
+                      TargetArch="$(TargetArchitecture)"
+                      TargetOS="$(TargetOS)"
+-                     DotnetHostPath="$(R2RDotnetHostPath)"
+                      PerfmapFormatVersion="$(PublishReadyToRunPerfmapFormatVersion)"/>
+     </ItemGroup>
+   </Target>
+-</Project>
+\ No newline at end of file
++</Project>
+diff --git a/src/installer/pkg/sfx/installers/dotnet-host.proj b/src/installer/pkg/sfx/installers/dotnet-host.proj
+index 1d4b96ab335..26374305866 100644
+--- a/src/installer/pkg/sfx/installers/dotnet-host.proj
++++ b/src/installer/pkg/sfx/installers/dotnet-host.proj
+@@ -20,7 +20,7 @@
+     <MacOSScriptsTemplateDirectory>osx_scripts/host</MacOSScriptsTemplateDirectory>
+     <MacOSPackageDescription>The .NET Shared Host.</MacOSPackageDescription>
+     <!-- Enables stable upgrade code - do not change -->
+-    <MsiUpgradeCodeSeed>dotnet-host $(MajorVersion).$(MinorVersion) $(Platform)</MsiUpgradeCodeSeed>
++    <MsiUpgradeCodeSeed>dotnet-host $(MajorVersion).$(MinorVersion) $(TargetArchitecture)</MsiUpgradeCodeSeed>
+   </PropertyGroup>
+ 
+   <ItemGroup>
+diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+index 84e378bd855..580023b627f 100644
+--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
++++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+@@ -22,8 +22,19 @@
+ 
+   <ItemGroup>
+     <AdditionalRuntimeIdentifiers Include="$(AdditionalRuntimeIdentifiers)" Imports="$(AdditionalRuntimeIdentifierParent)" />
++  </ItemGroup>
++
++  <!-- Workaround for https://github.com/dotnet/sdk/pull/45566: Ensure that the OS portion of the RID we're building for is part of the RID graph as a separate RID. -->
++  <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
++    <OutputRidOS Condition="$(OutputRID.Contains('-'))">$(OutputRID.Split('-')[0])</OutputRidOS>
++    <AdditionalRidParentOS Condition="$(AdditionalRuntimeIdentifierParent.Contains('-'))">$(AdditionalRuntimeIdentifierParent.Split('-')[0])</AdditionalRidParentOS>
++    <AdditionalRidParentOS Condition="!$(AdditionalRuntimeIdentifierParent.Contains('-'))">$(AdditionalRuntimeIdentifierParent)</AdditionalRidParentOS>
++  </PropertyGroup>
++
++  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+     <!-- When building from source, ensure the RID we're building for is part of the RID graph. -->
+-    <AdditionalRuntimeIdentifiers Include="$(OutputRID)" Imports="$(AdditionalRuntimeIdentifierParent)" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
++    <AdditionalRuntimeIdentifiers Include="$(OutputRidOS)" Imports="$(AdditionalRidParentOS)" Condition="'$(OutputRidOS)' != ''" />
++    <AdditionalRuntimeIdentifiers Include="$(OutputRID)" Imports="$(AdditionalRuntimeIdentifierParent);$(OutputRidOS)" />
+   </ItemGroup>
+ 
+   <ItemGroup>
+diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/UpdateRuntimeIdentifierGraph.cs b/src/libraries/Microsoft.NETCore.Platforms/src/UpdateRuntimeIdentifierGraph.cs
+index 867da09df9b..182e724f4f9 100644
+--- a/src/libraries/Microsoft.NETCore.Platforms/src/UpdateRuntimeIdentifierGraph.cs
++++ b/src/libraries/Microsoft.NETCore.Platforms/src/UpdateRuntimeIdentifierGraph.cs
+@@ -1,6 +1,7 @@
+ // Licensed to the .NET Foundation under one or more agreements.
+ // The .NET Foundation licenses this file to you under the MIT license.
+ 
++using System;
+ using System.IO;
+ using Microsoft.Build.Framework;
+ using Microsoft.Build.Utilities;
+@@ -40,7 +41,7 @@ public override bool Execute()
+                     continue;
+                 }
+ 
+-                string[] importedRids = rid.GetMetadata("Imports").Split(';');
++                string[] importedRids = rid.GetMetadata("Imports").Split([';'], StringSplitOptions.RemoveEmptyEntries);
+                 runtimes.Add(rid.ItemSpec, new JObject(new JProperty("#import", new JArray(importedRids))));
+             }
+ 
diff --git a/src/SourceBuild/patches/windowsdesktop/0001-use-live-crossgen2.patch b/src/SourceBuild/patches/windowsdesktop/0001-use-live-crossgen2.patch
new file mode 100644
index 000000000000..6c3b53e28e60
--- /dev/null
+++ b/src/SourceBuild/patches/windowsdesktop/0001-use-live-crossgen2.patch
@@ -0,0 +1,74 @@
+From 1ef690888a7668a6c25ea3f0647ca06108e64d6b Mon Sep 17 00:00:00 2001
+From: Jeremy Koritzinsky <jekoritz@microsoft.com>
+Date: Fri, 13 Dec 2024 13:40:47 -0800
+Subject: [PATCH 1/2] Use the live crossgen2 corresponding to the runtime we're
+ building against.
+
+Backport: https://github.com/dotnet/windowsdesktop/pull/4815
+
+---
+ src/windowsdesktop/src/sfx/Directory.Build.targets | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/windowsdesktop/src/sfx/Directory.Build.targets b/src/windowsdesktop/src/sfx/Directory.Build.targets
+index ca14567ba..721779d78 100644
+--- a/src/windowsdesktop/src/sfx/Directory.Build.targets
++++ b/src/windowsdesktop/src/sfx/Directory.Build.targets
+@@ -5,13 +5,19 @@
+   <ItemGroup>
+     <KnownFrameworkReference
+       Update="Microsoft.NETCore.App"
++      Condition="'%(TargetFramework)' == '$(TargetFramework)'"
+       DefaultRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)"
+       LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)"
+       TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
++    <KnownCrossgen2Pack
++      Update="Microsoft.NETCore.App.Crossgen2"
++      Condition="'%(TargetFramework)' == '$(TargetFramework)'"
++      Crossgen2PackVersion="$(MicrosoftNETCoreAppRefVersion)" />
+     <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
+     <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App" />
+     <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WindowsForms" />
+     <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WPF" />
++
+   </ItemGroup>
+ 
+   <ItemGroup>
+
+From aa7933c4e56dae574cc2314d59561e32f9c12ebe Mon Sep 17 00:00:00 2001
+From: Jeremy Koritzinsky <jekoritz@microsoft.com>
+Date: Fri, 13 Dec 2024 14:14:34 -0800
+Subject: [PATCH 2/2] Change style to enable referencing custom metadata
+
+---
+ .../src/sfx/Directory.Build.targets              | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/windowsdesktop/src/sfx/Directory.Build.targets b/src/windowsdesktop/src/sfx/Directory.Build.targets
+index 721779d78..7da1ca224 100644
+--- a/src/windowsdesktop/src/sfx/Directory.Build.targets
++++ b/src/windowsdesktop/src/sfx/Directory.Build.targets
+@@ -4,15 +4,15 @@
+ 
+   <ItemGroup>
+     <KnownFrameworkReference
+-      Update="Microsoft.NETCore.App"
+-      Condition="'%(TargetFramework)' == '$(TargetFramework)'"
+-      DefaultRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)"
+-      LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)"
+-      TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
++      Update="Microsoft.NETCore.App">
++      <DefaultRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(TargetFramework)'">$(MicrosoftNETCoreAppRefVersion)</DefaultRuntimeFrameworkVersion>
++      <LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(TargetFramework)'">$(MicrosoftNETCoreAppRefVersion)</LatestRuntimeFrameworkVersion>
++      <TargetingPackVersion Condition="'%(TargetFramework)' == '$(TargetFramework)'">$(MicrosoftNETCoreAppRefVersion)</TargetingPackVersion>
++    </KnownFrameworkReference>
+     <KnownCrossgen2Pack
+-      Update="Microsoft.NETCore.App.Crossgen2"
+-      Condition="'%(TargetFramework)' == '$(TargetFramework)'"
+-      Crossgen2PackVersion="$(MicrosoftNETCoreAppRefVersion)" />
++      Update="Microsoft.NETCore.App.Crossgen2">
++      <Crossgen2PackVersion Condition="'%(TargetFramework)' == '$(TargetFramework)'">$(MicrosoftNETCoreAppRefVersion)</Crossgen2PackVersion>
++    </KnownCrossgen2Pack>
+     <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
+     <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App" />
+     <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WindowsForms" />