diff --git a/NuGet.config b/NuGet.config
index 9a84139e5..e885f4e2b 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,16 +7,22 @@
+
+
+
+
+
+
@@ -35,11 +41,15 @@
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 47d349cab..35c32467d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,46 +1,46 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 1217354ca79000178dca5bca83fe6ec490e1d2d6
+ 167140c0529a64c91f7a82249583ce27e52d28dd
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 1217354ca79000178dca5bca83fe6ec490e1d2d6
+ 167140c0529a64c91f7a82249583ce27e52d28dd
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 1217354ca79000178dca5bca83fe6ec490e1d2d6
+ 167140c0529a64c91f7a82249583ce27e52d28dd
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 1217354ca79000178dca5bca83fe6ec490e1d2d6
+ 167140c0529a64c91f7a82249583ce27e52d28dd
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
+ be98e88c760526452df94ef452fff4602fb5bded
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
+ be98e88c760526452df94ef452fff4602fb5bded
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
+ be98e88c760526452df94ef452fff4602fb5bded
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
+ be98e88c760526452df94ef452fff4602fb5bded
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
+ be98e88c760526452df94ef452fff4602fb5bded
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
+ be98e88c760526452df94ef452fff4602fb5bded
@@ -48,34 +48,34 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663
+ be98e88c760526452df94ef452fff4602fb5bded
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c911002ab43b7b989ed67090f2a48d9073d5118d
+ f9ae0f5d30be2de3c0de61b5673bd8873231d70a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c911002ab43b7b989ed67090f2a48d9073d5118d
+ f9ae0f5d30be2de3c0de61b5673bd8873231d70a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c911002ab43b7b989ed67090f2a48d9073d5118d
+ f9ae0f5d30be2de3c0de61b5673bd8873231d70a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c911002ab43b7b989ed67090f2a48d9073d5118d
+ f9ae0f5d30be2de3c0de61b5673bd8873231d70a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c911002ab43b7b989ed67090f2a48d9073d5118d
+ f9ae0f5d30be2de3c0de61b5673bd8873231d70a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c911002ab43b7b989ed67090f2a48d9073d5118d
+ f9ae0f5d30be2de3c0de61b5673bd8873231d70a
https://github.com/dotnet/test-templates
@@ -90,36 +90,36 @@
c40ef7e056b48e011c43a21354d6790ba6b8b4fc
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- eeae34ecb55d49616c9cd79bebfd6978b9ee54a0
+ 65f76a98c392556c2c395b78a9e4ab2bd9750bbf
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- eeae34ecb55d49616c9cd79bebfd6978b9ee54a0
+ 65f76a98c392556c2c395b78a9e4ab2bd9750bbf
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- eeae34ecb55d49616c9cd79bebfd6978b9ee54a0
+ 65f76a98c392556c2c395b78a9e4ab2bd9750bbf
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 11428db5b702966c7750a82c099718a398a1aa15
+ 48cdb7a16e8277e63c5bb52f97bb02198d1a9759
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 11428db5b702966c7750a82c099718a398a1aa15
+ 48cdb7a16e8277e63c5bb52f97bb02198d1a9759
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 1f426c90a9589dabc16d114aa91bfea9f21f8571
+ 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- 560f243910f407df33fd5cdf06e2a857684f4bc7
+ fcb07d637abf53791e2c55c63d9207fc3232fe83
https://github.com/dotnet/fsharp
@@ -135,20 +135,20 @@
d3c6439b04452047cb62fc645ce341a034bdb5be
-
+
https://github.com/dotnet/linker
- 4a231cedcaf6b93b04d07e5f7670e88e5fa937fe
+ e9cfb5413a6a7a7b5bfc3b9a73671be2b18642cf
linker
-
+
https://github.com/dotnet/roslyn
- dbffaa4a4e4507b8e8dcf0cae6e3209d32113391
+ 5d10d428050c0d6afef30a072c4ae68776621877
-
+
https://github.com/dotnet/msbuild
- ae57d105c6094d8d59fe42f557ad0dcb46ec285e
+ a02f73656613e752c73ff442cdd72540f4b09f57
@@ -166,13 +166,13 @@
698fdad58fa64a55f16cd9562c90224cc498ed02
-
+
https://github.com/dotnet/emsdk
- ee0a97a0009c0e048789126253fea7994db676ac
+ 52e9452f82e26f9fcae791e84c082ae22f1ef66f
-
+
https://github.com/dotnet/emsdk
- ee0a97a0009c0e048789126253fea7994db676ac
+ 52e9452f82e26f9fcae791e84c082ae22f1ef66f
https://github.com/dotnet/source-build
diff --git a/eng/Versions.props b/eng/Versions.props
index e3a05c662..e6414369f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,15 +23,15 @@
- 6.0.3-servicing.22123.7
+ 6.0.4-servicing.22164.7
- 6.0.3-servicing.22124.2
+ 6.0.4-servicing.22165.3
- 6.0.201
+ 6.0.202
@@ -44,44 +44,44 @@
- 6.0.3
- 6.0.3
- 6.0.3-servicing.22124.1
- 6.0.3-servicing.22124.1
- 6.0.3-servicing.22124.1
- 6.0.3-servicing.22124.1
+ 6.0.4
+ 6.0.4
+ 6.0.4-servicing.22172.4
+ 6.0.4-servicing.22172.4
+ 6.0.4-servicing.22172.4
+ 6.0.4-servicing.22172.4
0.2.0
- 6.0.201-servicing.22124.17
- 6.0.201-servicing.22124.17
+ 6.0.202-servicing.22172.7
+ 6.0.202-servicing.22172.7
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 6.0.2
+ 6.0.3
- 6.0.3-servicing.22123.9
- 6.0.3-servicing.22123.9
- 6.0.3
- 6.0.3
- 6.0.3
- 6.0.3
+ 6.0.4-servicing.22164.4
+ 6.0.4-servicing.22164.4
+ 6.0.4
+ 6.0.4
+ 6.0.4
+ 6.0.4
2.1.0
- 6.0.3-servicing.22124.3
- 6.0.3-servicing.22124.3
- 6.0.3
- 6.0.3
+ 6.0.4-servicing.22165.2
+ 6.0.4-servicing.22165.2
+ 6.0.4
+ 6.0.4
@@ -113,7 +113,7 @@
$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)
$(NUnit3DotNetNewTemplatePackageVersion)
$(MicrosoftDotNetCommonItemTemplatesPackageVersion)
- 6.0.201
+ 6.0.202
$(MicrosoftAspNetCoreAppRuntimePackageVersion)
$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)
@@ -182,8 +182,8 @@
15.2.301-preview.13.2
12.1.301-preview.13.2
15.2.301-preview.13.2
- 6.0.2-mauipre.1.22102.15
- 6.0.2
+ $(MicrosoftNETCoreAppRefPackageVersion)
+ 6.0.4
$(MicrosoftNETWorkloadEmscriptenManifest60200Version)
diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch b/src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch
deleted file mode 100644
index 721dc2879..000000000
--- a/src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MichaelSimons
-Date: Sat, 19 Feb 2022 12:12:32 +0000
-Subject: [PATCH] Define SystemReflectionMetadataLoadContextVersion property
- for package references
-
-System.Reflection.MetadataLoadContext references were using an incorrect version.props property which breaks source-build.
-In 6.0.3 SystemReflectionMetadataVersion was revved but not SystemReflectionMetadataLoadContextVersion therefore breaking
-the build because a System.Reflection.MetadataLoadContext with the SystemReflectionMetadataVersion does not exist.
----
- eng/Versions.props | 1 +
- src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/eng/Versions.props b/eng/Versions.props
-index 5e9d0039096..34034aa87ba 100644
---- a/eng/Versions.props
-+++ b/eng/Versions.props
-@@ -86,6 +86,7 @@
- 5.0.0
-
- 5.0.0
-+ 5.0.0
- 4.7.0
- 4.7.0
- 4.7.0
-diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
-index 358de5541e3..abf6d26d9ef 100644
---- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
-+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
-@@ -23,11 +23,11 @@
-
-
-
--
-+
-
-
-
--
-+
-
-
-
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index a6a968ae9..5c9b2f490 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -85,13 +85,15 @@
$(SharedFrameworkRid)
linux-x64
$(AspNetCoreSharedFxInstallerRid)
- x64
+ x64
+ aarch64
aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)
aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)
aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib
aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension)
+ aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)
aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)
aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension)
aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension)