diff --git a/NuGet.config b/NuGet.config
index 6f49a6cef..991df1c51 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -8,13 +8,11 @@
-
-
@@ -57,19 +55,16 @@
-
-
-
+
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e1b7fa2cb..0c67dca18 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -100,20 +100,20 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 86457a8ee126653ca38a5330a68e380a1da158e8
+ 882a576873b701f79d6584e4a0cf84036fdcd83f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 86457a8ee126653ca38a5330a68e380a1da158e8
+ 882a576873b701f79d6584e4a0cf84036fdcd83f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 86457a8ee126653ca38a5330a68e380a1da158e8
+ 882a576873b701f79d6584e4a0cf84036fdcd83f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 86457a8ee126653ca38a5330a68e380a1da158e8
+ 882a576873b701f79d6584e4a0cf84036fdcd83f
@@ -201,9 +201,9 @@
https://github.com/dotnet/arcade
3f3c360819c5c092d0e4505a67dfe59a33fba557
-
+
https://github.com/dotnet/source-build-reference-packages
- fb2dd1b6d4b8809014d2f91e645b683b718419fa
+ 4f5672e90b7f908d96aad61a40b0e9b352518b1c
diff --git a/eng/Versions.props b/eng/Versions.props
index 4d7fd209c..31db48967 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -64,8 +64,8 @@
7.0.100
- 7.0.100-rtm.22525.10
- 7.0.100-rtm.22525.10
+ 7.0.100-rtm.22521.7
+ 7.0.100-rtm.22521.7
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch
new file mode 100644
index 000000000..ab355630e
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MichaelSimons
+Date: Fri, 11 Nov 2022 21:10:54 +0000
+Subject: [PATCH] ResolvePackageFileConflicts workaround
+
+---
+ .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
+index 3b5d2ae950..f92fb421fe 100644
+--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
++++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
+@@ -253,6 +253,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
+
+
+
++
++
++
+
+
+
diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets
index da7d186a1..399529689 100644
--- a/src/redist/targets/Crossgen.targets
+++ b/src/redist/targets/Crossgen.targets
@@ -29,7 +29,27 @@
BuildInParallel="False"
Projects="@(CrossGenDownloadPackageProject)">
-
+
+
+
+ net7.0
+
+ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk\tools\$(DefaultToolTfm)\
+ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.BlazorWebAssembly\tools\$(DefaultToolTfm)\
+ $(SdkOutputDirectory)Sdks\NuGet.Build.Tasks.Pack\CoreCLR\
+ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Razor\tasks\$(DefaultToolTfm)\
+ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\$(DefaultToolTfm)\
+ $(SdkOutputDirectory)Sdks\Microsoft.NET.ILLink.Tasks\tools\$(DefaultToolTfm)\
+ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Publish\tools\$(DefaultToolTfm)\
+ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web\tools\$(DefaultToolTfm)\
+ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web.ProjectSystem\tools\$(DefaultToolTfm)\
+ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Worker\tools\$(DefaultToolTfm)\
+
+
@@ -49,16 +69,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -121,6 +141,21 @@
false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+