diff --git a/AspNetCore.sln b/AspNetCore.sln index 81801038c953..d2a8cb1c9e2e 100644 --- a/AspNetCore.sln +++ b/AspNetCore.sln @@ -1358,7 +1358,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "http2cat", "src\Servers\Kes EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Transport.Quic", "Transport.Quic", "{EE9D0952-6060-4723-B329-94A2950A6762}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic", "src\Servers\Kestrel\Transport.Quic\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.csproj", "{132D43A2-067A-4E24-A520-45B9F14DCB8E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Quic", "src\Servers\Kestrel\Transport.Quic\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj", "{132D43A2-067A-4E24-A520-45B9F14DCB8E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Http3SampleApp", "src\Servers\Kestrel\samples\Http3SampleApp\Http3SampleApp.csproj", "{2EC4E939-513F-44CD-A956-498966EAC929}" EndProject @@ -1626,6 +1626,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.SpaSer EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinimalSample", "src\Http\samples\MinimalSample\MinimalSample.csproj", "{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests", "src\Servers\Kestrel\Transport.Quic\test\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj", "{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -7709,6 +7711,18 @@ Global {9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Release|x64.Build.0 = Release|Any CPU {9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Release|x86.ActiveCfg = Release|Any CPU {9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Release|x86.Build.0 = Release|Any CPU + {E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|x64.ActiveCfg = Debug|Any CPU + {E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|x64.Build.0 = Debug|Any CPU + {E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|x86.ActiveCfg = Debug|Any CPU + {E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|x86.Build.0 = Debug|Any CPU + {E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|Any CPU.Build.0 = Release|Any CPU + {E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x64.ActiveCfg = Release|Any CPU + {E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x64.Build.0 = Release|Any CPU + {E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x86.ActiveCfg = Release|Any CPU + {E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -8514,6 +8528,7 @@ Global {DF4637DA-5F07-4903-8461-4E2DAB235F3C} = {7F99E967-3DC1-4198-9D55-47CD9471D0B6} {AAB50C64-39AA-4AED-8E9C-50D68E7751AD} = {7F99E967-3DC1-4198-9D55-47CD9471D0B6} {9647D8B7-4616-4E05-B258-BAD5CAEEDD38} = {EB5E294B-9ED5-43BF-AFA9-1CD2327F3DC1} + {E3DAEBD3-CD36-493F-877F-460E8FFEAC52} = {EE9D0952-6060-4723-B329-94A2950A6762} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F} diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 00cdc1685bc3..b5513e6d2ec3 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - - + + + @@ -37,108 +37,108 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 @@ -146,110 +146,110 @@ - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - - - + + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 @@ -257,86 +257,86 @@ - 5.0.4 + 5.0.5 - + - + - + - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - + - + - 5.0.4 + 5.0.5 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 @@ -383,86 +383,86 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - - + + - + - - + + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - - + + - - + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 @@ -474,185 +474,185 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - - + + - - + + - - + + - 5.0.4 + 5.0.5 - - + + - - + + - 5.0.4 + 5.0.5 - + - + - + - + - + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - + - + - 5.0.4 + 5.0.5 - + - + - 5.0.4 + 5.0.5 - - - - + + + + - 5.0.4 + 5.0.5 @@ -661,65 +661,65 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 @@ -735,42 +735,42 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - - + + + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 @@ -780,73 +780,73 @@ - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 @@ -867,11 +867,11 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 @@ -889,13 +889,13 @@ - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index dc276a967c75..7e98ec3c4b8d 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,105 +4,105 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index a0a18b9d018a..3f3b14965777 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -50,7 +50,7 @@ - + diff --git a/src/Servers/Connections.Abstractions/src/IMulitplexedConnectionListener.cs b/src/Servers/Connections.Abstractions/src/IMulitplexedConnectionListener.cs index ca94b5715661..59eb387b6485 100644 --- a/src/Servers/Connections.Abstractions/src/IMulitplexedConnectionListener.cs +++ b/src/Servers/Connections.Abstractions/src/IMulitplexedConnectionListener.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNetCore.Connections.Experimental +namespace Microsoft.AspNetCore.Connections { /// /// Defines an interface that represents a listener bound to a specific . diff --git a/src/Servers/Connections.Abstractions/src/IMultiplexedConnectionBuilder.cs b/src/Servers/Connections.Abstractions/src/IMultiplexedConnectionBuilder.cs index 8045cb04a042..8f3caf34db54 100644 --- a/src/Servers/Connections.Abstractions/src/IMultiplexedConnectionBuilder.cs +++ b/src/Servers/Connections.Abstractions/src/IMultiplexedConnectionBuilder.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Connections.Experimental +namespace Microsoft.AspNetCore.Connections { /// /// Defines an interface that provides the mechanisms to configure a connection pipeline. diff --git a/src/Servers/Connections.Abstractions/src/IMultiplexedConnectionFactory.cs b/src/Servers/Connections.Abstractions/src/IMultiplexedConnectionFactory.cs index 37640d2f6fa3..1b11aa57ad5c 100644 --- a/src/Servers/Connections.Abstractions/src/IMultiplexedConnectionFactory.cs +++ b/src/Servers/Connections.Abstractions/src/IMultiplexedConnectionFactory.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNetCore.Connections.Experimental +namespace Microsoft.AspNetCore.Connections { /// /// A factory abstraction for creating connections to an endpoint. diff --git a/src/Servers/Connections.Abstractions/src/IMultiplexedConnectionListenerFactory.cs b/src/Servers/Connections.Abstractions/src/IMultiplexedConnectionListenerFactory.cs index 30f6f91e996e..ee3e593b9d67 100644 --- a/src/Servers/Connections.Abstractions/src/IMultiplexedConnectionListenerFactory.cs +++ b/src/Servers/Connections.Abstractions/src/IMultiplexedConnectionListenerFactory.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNetCore.Connections.Experimental +namespace Microsoft.AspNetCore.Connections { /// /// Defines an interface that provides the mechanisms for binding to various types of s. diff --git a/src/Servers/Connections.Abstractions/src/MultiplexedConnectionBuilder.cs b/src/Servers/Connections.Abstractions/src/MultiplexedConnectionBuilder.cs index 57cc7ac3ed60..b5df6b2870cb 100644 --- a/src/Servers/Connections.Abstractions/src/MultiplexedConnectionBuilder.cs +++ b/src/Servers/Connections.Abstractions/src/MultiplexedConnectionBuilder.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Connections.Experimental +namespace Microsoft.AspNetCore.Connections { /// /// A default implementation for . diff --git a/src/Servers/Connections.Abstractions/src/MultiplexedConnectionContext.cs b/src/Servers/Connections.Abstractions/src/MultiplexedConnectionContext.cs index 6d9d5f7d60f3..e94f35e567be 100644 --- a/src/Servers/Connections.Abstractions/src/MultiplexedConnectionContext.cs +++ b/src/Servers/Connections.Abstractions/src/MultiplexedConnectionContext.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNetCore.Connections.Experimental +namespace Microsoft.AspNetCore.Connections { /// /// Encapsulates all information about a multiplexed connection. diff --git a/src/Servers/Connections.Abstractions/src/MultiplexedConnectionDelegate.cs b/src/Servers/Connections.Abstractions/src/MultiplexedConnectionDelegate.cs index 2a80d81cad4b..c85298ea2d9b 100644 --- a/src/Servers/Connections.Abstractions/src/MultiplexedConnectionDelegate.cs +++ b/src/Servers/Connections.Abstractions/src/MultiplexedConnectionDelegate.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Connections.Experimental +namespace Microsoft.AspNetCore.Connections { /// /// A function that can process a connection. diff --git a/src/Servers/Connections.Abstractions/src/PublicAPI.Unshipped.txt b/src/Servers/Connections.Abstractions/src/PublicAPI.Unshipped.txt index 9d21a5e74882..88c8c23149f2 100644 --- a/src/Servers/Connections.Abstractions/src/PublicAPI.Unshipped.txt +++ b/src/Servers/Connections.Abstractions/src/PublicAPI.Unshipped.txt @@ -3,25 +3,25 @@ Microsoft.AspNetCore.Connections.Features.IConnectionSocketFeature Microsoft.AspNetCore.Connections.Features.IConnectionSocketFeature.Socket.get -> System.Net.Sockets.Socket! Microsoft.AspNetCore.Connections.IConnectionListener.AcceptAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionBuilder -Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionBuilder.ApplicationServices.get -> System.IServiceProvider! -Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionBuilder.Build() -> Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionDelegate! -Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionBuilder.Use(System.Func! middleware) -> Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionBuilder! -Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionFactory -Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionFactory.ConnectAsync(System.Net.EndPoint! endpoint, Microsoft.AspNetCore.Http.Features.IFeatureCollection? features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionListener -Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionListener.AcceptAsync(Microsoft.AspNetCore.Http.Features.IFeatureCollection? features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionListener.EndPoint.get -> System.Net.EndPoint! -Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionListener.UnbindAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionListenerFactory -Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionListenerFactory.BindAsync(System.Net.EndPoint! endpoint, Microsoft.AspNetCore.Http.Features.IFeatureCollection? features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionBuilder -Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionBuilder.ApplicationServices.get -> System.IServiceProvider! -Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionBuilder.Build() -> Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionDelegate! -Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionBuilder.MultiplexedConnectionBuilder(System.IServiceProvider! applicationServices) -> void -Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionBuilder.Use(System.Func! middleware) -> Microsoft.AspNetCore.Connections.Experimental.IMultiplexedConnectionBuilder! -Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionContext -Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionContext.MultiplexedConnectionContext() -> void -Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionDelegate -abstract Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionContext.AcceptAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -abstract Microsoft.AspNetCore.Connections.Experimental.MultiplexedConnectionContext.ConnectAsync(Microsoft.AspNetCore.Http.Features.IFeatureCollection? features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder +Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder.ApplicationServices.get -> System.IServiceProvider! +Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder.Build() -> Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate! +Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder.Use(System.Func! middleware) -> Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder! +Microsoft.AspNetCore.Connections.IMultiplexedConnectionFactory +Microsoft.AspNetCore.Connections.IMultiplexedConnectionFactory.ConnectAsync(System.Net.EndPoint! endpoint, Microsoft.AspNetCore.Http.Features.IFeatureCollection? features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Microsoft.AspNetCore.Connections.IMultiplexedConnectionListener +Microsoft.AspNetCore.Connections.IMultiplexedConnectionListener.AcceptAsync(Microsoft.AspNetCore.Http.Features.IFeatureCollection? features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Microsoft.AspNetCore.Connections.IMultiplexedConnectionListener.EndPoint.get -> System.Net.EndPoint! +Microsoft.AspNetCore.Connections.IMultiplexedConnectionListener.UnbindAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Microsoft.AspNetCore.Connections.IMultiplexedConnectionListenerFactory +Microsoft.AspNetCore.Connections.IMultiplexedConnectionListenerFactory.BindAsync(System.Net.EndPoint! endpoint, Microsoft.AspNetCore.Http.Features.IFeatureCollection? features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Microsoft.AspNetCore.Connections.MultiplexedConnectionBuilder +Microsoft.AspNetCore.Connections.MultiplexedConnectionBuilder.ApplicationServices.get -> System.IServiceProvider! +Microsoft.AspNetCore.Connections.MultiplexedConnectionBuilder.Build() -> Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate! +Microsoft.AspNetCore.Connections.MultiplexedConnectionBuilder.MultiplexedConnectionBuilder(System.IServiceProvider! applicationServices) -> void +Microsoft.AspNetCore.Connections.MultiplexedConnectionBuilder.Use(System.Func! middleware) -> Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder! +Microsoft.AspNetCore.Connections.MultiplexedConnectionContext +Microsoft.AspNetCore.Connections.MultiplexedConnectionContext.MultiplexedConnectionContext() -> void +Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate +abstract Microsoft.AspNetCore.Connections.MultiplexedConnectionContext.AcceptAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +abstract Microsoft.AspNetCore.Connections.MultiplexedConnectionContext.ConnectAsync(Microsoft.AspNetCore.Http.Features.IFeatureCollection? features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs index 8327141e0640..071ac2e4a5da 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs @@ -11,7 +11,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Http.Features; diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3ConnectionContext.cs b/src/Servers/Kestrel/Core/src/Internal/Http3ConnectionContext.cs index 061179451279..8cd1cc177130 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http3ConnectionContext.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http3ConnectionContext.cs @@ -4,7 +4,6 @@ using System.Buffers; using System.Net; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TransportManager.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TransportManager.cs index 470140fdd9a0..8ac52dc161f6 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TransportManager.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TransportManager.cs @@ -11,7 +11,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; using Microsoft.AspNetCore.Http.Features; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure diff --git a/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs b/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs index 37dc5394a873..a264651caca8 100644 --- a/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs +++ b/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs @@ -9,7 +9,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Http.Features; diff --git a/src/Servers/Kestrel/Core/src/ListenOptions.cs b/src/Servers/Kestrel/Core/src/ListenOptions.cs index 3f434584d123..520bd77431fe 100644 --- a/src/Servers/Kestrel/Core/src/ListenOptions.cs +++ b/src/Servers/Kestrel/Core/src/ListenOptions.cs @@ -8,7 +8,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Https; diff --git a/src/Servers/Kestrel/Core/src/Middleware/Http3ConnectionMiddleware.cs b/src/Servers/Kestrel/Core/src/Middleware/Http3ConnectionMiddleware.cs index ad15dd0d1be2..cbb8c7220c05 100644 --- a/src/Servers/Kestrel/Core/src/Middleware/Http3ConnectionMiddleware.cs +++ b/src/Servers/Kestrel/Core/src/Middleware/Http3ConnectionMiddleware.cs @@ -4,7 +4,6 @@ using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http3; diff --git a/src/Servers/Kestrel/Core/src/Middleware/HttpConnectionBuilderExtensions.cs b/src/Servers/Kestrel/Core/src/Middleware/HttpConnectionBuilderExtensions.cs index 26de066a3172..c3e1a6832aff 100644 --- a/src/Servers/Kestrel/Core/src/Middleware/HttpConnectionBuilderExtensions.cs +++ b/src/Servers/Kestrel/Core/src/Middleware/HttpConnectionBuilderExtensions.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal { diff --git a/src/Servers/Kestrel/Core/src/Middleware/ListenOptionsConnectionLoggingExtensions.cs b/src/Servers/Kestrel/Core/src/Middleware/ListenOptionsConnectionLoggingExtensions.cs index e81094b0a1c7..72f8d9822dc1 100644 --- a/src/Servers/Kestrel/Core/src/Middleware/ListenOptionsConnectionLoggingExtensions.cs +++ b/src/Servers/Kestrel/Core/src/Middleware/ListenOptionsConnectionLoggingExtensions.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Connections.Experimental; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.Extensions.DependencyInjection; diff --git a/src/Servers/Kestrel/Core/src/Middleware/LoggingMultiplexedConnectionMiddleware.cs b/src/Servers/Kestrel/Core/src/Middleware/LoggingMultiplexedConnectionMiddleware.cs index d05213e4ecd2..beccf60f19f5 100644 --- a/src/Servers/Kestrel/Core/src/Middleware/LoggingMultiplexedConnectionMiddleware.cs +++ b/src/Servers/Kestrel/Core/src/Middleware/LoggingMultiplexedConnectionMiddleware.cs @@ -3,13 +3,11 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO.Pipelines; using System.Net; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Logging; diff --git a/src/Servers/Kestrel/Kestrel.slnf b/src/Servers/Kestrel/Kestrel.slnf index eac5a86e8ac2..dc69950c1ef7 100644 --- a/src/Servers/Kestrel/Kestrel.slnf +++ b/src/Servers/Kestrel/Kestrel.slnf @@ -11,6 +11,7 @@ "src\\Http\\Http.Features\\src\\Microsoft.AspNetCore.Http.Features.csproj", "src\\Http\\Http\\src\\Microsoft.AspNetCore.Http.csproj", "src\\Http\\WebUtilities\\src\\Microsoft.AspNetCore.WebUtilities.csproj", + "src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj", "src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj", "src\\Servers\\Kestrel\\Core\\src\\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "src\\Servers\\Kestrel\\Core\\test\\Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj", @@ -18,7 +19,8 @@ "src\\Servers\\Kestrel\\Kestrel\\test\\Microsoft.AspNetCore.Server.Kestrel.Tests.csproj", "src\\Servers\\Kestrel\\Transport.Libuv\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj", "src\\Servers\\Kestrel\\Transport.Libuv\\test\\Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj", - "src\\Servers\\Kestrel\\Transport.Quic\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.csproj", + "src\\Servers\\Kestrel\\Transport.Quic\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj", + "src\\Servers\\Kestrel\\Transport.Quic\\test\\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj", "src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "src\\Servers\\Kestrel\\perf\\Microbenchmarks\\Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj", "src\\Servers\\Kestrel\\samples\\Http2SampleApp\\Http2SampleApp.csproj", @@ -35,7 +37,6 @@ "src\\Servers\\Kestrel\\test\\Sockets.BindTests\\Sockets.BindTests.csproj", "src\\Servers\\Kestrel\\test\\Sockets.FunctionalTests\\Sockets.FunctionalTests.csproj", "src\\Servers\\Kestrel\\tools\\CodeGenerator\\CodeGenerator.csproj", - "src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj", "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj" ] } diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/FakeTlsConnectionFeature.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/FakeTlsConnectionFeature.cs index 0094c4ef1853..c40d42b3301c 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/Internal/FakeTlsConnectionFeature.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/Internal/FakeTlsConnectionFeature.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal +namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal { internal class FakeTlsConnectionFeature : ITlsConnectionFeature { diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/IQuicTrace.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/IQuicTrace.cs index 17d4238dc737..555aa85780aa 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/Internal/IQuicTrace.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/Internal/IQuicTrace.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Connections; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal +namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal { internal interface IQuicTrace : ILogger { diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionContext.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionContext.cs index dc8a25b02e98..17a5a6dc20cb 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionContext.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionContext.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal +namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal { internal class QuicConnectionContext : TransportMultiplexedConnection, IProtocolErrorCodeFeature { diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionListener.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionListener.cs index 2f79e985a077..0e7fab256d72 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionListener.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionListener.cs @@ -8,11 +8,11 @@ using System.Net.Security; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Connections.Experimental; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal +namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal { /// /// Listens for new Quic Connections. diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicStreamContext.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicStreamContext.cs index 8b22fc8c85c9..33819f4dcc33 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicStreamContext.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicStreamContext.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal +namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal { internal class QuicStreamContext : TransportConnection, IStreamDirectionFeature, IProtocolErrorCodeFeature, IStreamIdFeature { diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicTrace.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicTrace.cs index 4a071e232ab7..0791931ca095 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicTrace.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicTrace.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Connections; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal +namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal { internal class QuicTrace : IQuicTrace { diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicTransportContext.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicTransportContext.cs index 0ca29b2d2dda..f26c23d9d5ef 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicTransportContext.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicTransportContext.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Hosting; -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal +namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal { internal class QuicTransportContext { diff --git a/src/Servers/Kestrel/Transport.Quic/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.csproj b/src/Servers/Kestrel/Transport.Quic/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj similarity index 100% rename from src/Servers/Kestrel/Transport.Quic/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.csproj rename to src/Servers/Kestrel/Transport.Quic/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj diff --git a/src/Servers/Kestrel/Transport.Quic/src/PublicAPI.Unshipped.txt b/src/Servers/Kestrel/Transport.Quic/src/PublicAPI.Unshipped.txt index 621f79cb3abb..84251ae229c3 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/PublicAPI.Unshipped.txt +++ b/src/Servers/Kestrel/Transport.Quic/src/PublicAPI.Unshipped.txt @@ -1,24 +1,43 @@ #nullable enable -*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.Alpn.get -> string -*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.Alpn.set -> void -*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.Certificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2 -*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.Certificate.set -> void -*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.CertificateFilePath.get -> string -*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.CertificateFilePath.set -> void -*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.PrivateKeyFilePath.get -> string -*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.PrivateKeyFilePath.set -> void -*REMOVED*static Microsoft.AspNetCore.Hosting.WebHostBuilderMsQuicExtensions.UseQuic(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder -*REMOVED*static Microsoft.AspNetCore.Hosting.WebHostBuilderMsQuicExtensions.UseQuic(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder, System.Action configureOptions) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder -Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportFactory -Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportFactory.BindAsync(System.Net.EndPoint! endpoint, Microsoft.AspNetCore.Http.Features.IFeatureCollection? features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -~Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportFactory.QuicTransportFactory(Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory, Microsoft.Extensions.Options.IOptions! options) -> void -Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.Alpn.get -> string? -Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.Alpn.set -> void -static Microsoft.AspNetCore.Hosting.WebHostBuilderMsQuicExtensions.UseQuic(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! hostBuilder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! -static Microsoft.AspNetCore.Hosting.WebHostBuilderMsQuicExtensions.UseQuic(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! hostBuilder, System.Action! configureOptions) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! +*REMOVED*Microsoft.AspNetCore.Hosting.WebHostBuilderMsQuicExtensions +*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions +*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.IdleTimeout.get -> System.TimeSpan +*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.IdleTimeout.set -> void +*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.MaxBidirectionalStreamCount.get -> ushort +*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.MaxBidirectionalStreamCount.set -> void +*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.MaxReadBufferSize.get -> long? +*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.MaxReadBufferSize.set -> void +*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.MaxUnidirectionalStreamCount.get -> ushort +*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.MaxUnidirectionalStreamCount.set -> void +*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.MaxWriteBufferSize.get -> long? +*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.MaxWriteBufferSize.set -> void +*REMOVED*Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.QuicTransportOptions() -> void +*REMOVED*~Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.Alpn.get -> string +*REMOVED*~Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.Alpn.set -> void *REMOVED*~Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.Certificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2 *REMOVED*~Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.Certificate.set -> void *REMOVED*~Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.CertificateFilePath.get -> string *REMOVED*~Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.CertificateFilePath.set -> void *REMOVED*~Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.PrivateKeyFilePath.get -> string *REMOVED*~Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.QuicTransportOptions.PrivateKeyFilePath.set -> void +*REMOVED*~static Microsoft.AspNetCore.Hosting.WebHostBuilderMsQuicExtensions.UseQuic(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder, System.Action configureOptions) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder +*REMOVED*static Microsoft.AspNetCore.Hosting.WebHostBuilderMsQuicExtensions.UseQuic(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder +*REMOVED*static Microsoft.AspNetCore.Hosting.WebHostBuilderMsQuicExtensions.UseQuic(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder, System.Action configureOptions) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder +*REMOVED*~static Microsoft.AspNetCore.Hosting.WebHostBuilderMsQuicExtensions.UseQuic(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder +Microsoft.AspNetCore.Hosting.WebHostBuilderQuicExtensions +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions.Alpn.get -> string? +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions.Alpn.set -> void +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions.IdleTimeout.get -> System.TimeSpan +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions.IdleTimeout.set -> void +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions.MaxBidirectionalStreamCount.get -> ushort +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions.MaxBidirectionalStreamCount.set -> void +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions.MaxReadBufferSize.get -> long? +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions.MaxReadBufferSize.set -> void +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions.MaxUnidirectionalStreamCount.get -> ushort +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions.MaxUnidirectionalStreamCount.set -> void +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions.MaxWriteBufferSize.get -> long? +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions.MaxWriteBufferSize.set -> void +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.QuicTransportOptions.QuicTransportOptions() -> void +static Microsoft.AspNetCore.Hosting.WebHostBuilderQuicExtensions.UseQuic(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! hostBuilder, System.Action! configureOptions) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! +static Microsoft.AspNetCore.Hosting.WebHostBuilderQuicExtensions.UseQuic(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! hostBuilder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! diff --git a/src/Servers/Kestrel/Transport.Quic/src/QuicConnectionFactory.cs b/src/Servers/Kestrel/Transport.Quic/src/QuicConnectionFactory.cs index 0fbefdd3ea85..050a7ee8c5d3 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/QuicConnectionFactory.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/QuicConnectionFactory.cs @@ -8,13 +8,13 @@ using System.Net.Security; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Connections.Experimental; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic +namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic { internal class QuicConnectionFactory : IMultiplexedConnectionFactory { @@ -27,7 +27,7 @@ public QuicConnectionFactory(IOptions options, ILoggerFact throw new ArgumentNullException(nameof(options)); } - var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Client"); + var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Client"); var trace = new QuicTrace(logger); _transportContext = new QuicTransportContext(trace, options.Value); diff --git a/src/Servers/Kestrel/Transport.Quic/src/QuicTransportFactory.cs b/src/Servers/Kestrel/Transport.Quic/src/QuicTransportFactory.cs index db39d69b07cf..bb90f9ed4c1e 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/QuicTransportFactory.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/QuicTransportFactory.cs @@ -7,18 +7,17 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic +namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic { /// /// A factory for QUIC based connections. /// - public class QuicTransportFactory : IMultiplexedConnectionListenerFactory + internal class QuicTransportFactory : IMultiplexedConnectionListenerFactory { private QuicTrace _log; private QuicTransportOptions _options; diff --git a/src/Servers/Kestrel/Transport.Quic/src/QuicTransportOptions.cs b/src/Servers/Kestrel/Transport.Quic/src/QuicTransportOptions.cs index 8a3890f8bfe0..86a3003e5486 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/QuicTransportOptions.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/QuicTransportOptions.cs @@ -5,7 +5,7 @@ using System.Buffers; using System.Security.Cryptography.X509Certificates; -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic +namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic { /// /// Options for Quic based connections. diff --git a/src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderMsQuicExtensions.cs b/src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderQuicExtensions.cs similarity index 84% rename from src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderMsQuicExtensions.cs rename to src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderQuicExtensions.cs index c02ce141c5dc..01b134e82549 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderMsQuicExtensions.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderQuicExtensions.cs @@ -3,8 +3,7 @@ using System; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic; +using Microsoft.AspNetCore.Server.Kestrel.Transport.Quic; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Hosting @@ -12,7 +11,7 @@ namespace Microsoft.AspNetCore.Hosting /// /// Quic extensions. /// - public static class WebHostBuilderMsQuicExtensions + public static class WebHostBuilderQuicExtensions { public static IWebHostBuilder UseQuic(this IWebHostBuilder hostBuilder) { 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 c0d3b5287119..4c6267925168 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 @@ -14,7 +14,7 @@ - + diff --git a/src/Servers/Kestrel/Transport.Quic/test/QuicTransportFactoryTests.cs b/src/Servers/Kestrel/Transport.Quic/test/QuicTransportFactoryTests.cs index 69aabd26df51..9f0f029d331e 100644 --- a/src/Servers/Kestrel/Transport.Quic/test/QuicTransportFactoryTests.cs +++ b/src/Servers/Kestrel/Transport.Quic/test/QuicTransportFactoryTests.cs @@ -7,13 +7,12 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; using Xunit; -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests +namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests { public class QuicTransportFactoryTests { diff --git a/src/Servers/Kestrel/samples/Http3SampleApp/Http3SampleApp.csproj b/src/Servers/Kestrel/samples/Http3SampleApp/Http3SampleApp.csproj index 89dc0199e8bd..9492a268feaf 100644 --- a/src/Servers/Kestrel/samples/Http3SampleApp/Http3SampleApp.csproj +++ b/src/Servers/Kestrel/samples/Http3SampleApp/Http3SampleApp.csproj @@ -8,6 +8,6 @@ - + diff --git a/src/Servers/Kestrel/shared/TransportMultiplexedConnection.cs b/src/Servers/Kestrel/shared/TransportMultiplexedConnection.cs index a1990c5d46f5..549e9833313c 100644 --- a/src/Servers/Kestrel/shared/TransportMultiplexedConnection.cs +++ b/src/Servers/Kestrel/shared/TransportMultiplexedConnection.cs @@ -6,7 +6,6 @@ using System.IO.Pipelines; using System.Net; using System.Threading; -using Microsoft.AspNetCore.Connections.Experimental; using Microsoft.AspNetCore.Http.Features; namespace Microsoft.AspNetCore.Connections diff --git a/src/Servers/Kestrel/shared/test/TestContextFactory.cs b/src/Servers/Kestrel/shared/test/TestContextFactory.cs index 4b64ac289435..a50e672c0bf1 100644 --- a/src/Servers/Kestrel/shared/test/TestContextFactory.cs +++ b/src/Servers/Kestrel/shared/test/TestContextFactory.cs @@ -9,7 +9,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs index d4efefeecac6..19de1d35ca3f 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs @@ -15,7 +15,6 @@ using System.Threading.Channels; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs index d27641c12bf2..5bab9ffffe69 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Connections.Experimental; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs index 67104f9d3c90..1ac072438769 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs @@ -12,7 +12,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/MockMultiplexedConnectionListenerFactory.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/MockMultiplexedConnectionListenerFactory.cs index 9cc2ef02225c..7fef20f0f55a 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/MockMultiplexedConnectionListenerFactory.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/MockMultiplexedConnectionListenerFactory.cs @@ -5,8 +5,7 @@ using System.Net; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Connections.Experimental; -using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http.Features; namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs index 4d5172b7ff17..21ca585fed2c 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs @@ -12,7 +12,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Experimental; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Http;