diff --git a/NuGet.config b/NuGet.config
index 9ee0fa704..24f6a0170 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,16 +7,21 @@
+
+
+
+
+
@@ -37,11 +42,15 @@
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index dfb68c294..d99be542c 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
+ 578ba6d8016785b53d7a96248ed6ccf211843b05
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c911002ab43b7b989ed67090f2a48d9073d5118d
+ 578ba6d8016785b53d7a96248ed6ccf211843b05
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c911002ab43b7b989ed67090f2a48d9073d5118d
+ 578ba6d8016785b53d7a96248ed6ccf211843b05
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c911002ab43b7b989ed67090f2a48d9073d5118d
+ 578ba6d8016785b53d7a96248ed6ccf211843b05
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c911002ab43b7b989ed67090f2a48d9073d5118d
+ 578ba6d8016785b53d7a96248ed6ccf211843b05
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- c911002ab43b7b989ed67090f2a48d9073d5118d
+ 578ba6d8016785b53d7a96248ed6ccf211843b05
https://github.com/dotnet/test-templates
@@ -90,36 +90,36 @@
c40ef7e056b48e011c43a21354d6790ba6b8b4fc
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- f165acec106eb72d2a9e6a91c48b462884cb1c55
+ 753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- f165acec106eb72d2a9e6a91c48b462884cb1c55
+ 753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- f165acec106eb72d2a9e6a91c48b462884cb1c55
+ 753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 36d5c10d65ec7577234f1b72c25e21b9512f1895
+ 50891b83aa9eff002c8a5fb36ba422c4e2390b0e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 36d5c10d65ec7577234f1b72c25e21b9512f1895
+ 50891b83aa9eff002c8a5fb36ba422c4e2390b0e
-
+
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
@@ -141,9 +141,9 @@
linker
-
+
https://github.com/dotnet/roslyn
- ff289c438fabbdb4755f3c92c976763705140bd9
+ 27d9215906a62c0a550ba19cd275a2dc94ad88b3
@@ -166,9 +166,9 @@
698fdad58fa64a55f16cd9562c90224cc498ed02
-
+
https://github.com/dotnet/emsdk
- ee0a97a0009c0e048789126253fea7994db676ac
+ 52e9452f82e26f9fcae791e84c082ae22f1ef66f
https://github.com/dotnet/source-build
diff --git a/eng/Versions.props b/eng/Versions.props
index 6a0c76e05..175fcafd5 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.103
+ 6.0.104
@@ -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.22167.10
+ 6.0.4-servicing.22167.10
+ 6.0.4-servicing.22167.10
+ 6.0.4-servicing.22167.10
0.2.0
- 6.0.103-servicing.22124.18
- 6.0.103-servicing.22124.18
+ 6.0.104-servicing.22168.3
+ 6.0.104-servicing.22168.3
$(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.103
+ 6.0.104
$(MicrosoftAspNetCoreAppRuntimePackageVersion)
$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)
@@ -183,7 +183,7 @@
12.0.101-preview.9.31
15.0.101-preview.9.31
$(MicrosoftNETCoreAppRefPackageVersion)
- 6.0.2
+ 6.0.4
$(MicrosoftNETWorkloadEmscriptenManifest60100Version)
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index ba40dc82f..abb1b2bcd 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -43,8 +43,8 @@ steps:
# In that case, add variables to allow the download of internal runtimes if the specified versions are not found
# in the default public locations.
internalRuntimeDownloadArgs=
- if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
- internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
+ if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
+ internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
fi
buildConfig=Release
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)