diff --git a/NuGet.config b/NuGet.config
index f03617759..ef1759038 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,21 +7,21 @@
+
-
-
-
-
+
+
+
@@ -40,11 +40,15 @@
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 51284cde3..cf55e1cfa 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
+ 0636f1ee563a6dfc0c67d561d15691ca0fd09b7e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 167140c0529a64c91f7a82249583ce27e52d28dd
+ 0636f1ee563a6dfc0c67d561d15691ca0fd09b7e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 167140c0529a64c91f7a82249583ce27e52d28dd
+ 0636f1ee563a6dfc0c67d561d15691ca0fd09b7e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 167140c0529a64c91f7a82249583ce27e52d28dd
+ 0636f1ee563a6dfc0c67d561d15691ca0fd09b7e
-
+
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
+ dd34abdadac5668452e0496cfadb6cf985ec3d3f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f9ae0f5d30be2de3c0de61b5673bd8873231d70a
+ dd34abdadac5668452e0496cfadb6cf985ec3d3f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f9ae0f5d30be2de3c0de61b5673bd8873231d70a
+ dd34abdadac5668452e0496cfadb6cf985ec3d3f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f9ae0f5d30be2de3c0de61b5673bd8873231d70a
+ dd34abdadac5668452e0496cfadb6cf985ec3d3f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f9ae0f5d30be2de3c0de61b5673bd8873231d70a
+ dd34abdadac5668452e0496cfadb6cf985ec3d3f
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- f9ae0f5d30be2de3c0de61b5673bd8873231d70a
+ dd34abdadac5668452e0496cfadb6cf985ec3d3f
https://github.com/dotnet/test-templates
@@ -90,27 +90,27 @@
c40ef7e056b48e011c43a21354d6790ba6b8b4fc
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 65f76a98c392556c2c395b78a9e4ab2bd9750bbf
+ 93b13a284cbd00922988bc357c99ed4e7d45f153
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 65f76a98c392556c2c395b78a9e4ab2bd9750bbf
+ 93b13a284cbd00922988bc357c99ed4e7d45f153
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- 65f76a98c392556c2c395b78a9e4ab2bd9750bbf
+ 93b13a284cbd00922988bc357c99ed4e7d45f153
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 48cdb7a16e8277e63c5bb52f97bb02198d1a9759
+ 0a95ab634eaafd4b0a96c8294c00fa7495b856fe
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 48cdb7a16e8277e63c5bb52f97bb02198d1a9759
+ 0a95ab634eaafd4b0a96c8294c00fa7495b856fe
@@ -135,9 +135,9 @@
d3c6439b04452047cb62fc645ce341a034bdb5be
-
+
https://github.com/dotnet/linker
- e9cfb5413a6a7a7b5bfc3b9a73671be2b18642cf
+ 01c4f5905959c29f86781b85187bb676fc517ee9
linker
diff --git a/eng/Versions.props b/eng/Versions.props
index 9f4b10e46..f451877fb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -31,7 +31,7 @@
- 6.0.202
+ 6.0.203
@@ -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.22214.12
+ 6.0.5-servicing.22214.12
+ 6.0.5-servicing.22214.12
+ 6.0.5-servicing.22214.12
0.2.0
- 6.0.202-servicing.22172.7
- 6.0.202-servicing.22172.7
+ 6.0.203-servicing.22217.1
+ 6.0.203-servicing.22217.1
$(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.22213.4
+ 6.0.5-servicing.22213.4
+ 6.0.5
+ 6.0.5
@@ -113,7 +113,7 @@
$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)
$(NUnit3DotNetNewTemplatePackageVersion)
$(MicrosoftDotNetCommonItemTemplatesPackageVersion)
- 6.0.202
+ 6.0.203
$(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/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 5c9b2f490..e05004e17 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -82,22 +82,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