diff --git a/NuGet.config b/NuGet.config
index cbce2d136..3e42736a6 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,21 +7,21 @@
+
-
-
-
-
+
+
+
@@ -40,11 +40,14 @@
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0cd745f93..1eafa497a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,46 +1,46 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 167140c0529a64c91f7a82249583ce27e52d28dd
+ ad940638f459efe0d17d60ccf52454a32ea7e561
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 167140c0529a64c91f7a82249583ce27e52d28dd
+ ad940638f459efe0d17d60ccf52454a32ea7e561
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 167140c0529a64c91f7a82249583ce27e52d28dd
+ ad940638f459efe0d17d60ccf52454a32ea7e561
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 167140c0529a64c91f7a82249583ce27e52d28dd
+ ad940638f459efe0d17d60ccf52454a32ea7e561
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- be98e88c760526452df94ef452fff4602fb5bded
+ 70ae3df4a6f3c92fb6b315afc405edd10ff38579
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- be98e88c760526452df94ef452fff4602fb5bded
+ 70ae3df4a6f3c92fb6b315afc405edd10ff38579
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- be98e88c760526452df94ef452fff4602fb5bded
+ 70ae3df4a6f3c92fb6b315afc405edd10ff38579
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- be98e88c760526452df94ef452fff4602fb5bded
+ 70ae3df4a6f3c92fb6b315afc405edd10ff38579
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- be98e88c760526452df94ef452fff4602fb5bded
+ 70ae3df4a6f3c92fb6b315afc405edd10ff38579
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- be98e88c760526452df94ef452fff4602fb5bded
+ 70ae3df4a6f3c92fb6b315afc405edd10ff38579
@@ -52,30 +52,30 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
be98e88c760526452df94ef452fff4602fb5bded
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f9ae0f5d30be2de3c0de61b5673bd8873231d70a
+ e5f183b656a0e8bc087108130a5a9b54ae94494e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f9ae0f5d30be2de3c0de61b5673bd8873231d70a
+ e5f183b656a0e8bc087108130a5a9b54ae94494e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f9ae0f5d30be2de3c0de61b5673bd8873231d70a
+ e5f183b656a0e8bc087108130a5a9b54ae94494e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f9ae0f5d30be2de3c0de61b5673bd8873231d70a
+ e5f183b656a0e8bc087108130a5a9b54ae94494e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f9ae0f5d30be2de3c0de61b5673bd8873231d70a
+ e5f183b656a0e8bc087108130a5a9b54ae94494e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f9ae0f5d30be2de3c0de61b5673bd8873231d70a
+ e5f183b656a0e8bc087108130a5a9b54ae94494e
https://github.com/dotnet/test-templates
@@ -90,42 +90,42 @@
9388790ba9ed8fef11584b2c74fe6789782a1592
-
+
https://github.com/dotnet/templating
- 115aeb115de1387d8ba427b9bfdf072d7dd64914
+ 60a2f73de55434984bbe3d5ad9281b3863355b31
-
+
https://github.com/dotnet/templating
- 115aeb115de1387d8ba427b9bfdf072d7dd64914
+ 60a2f73de55434984bbe3d5ad9281b3863355b31
-
+
https://github.com/dotnet/templating
- 115aeb115de1387d8ba427b9bfdf072d7dd64914
+ 60a2f73de55434984bbe3d5ad9281b3863355b31
-
- https://github.com/dotnet/sdk
- 8963eb7d0f371d688809146cf75c847987420b86
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
+ ac00abef032d4d576a844d7f1287119a9d20166e
-
- https://github.com/dotnet/sdk
- 8963eb7d0f371d688809146cf75c847987420b86
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
+ ac00abef032d4d576a844d7f1287119a9d20166e
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- fcb07d637abf53791e2c55c63d9207fc3232fe83
+ 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b
-
+
https://github.com/dotnet/fsharp
8854f5d1f3bd7e60d42565a18a2f8c06ae307474
-
+
https://github.com/dotnet/fsharp
8854f5d1f3bd7e60d42565a18a2f8c06ae307474
@@ -135,15 +135,15 @@
717d0cf94925e9cf67466dbee46c1019930eb212
-
+
https://github.com/dotnet/linker
- 01c4f5905959c29f86781b85187bb676fc517ee9
+ 28db36b95cf83c8e2ad11e67a2ad0de301b4cad6
linker
-
+
https://github.com/dotnet/roslyn
- 8b5c5b8e817c4299f2693ce7a16fe1465de1d9c4
+ 1e40aa11ca0b522e201320f70d469de40f211b2c
@@ -151,9 +151,9 @@
41abc5629965e3f9e41f1e67fdf78345c0c5cc4b
-
+
https://github.com/nuget/nuget.client
- 6f54dbd49fcda01ca8d71eb4fa4eea6ef54379ab
+ b8a61266d9a6780cb7eb9c1942695cf813fdef0a
diff --git a/eng/Versions.props b/eng/Versions.props
index f800c1c27..fcf6c3e03 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -27,11 +27,11 @@
- 6.0.4-servicing.22165.3
+ 6.0.5-servicing.22215.9
- 6.0.300-preview.22208.4
+ 6.0.300
@@ -44,20 +44,20 @@
- 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
+ 6.0.5
+ 6.0.5
+ 6.0.5-servicing.22218.2
+ 6.0.5-servicing.22218.2
+ 6.0.5-servicing.22218.2
+ 6.0.5-servicing.22218.2
0.2.0
- 6.0.300-preview.22212.3
- 6.0.300-preview.22212.3
+ 6.0.300-rtm.22221.4
+ 6.0.300-rtm.22221.4
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -68,20 +68,20 @@
- 6.0.4-servicing.22164.4
- 6.0.4-servicing.22164.4
- 6.0.4
- 6.0.4
- 6.0.4
- 6.0.4
+ 6.0.5-servicing.22213.9
+ 6.0.5-servicing.22213.9
+ 6.0.5
+ 6.0.5
+ 6.0.5
+ 6.0.5
2.1.0
- 6.0.4-servicing.22165.2
- 6.0.4-servicing.22165.2
- 6.0.4
- 6.0.4
+ 6.0.5-servicing.22215.11
+ 6.0.5-servicing.22215.11
+ 6.0.5
+ 6.0.5
@@ -113,7 +113,7 @@
$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)
$(NUnit3DotNetNewTemplatePackageVersion)
$(MicrosoftDotNetCommonItemTemplatesPackageVersion)
- 6.0.300-preview.22208.4
+ 6.0.300
$(MicrosoftAspNetCoreAppRuntimePackageVersion)
$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)
diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch
deleted file mode 100644
index 7ada1a116..000000000
--- a/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-Revert-release-6.0-Build-ProjectTemplates-in-.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Godbe
-Date: Wed, 23 Mar 2022 09:11:11 -0700
-Subject: [PATCH] Revert "Revert "[release/6.0] Build ProjectTemplates in
- Source-Build (#40650)" (#40805)"
-
-This reverts commit a351c437ac7bc9f9be96de51832608438a7a37df.
----
- Directory.Build.props | 3 +++
- Directory.Build.targets | 9 +++++++--
- .../src/Microsoft.Authentication.WebAssembly.Msal.csproj | 9 ++++++++-
- ...pNetCore.Components.WebAssembly.Authentication.csproj | 9 ++++++++-
- 4 files changed, 26 insertions(+), 4 deletions(-)
-
-diff --git a/Directory.Build.props b/Directory.Build.props
-index 8f0ac59422..721f099a77 100644
---- a/Directory.Build.props
-+++ b/Directory.Build.props
-@@ -30,6 +30,9 @@
- $(MSBuildProjectName.EndsWith('.Test')) OR
- $(MSBuildProjectName.EndsWith('.FunctionalTest')) ) ">true
- true
-+ true
- true
- true
- true
-+ Condition="'$(ExcludeFromSourceBuild)' == '' and
-+ '$(DotNetBuildFromSource)' == 'true' and
-+ '$(IsAspNetCoreApp)' != 'true' and
-+ '$(MSBuildProjectName)' != '$(TargetingPackName)' and
-+ '$(IsAnalyzersProject)' != 'true' and
-+ '$(IsProjectTemplateProject)' != 'true'">true
-
-
-diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
-index 8ae5d1c43d..8e0f53957e 100644
---- a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
-+++ b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
-@@ -1,6 +1,6 @@
-
-
--
-+
-
-
- $(DefaultNetCoreTargetFramework)
-@@ -25,6 +25,7 @@
-
- $(MSBuildThisFileDirectory)Interop\
-
-+ CheckForSourceBuild;
- CompileInterop;
- IncludeCompileInteropOutput;
- $(ResolveStaticWebAssetsInputsDependsOn)
-@@ -91,5 +92,11 @@
-
-
-
-+
-+
-+
-+
-+
-+
-
-
-diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
-index 8d6a000d74..35c79a73eb 100644
---- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
-+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
-@@ -1,6 +1,6 @@
-
-
--
-+
-
-
- $(DefaultNetCoreTargetFramework)
-@@ -26,6 +26,7 @@
-
- $(MSBuildThisFileDirectory)Interop\
-
-+ CheckForSourceBuild;
- CompileInterop;
- IncludeCompileInteropOutput;
- $(ResolveStaticWebAssetsInputsDependsOn)
-@@ -93,4 +94,10 @@
-
-
-
-+
-+
-+
-+
-+
-+
-
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
deleted file mode 100644
index f7d7668dc..000000000
--- a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index afd1c4e0a..88a053b61 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -84,22 +84,21 @@
dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)
windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)
- $(SharedFrameworkRid)
- linux-x64
- $(AspNetCoreSharedFxInstallerRid)
- x64
- aarch64
+ $(SharedFrameworkRid)
+ linux-x64
+ $(AspNetCoreInstallerRid)
+ x64
+ aarch64
- aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)
- aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)
+ aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)
+ aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)
- aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib
- aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension)
- aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)
- aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)
+ aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid).wixlib
+ aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)
+ aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)
aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension)
- aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension)
- aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)
+ aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension)
+ aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension)
aspnetcore_base_runtime.version