diff --git a/NuGet.config b/NuGet.config
index 642de6d11..cbce2d136 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -9,6 +9,10 @@
+
+
+
+
diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props
index 0c141e3cb..8543f5e5c 100644
--- a/eng/ManualVersions.props
+++ b/eng/ManualVersions.props
@@ -9,10 +9,10 @@
Basically: In this file, choose the highest version when resolving merge conflicts.
-->
- 10.0.17763.24
- 10.0.18362.24
- 10.0.19041.24
- 10.0.20348.24
- 10.0.22000.24
+ 10.0.17763.25
+ 10.0.18362.25
+ 10.0.19041.25
+ 10.0.20348.25
+ 10.0.22000.25
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 630899ac1..057327f53 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
@@ -113,13 +113,13 @@
8963eb7d0f371d688809146cf75c847987420b86
-
+
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
@@ -166,9 +166,9 @@
698fdad58fa64a55f16cd9562c90224cc498ed02
-
+
https://github.com/dotnet/emsdk
- ee0a97a0009c0e048789126253fea7994db676ac
+ 52e9452f82e26f9fcae791e84c082ae22f1ef66f
https://github.com/dotnet/source-build
@@ -197,23 +197,23 @@
-
+
https://github.com/dotnet/arcade
- 254113fd7c3ee04f832c165d6aec1a6077de0d63
+ 1a6b24397e50146d0fece9cfb9c0b87275691e6f
-
+
https://github.com/dotnet/arcade
- 254113fd7c3ee04f832c165d6aec1a6077de0d63
+ 1a6b24397e50146d0fece9cfb9c0b87275691e6f
-
+
https://github.com/dotnet/arcade
- 254113fd7c3ee04f832c165d6aec1a6077de0d63
+ 1a6b24397e50146d0fece9cfb9c0b87275691e6f
-
+
https://github.com/dotnet/source-build-reference-packages
- 7cdb7a26c89847fcd5dc72ef5eba659030f57666
+ 60845bf36f0dd6dd310070548a58cb8ad3ab513c
diff --git a/eng/Versions.props b/eng/Versions.props
index f98b402e3..74baf5b81 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,24 +10,24 @@
3
00
$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)
- preview
+ rtm
$(VersionMajor).$(VersionMinor)
$(MajorMinorVersion).$(VersionSDKMinor)
- false
+ true
release
- 6.0.0-beta.22206.7
+ 6.0.0-beta.22212.5
- 6.0.3-servicing.22123.7
+ 6.0.4-servicing.22164.7
- 6.0.3-servicing.22124.2
+ 6.0.4-servicing.22165.3
@@ -44,12 +44,12 @@
- 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
@@ -64,24 +64,24 @@
- 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
@@ -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/global.json b/global.json
index b50ccb2be..b645142d3 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "6.0.103",
+ "dotnet": "6.0.104",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
@@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7",
- "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22206.7"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5",
+ "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5"
}
}
diff --git a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch
new file mode 100644
index 000000000..f7d7668dc
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MichaelSimons
+Date: Wed, 13 Apr 2022 21:30:39 +0000
+Subject: [PATCH] Condition out the BannedApiAnalyzers usage in source-build
+
+Removes prebuilt.
+Patch for https://github.com/dotnet/linker/pull/2742
+---
+ src/linker/Mono.Linker.csproj | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj
+index 391300aa..d276003e 100644
+--- a/src/linker/Mono.Linker.csproj
++++ b/src/linker/Mono.Linker.csproj
+@@ -31,7 +31,7 @@
+
+
+
+-
++
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
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/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 1bbe3f77b..f311e197b 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -26,8 +26,8 @@
30
- $([MSBuild]::Add($(VersionFeature), 23))
- $([MSBuild]::Add($(VersionFeature), 15))
+ $([MSBuild]::Add($(VersionFeature), 25))
+ $([MSBuild]::Add($(VersionFeature), 17))
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)