[release/6.0-rc2] Update sdk to 6.0.100-rc.2.21470.55 (#36783)

halter73 · wtgodbe · web-flow · commit 487f48495a12 · 2021-09-23T23:47:16.000Z
* Update sdk to 6.0.100-rc.2.21470.55

* Add pragmas

* More pragmas

* One more

* Use preview features in tests

Co-authored-by: Will Godbe &lt;wigodbe@microsoft.com&gt;
diff --git a/global.json b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "6.0.100-rc.2.21457.23"
+    "version": "6.0.100-rc.2.21470.55"
   },
   "tools": {
-    "dotnet": "6.0.100-rc.2.21457.23",
+    "dotnet": "6.0.100-rc.2.21470.55",
     "runtimes": {
       "dotnet/x64": [
         "2.1.27",
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs
@@ -457,7 +457,9 @@ private Http3StreamContext CreateHttpStreamContext(ConnectionContext streamConte
         {
             var httpConnectionContext = new Http3StreamContext(
                 _multiplexedContext.ConnectionId,
+#pragma warning disable CA2252 // Preview Features
                 HttpProtocols.Http3,
+#pragma warning restore CA2252
                 _context.AltSvcHeader,
                 _multiplexedContext,
                 _context.ServiceContext,
@@ -537,7 +539,9 @@ private async ValueTask<Http3ControlStream> CreateNewUnidirectionalStreamAsync<T
             var streamContext = await _multiplexedContext.ConnectAsync(features);
             var httpConnectionContext = new Http3StreamContext(
                 _multiplexedContext.ConnectionId,
+#pragma warning disable CA2252 // Preview Features
                 HttpProtocols.Http3,
+#pragma warning restore CA2252
                 _context.AltSvcHeader,
                 _multiplexedContext,
                 _context.ServiceContext,
diff --git a/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs b/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs
@@ -70,8 +70,10 @@ public async Task ProcessRequestsAsync<TContext>(IHttpApplication<TContext> http
                         requestProcessor = new Http2Connection((HttpConnectionContext)_context);
                         _protocolSelectionState = ProtocolSelectionState.Selected;
                         break;
+#pragma warning disable CA2252 // Preview Features
                     case HttpProtocols.Http3:
                         requestProcessor = new Http3Connection((HttpMultiplexedConnectionContext)_context);
+#pragma warning restore CA2252
                         _protocolSelectionState = ProtocolSelectionState.Selected;
                         break;
                     case HttpProtocols.None:
@@ -205,7 +207,9 @@ private HttpProtocols SelectProtocol()
             var isMultiplexTransport = _context is HttpMultiplexedConnectionContext;
             var http1Enabled = _context.Protocols.HasFlag(HttpProtocols.Http1);
             var http2Enabled = _context.Protocols.HasFlag(HttpProtocols.Http2);
+#pragma warning disable CA2252 // Preview Features
             var http3Enabled = _context.Protocols.HasFlag(HttpProtocols.Http3);
+#pragma warning restore CA2252
 
             string? error = null;
 
@@ -218,7 +222,9 @@ private HttpProtocols SelectProtocol()
             {
                 if (http3Enabled)
                 {
+#pragma warning disable CA2252 // Preview Features
                     return HttpProtocols.Http3;
+#pragma warning restore CA2252
                 }
 
                 error = $"Protocols {_context.Protocols} not supported on multiplexed transport.";
diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.cs
@@ -536,7 +536,9 @@ private static bool IsHex(char ch)
         public static AltSvcHeader? GetEndpointAltSvc(System.Net.IPEndPoint endpoint, HttpProtocols protocols)
         {
             var hasHttp1OrHttp2 = protocols.HasFlag(HttpProtocols.Http1) || protocols.HasFlag(HttpProtocols.Http2);
+#pragma warning disable CA2252 // Preview Features
             var hasHttp3 = protocols.HasFlag(HttpProtocols.Http3);
+#pragma warning restore CA2252
 
             if (hasHttp1OrHttp2 && hasHttp3)
             {
diff --git a/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs b/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs
@@ -168,7 +168,9 @@ async Task OnBind(ListenOptions options, CancellationToken onBindCancellationTok
                 {
                     var hasHttp1 = options.Protocols.HasFlag(HttpProtocols.Http1);
                     var hasHttp2 = options.Protocols.HasFlag(HttpProtocols.Http2);
+#pragma warning disable CA2252 // Preview Features
                     var hasHttp3 = options.Protocols.HasFlag(HttpProtocols.Http3);
+#pragma warning restore CA2252
                     var hasTls = options.IsTls;
 
                     // Filter out invalid combinations.
diff --git a/src/Servers/Kestrel/Core/src/ListenOptionsHttpsExtensions.cs b/src/Servers/Kestrel/Core/src/ListenOptionsHttpsExtensions.cs
@@ -256,10 +256,12 @@ public static ListenOptions UseHttps(this ListenOptions listenOptions, ServerOpt
         /// <returns>The <see cref="ListenOptions"/>.</returns>
         public static ListenOptions UseHttps(this ListenOptions listenOptions, ServerOptionsSelectionCallback serverOptionsSelectionCallback, object state, TimeSpan handshakeTimeout)
         {
+#pragma warning disable CA2252 // Preview Features
             if (listenOptions.Protocols.HasFlag(HttpProtocols.Http3))
             {
                 throw new NotSupportedException($"{nameof(UseHttps)} with {nameof(ServerOptionsSelectionCallback)} is not supported with HTTP/3.");
             }
+#pragma warning restore CA2252
             return listenOptions.UseHttps(new TlsHandshakeCallbackOptions()
             {
                 OnConnection = context => serverOptionsSelectionCallback(context.SslStream, context.ClientHelloInfo, context.State, context.CancellationToken),
@@ -287,10 +289,12 @@ public static ListenOptions UseHttps(this ListenOptions listenOptions, TlsHandsh
                 throw new ArgumentException($"{nameof(TlsHandshakeCallbackOptions.OnConnection)} must not be null.");
             }
 
+#pragma warning disable CA2252 // Preview Features
             if (listenOptions.Protocols.HasFlag(HttpProtocols.Http3))
             {
                 throw new NotSupportedException($"{nameof(UseHttps)} with {nameof(TlsHandshakeCallbackOptions)} is not supported with HTTP/3.");
             }
+#pragma warning restore CA2252
 
             var loggerFactory = listenOptions.KestrelServerOptions?.ApplicationServices.GetRequiredService<ILoggerFactory>() ?? NullLoggerFactory.Instance;
 
diff --git a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
@@ -5,6 +5,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestGroupName>Kestrel.Core.Tests</TestGroupName>
     <DefineConstants>$(DefineConstants);KESTREL</DefineConstants>
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs b/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs
@@ -29,7 +29,9 @@ public static class WebHostBuilderKestrelExtensions
         /// </returns>
         public static IWebHostBuilder UseKestrel(this IWebHostBuilder hostBuilder)
         {
+#pragma warning disable CA2252 // Preview Features
             hostBuilder.UseQuic();
+#pragma warning restore CA2252
             return hostBuilder.ConfigureServices(services =>
             {
                 // Don't override an already-configured transport
diff --git a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/Transport.Libuv/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj b/src/Servers/Kestrel/Transport.Libuv/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj
@@ -7,6 +7,7 @@
     <!-- https://github.com/dotnet/aspnetcore/issues/22114 -->
     <SkipHelixArm>true</SkipHelixArm>
     <SkipHelixAlpine>true</SkipHelixAlpine>
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/Transport.Quic/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj b/src/Servers/Kestrel/Transport.Quic/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj
@@ -7,9 +7,10 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;kestrel</PackageTags>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NoWarn>CA1416;CS1591;CS0436;$(NoWarn)</NoWarn><!-- Conflicts between internal and public Quic APIs; Platform support warnings. -->
+    <NoWarn>CA1416;CS1591;CS0436;$(NoWarn)</NoWarn> <!-- Conflicts between internal and public Quic APIs; Platform support warnings. -->
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
+    <EnablePreviewFeatures>True</EnablePreviewFeatures> <!-- System.Net.Quic is still in preview -->
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/Transport.Quic/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj b/src/Servers/Kestrel/Transport.Quic/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ServerGarbageCollection>true</ServerGarbageCollection>
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj b/src/Servers/Kestrel/perf/Microbenchmarks/Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj
@@ -6,6 +6,7 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TieredCompilation>false</TieredCompilation>
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
@@ -6,6 +6,7 @@
     <TestGroupName>InMemory.FunctionalTests</TestGroupName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);IS_FUNCTIONAL_TESTS</DefineConstants>
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
    </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj
@@ -8,6 +8,7 @@
     <SignAssembly>false</SignAssembly>
     <SkipHelixArm>true</SkipHelixArm>
     <SkipHelixAlpine>true</SkipHelixAlpine>
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj b/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj
@@ -6,6 +6,7 @@
     <TestGroupName>Libuv.BindTests</TestGroupName>
     <!-- https://github.com/dotnet/aspnetcore/issues/22114 -->
     <SkipHelixQueues>Windows.10.Arm64;Windows.10.Arm64.Open;Windows.10.Arm64v8;Windows.10.Arm64v8.Open</SkipHelixQueues>
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj b/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj
@@ -9,6 +9,7 @@
     <TestGroupName>Libuv.FunctionalTests</TestGroupName>
     <!-- https://github.com/dotnet/aspnetcore/issues/22114 -->
     <SkipHelixQueues>Windows.10.Arm64;Windows.10.Arm64.Open;Windows.10.Arm64v8;Windows.10.Arm64v8.Open</SkipHelixQueues>
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj b/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <TestGroupName>Sockets.BindTests</TestGroupName>
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj b/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj
@@ -6,6 +6,7 @@
     <DefineConstants>$(DefineConstants);SOCKETS</DefineConstants>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <TestGroupName>Sockets.FunctionalTests</TestGroupName>
+    <EnablePreviewFeatures>true</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,9 @@ private static bool IsHex(char ch)`
`536`	`536`	`public static AltSvcHeader? GetEndpointAltSvc(System.Net.IPEndPoint endpoint, HttpProtocols protocols)`
`537`	`537`	`{`
`538`	`538`	`var hasHttp1OrHttp2 = protocols.HasFlag(HttpProtocols.Http1) \|\| protocols.HasFlag(HttpProtocols.Http2);`
	`539`	`+#pragma warning disable CA2252 // Preview Features`
`539`	`540`	`var hasHttp3 = protocols.HasFlag(HttpProtocols.Http3);`
	`541`	`+#pragma warning restore CA2252`
`540`	`542`
`541`	`543`	`if (hasHttp1OrHttp2 && hasHttp3)`
`542`	`544`	`{`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,9 @@ async Task OnBind(ListenOptions options, CancellationToken onBindCancellationTok`
`168`	`168`	`{`
`169`	`169`	`var hasHttp1 = options.Protocols.HasFlag(HttpProtocols.Http1);`
`170`	`170`	`var hasHttp2 = options.Protocols.HasFlag(HttpProtocols.Http2);`
	`171`	`+#pragma warning disable CA2252 // Preview Features`
`171`	`172`	`var hasHttp3 = options.Protocols.HasFlag(HttpProtocols.Http3);`
	`173`	`+#pragma warning restore CA2252`
`172`	`174`	`var hasTls = options.IsTls;`
`173`	`175`
`174`	`176`	`// Filter out invalid combinations.`
Original file line number	Diff line number	Diff line change
`@@ -256,10 +256,12 @@ public static ListenOptions UseHttps(this ListenOptions listenOptions, ServerOpt`
`256`	`256`	`/// <returns>The <see cref="ListenOptions"/>.</returns>`
`257`	`257`	`public static ListenOptions UseHttps(this ListenOptions listenOptions, ServerOptionsSelectionCallback serverOptionsSelectionCallback, object state, TimeSpan handshakeTimeout)`
`258`	`258`	`{`
	`259`	`+#pragma warning disable CA2252 // Preview Features`
`259`	`260`	`if (listenOptions.Protocols.HasFlag(HttpProtocols.Http3))`
`260`	`261`	`{`
`261`	`262`	`throw new NotSupportedException($"{nameof(UseHttps)} with {nameof(ServerOptionsSelectionCallback)} is not supported with HTTP/3.");`
`262`	`263`	`}`
	`264`	`+#pragma warning restore CA2252`
`263`	`265`	`return listenOptions.UseHttps(new TlsHandshakeCallbackOptions()`
`264`	`266`	`{`
`265`	`267`	`OnConnection = context => serverOptionsSelectionCallback(context.SslStream, context.ClientHelloInfo, context.State, context.CancellationToken),`
`@@ -287,10 +289,12 @@ public static ListenOptions UseHttps(this ListenOptions listenOptions, TlsHandsh`
`287`	`289`	`throw new ArgumentException($"{nameof(TlsHandshakeCallbackOptions.OnConnection)} must not be null.");`
`288`	`290`	`}`
`289`	`291`
	`292`	`+#pragma warning disable CA2252 // Preview Features`
`290`	`293`	`if (listenOptions.Protocols.HasFlag(HttpProtocols.Http3))`
`291`	`294`	`{`
`292`	`295`	`throw new NotSupportedException($"{nameof(UseHttps)} with {nameof(TlsHandshakeCallbackOptions)} is not supported with HTTP/3.");`
`293`	`296`	`}`
	`297`	`+#pragma warning restore CA2252`
`294`	`298`
`295`	`299`	`var loggerFactory = listenOptions.KestrelServerOptions?.ApplicationServices.GetRequiredService<ILoggerFactory>() ?? NullLoggerFactory.Instance;`
`296`	`300`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,9 @@ public static class WebHostBuilderKestrelExtensions`
`29`	`29`	`/// </returns>`
`30`	`30`	`public static IWebHostBuilder UseKestrel(this IWebHostBuilder hostBuilder)`
`31`	`31`	`{`
	`32`	`+#pragma warning disable CA2252 // Preview Features`
`32`	`33`	`hostBuilder.UseQuic();`
	`34`	`+#pragma warning restore CA2252`
`33`	`35`	`return hostBuilder.ConfigureServices(services =>`
`34`	`36`	`{`
`35`	`37`	`// Don't override an already-configured transport`