diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6229d2a6..36c1cc0e3 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 32ef7187ec6606559bcd8895db0e7313491f8457 - + https://github.com/dotnet/sdk - c4383e6db7e5737ab383ada8c77a6af67950a908 + ec75190eadbdbc322bb7d55f4769a135af64a3f5 - + https://github.com/dotnet/sdk - c4383e6db7e5737ab383ada8c77a6af67950a908 + ec75190eadbdbc322bb7d55f4769a135af64a3f5 - + 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 - ddc90b20287a765a9d526da42b3be0dd8e907ec5 + 4dce55c3e6615594134d829d0b5c6b275707ca33 - + https://github.com/dotnet/fsharp - ddc90b20287a765a9d526da42b3be0dd8e907ec5 + 4dce55c3e6615594134d829d0b5c6b275707ca33 @@ -141,14 +141,14 @@ linker - + https://github.com/dotnet/roslyn - d629a38daea1a8bf0738f4c36ecb058c882d03a9 + 29e657c0582904529bae2a87c227220e03f509cf - + https://github.com/dotnet/msbuild - 9d9417646aa0be63a560711924bb1227dcd9b4ac + 77c72dd0f1758e994cf2ebd2ddd6d1ada695d261 diff --git a/eng/Versions.props b/eng/Versions.props index 0485cac3a..1b0af883b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 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.400-preview.22329.12 - 6.0.400-preview.22329.12 + 6.0.400-preview.22330.4 + 6.0.400-preview.22330.4 $(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/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