diff --git a/NuGet.config b/NuGet.config
index 3e42736a6..f50bca67f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,21 +7,19 @@
-
+
-
-
+
-
-
+
@@ -40,14 +38,14 @@
-
+
-
+
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1eafa497a..0500c8180 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,46 +1,46 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- ad940638f459efe0d17d60ccf52454a32ea7e561
+ 7d10adc397690db6f5c73da866aa443232ff1c88
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- ad940638f459efe0d17d60ccf52454a32ea7e561
+ 7d10adc397690db6f5c73da866aa443232ff1c88
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- ad940638f459efe0d17d60ccf52454a32ea7e561
+ 7d10adc397690db6f5c73da866aa443232ff1c88
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- ad940638f459efe0d17d60ccf52454a32ea7e561
+ 7d10adc397690db6f5c73da866aa443232ff1c88
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 70ae3df4a6f3c92fb6b315afc405edd10ff38579
+ 7cca709db2944a09b4db6ca7b20c457ff260fb5a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 70ae3df4a6f3c92fb6b315afc405edd10ff38579
+ 7cca709db2944a09b4db6ca7b20c457ff260fb5a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 70ae3df4a6f3c92fb6b315afc405edd10ff38579
+ 7cca709db2944a09b4db6ca7b20c457ff260fb5a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 70ae3df4a6f3c92fb6b315afc405edd10ff38579
+ 7cca709db2944a09b4db6ca7b20c457ff260fb5a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 70ae3df4a6f3c92fb6b315afc405edd10ff38579
+ 7cca709db2944a09b4db6ca7b20c457ff260fb5a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 70ae3df4a6f3c92fb6b315afc405edd10ff38579
+ 7cca709db2944a09b4db6ca7b20c457ff260fb5a
@@ -48,34 +48,34 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- be98e88c760526452df94ef452fff4602fb5bded
+ 7cca709db2944a09b4db6ca7b20c457ff260fb5a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- e5f183b656a0e8bc087108130a5a9b54ae94494e
+ 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- e5f183b656a0e8bc087108130a5a9b54ae94494e
+ 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- e5f183b656a0e8bc087108130a5a9b54ae94494e
+ 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- e5f183b656a0e8bc087108130a5a9b54ae94494e
+ 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- e5f183b656a0e8bc087108130a5a9b54ae94494e
+ 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- e5f183b656a0e8bc087108130a5a9b54ae94494e
+ 68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff
https://github.com/dotnet/test-templates
@@ -103,31 +103,31 @@
https://github.com/dotnet/templating
60a2f73de55434984bbe3d5ad9281b3863355b31
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- ac00abef032d4d576a844d7f1287119a9d20166e
+ 8daa5f75dfc7592e30e28e71d448621d12442893
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- ac00abef032d4d576a844d7f1287119a9d20166e
+ 8daa5f75dfc7592e30e28e71d448621d12442893
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee
+ 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- 14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b
+ dabcf2041548f7594b21e9bf865463abdfd14307
-
+
https://github.com/dotnet/fsharp
- 8854f5d1f3bd7e60d42565a18a2f8c06ae307474
+ 211fd760c2315d73cfa0d375fe64abb346bc1096
-
+
https://github.com/dotnet/fsharp
- 8854f5d1f3bd7e60d42565a18a2f8c06ae307474
+ 211fd760c2315d73cfa0d375fe64abb346bc1096
@@ -141,9 +141,9 @@
linker
-
+
https://github.com/dotnet/roslyn
- 1e40aa11ca0b522e201320f70d469de40f211b2c
+ 432d17a83aa5623e4581756f4d642997048056bd
@@ -151,9 +151,9 @@
41abc5629965e3f9e41f1e67fdf78345c0c5cc4b
-
- https://github.com/nuget/nuget.client
- b8a61266d9a6780cb7eb9c1942695cf813fdef0a
+
+ https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
+ a8942f45835ba527cedacc02f7a75468f7a7b4bd
@@ -197,23 +197,23 @@
-
+
https://github.com/dotnet/arcade
- 1a6b24397e50146d0fece9cfb9c0b87275691e6f
+ e3cbecc5b0e51374e3d71dbb976004ab9cc90430
-
+
https://github.com/dotnet/arcade
- 1a6b24397e50146d0fece9cfb9c0b87275691e6f
+ e3cbecc5b0e51374e3d71dbb976004ab9cc90430
-
+
https://github.com/dotnet/arcade
- 1a6b24397e50146d0fece9cfb9c0b87275691e6f
+ e3cbecc5b0e51374e3d71dbb976004ab9cc90430
-
+
https://github.com/dotnet/source-build-reference-packages
- 60845bf36f0dd6dd310070548a58cb8ad3ab513c
+ 8ea40b4e4a381b819a7f9946e72d036f37cb75d4
diff --git a/eng/Versions.props b/eng/Versions.props
index e32fe0884..e121f07ce 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,15 +19,15 @@
- 6.0.0-beta.22212.5
+ 6.0.0-beta.22261.7
- 6.0.4-servicing.22164.7
+ 6.0.6-servicing.22267.5
- 6.0.5-servicing.22215.9
+ 6.0.6-servicing.22268.4
@@ -44,44 +44,44 @@
- 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
+ 6.0.6
+ 6.0.6
+ 6.0.6-servicing.22268.5
+ 6.0.6-servicing.22268.5
+ 6.0.6-servicing.22268.5
+ 6.0.6-servicing.22268.5
0.2.0
- 6.0.300-rtm.22221.4
- 6.0.300-rtm.22221.4
+ 6.0.301-rtm.22274.11
+ 6.0.301-rtm.22274.11
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 6.0.3
+ 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
+ 6.0.6-servicing.22267.7
+ 6.0.6-servicing.22267.7
+ 6.0.6
+ 6.0.6
+ 6.0.6
+ 6.0.6
2.1.0
- 6.0.5-servicing.22215.11
- 6.0.5-servicing.22215.11
- 6.0.5
- 6.0.5
+ 6.0.6-servicing.22268.6
+ 6.0.6-servicing.22268.6
+ 6.0.6
+ 6.0.6
diff --git a/global.json b/global.json
index b645142d3..de4424c2a 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "6.0.104",
+ "dotnet": "6.0.105",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
@@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5",
- "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7",
+ "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22261.7"
}
}
diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch
index 426502e86..cf15d1bfc 100644
--- a/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch
+++ b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch
@@ -24,14 +24,14 @@ index ca52bd1f40..643d03e8af 100644
// There's no way to to register multiple service types per definition. See https://github.com/aspnet/DependencyInjection/issues/360
-#pragma warning disable CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint.
- _applicationServiceCollection.AddSingleton(services
-- => services.GetService() as IHostApplicationLifetime);
+- => services.GetService()! as IHostApplicationLifetime);
+ _applicationServiceCollection.AddSingleton(services
+ => services.GetService()!);
#pragma warning disable CS0618 // Type or member is obsolete
- _applicationServiceCollection.AddSingleton(services
-- => services.GetService() as AspNetCore.Hosting.IApplicationLifetime);
+- => services.GetService()! as AspNetCore.Hosting.IApplicationLifetime);
- _applicationServiceCollection.AddSingleton(services
-- => services.GetService() as Extensions.Hosting.IApplicationLifetime);
+- => services.GetService()! as Extensions.Hosting.IApplicationLifetime);
+ _applicationServiceCollection.AddSingleton(services
+ => services.GetService()!);
+ _applicationServiceCollection.AddSingleton(services