diff --git a/global.json b/global.json index e68e4a5387b6..302c5825ab9b 100644 --- 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 index 92dd733318e8..3452bd52d7a0 100644 --- 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 CreateNewUnidirectionalStreamAsync(IHttpApplication 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 index c908d39d203b..1d52fd1dcf07 100644 --- 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 index 7ff705c633aa..a959dfdf7dc8 100644 --- 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 index e5ed3575f837..3307ebb25ba6 100644 --- 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 /// The . 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() ?? 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 index 8786fa6969ee..d03a06f449b3 100644 --- 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 @@ true Kestrel.Core.Tests $(DefineConstants);KESTREL + true diff --git a/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs b/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs index 0a008b0fd817..568115cced98 100644 --- a/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs +++ b/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs @@ -29,7 +29,9 @@ public static class WebHostBuilderKestrelExtensions /// 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 index ce2dd9d90cff..1286a684ea95 100644 --- 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 @@ $(DefaultNetCoreTargetFramework) + true 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 index 433253cee1cd..94eadcf539cd 100644 --- 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 @@ true true + true 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 index a1838ce726b8..145612775bf8 100644 --- 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 @@ true aspnetcore;kestrel true - CA1416;CS1591;CS0436;$(NoWarn) + CA1416;CS1591;CS0436;$(NoWarn) false enable + True 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 index ca4fbc0ea84d..c0aca2c1111f 100644 --- 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 @@ $(DefaultNetCoreTargetFramework) true true + true 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 index f7bfa926cc67..1f946d12ff04 100644 --- 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 @@ true true false + true diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj index da4ffb2ae380..dfb01f84c5d8 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj @@ -6,6 +6,7 @@ InMemory.FunctionalTests true $(DefineConstants);IS_FUNCTIONAL_TESTS + true diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj index d904a168c6eb..a8da39e1dd98 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj @@ -8,6 +8,7 @@ false true true + true diff --git a/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj b/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj index 8874b5616433..b9597587bbfb 100644 --- a/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj +++ b/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj @@ -6,6 +6,7 @@ Libuv.BindTests Windows.10.Arm64;Windows.10.Arm64.Open;Windows.10.Arm64v8;Windows.10.Arm64v8.Open + true diff --git a/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj b/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj index 428143af300d..f252a148f244 100644 --- a/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj +++ b/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj @@ -9,6 +9,7 @@ Libuv.FunctionalTests Windows.10.Arm64;Windows.10.Arm64.Open;Windows.10.Arm64v8;Windows.10.Arm64v8.Open + true diff --git a/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj b/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj index 0f7576c452d9..2a79d6e43158 100644 --- a/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj +++ b/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj @@ -4,6 +4,7 @@ $(DefaultNetCoreTargetFramework) true Sockets.BindTests + true diff --git a/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj b/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj index d42ac6b661f8..f64638d9806f 100644 --- 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);SOCKETS true Sockets.FunctionalTests + true