Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 6 additions & 0 deletions src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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;

Expand All @@ -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.";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 2 additions & 0 deletions src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions src/Servers/Kestrel/Core/src/ListenOptionsHttpsExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TestGroupName>Kestrel.Core.Tests</TestGroupName>
<DefineConstants>$(DefineConstants);KESTREL</DefineConstants>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<!-- https://github.com/dotnet/aspnetcore/issues/22114 -->
<SkipHelixArm>true</SkipHelixArm>
<SkipHelixAlpine>true</SkipHelixAlpine>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ServerGarbageCollection>true</ServerGarbageCollection>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<ServerGarbageCollection>true</ServerGarbageCollection>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TieredCompilation>false</TieredCompilation>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<TestGroupName>InMemory.FunctionalTests</TestGroupName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);IS_FUNCTIONAL_TESTS</DefineConstants>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<SignAssembly>false</SignAssembly>
<SkipHelixArm>true</SkipHelixArm>
<SkipHelixAlpine>true</SkipHelixAlpine>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
<TestGroupName>Sockets.BindTests</TestGroupName>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<DefineConstants>$(DefineConstants);SOCKETS</DefineConstants>
<ServerGarbageCollection>true</ServerGarbageCollection>
<TestGroupName>Sockets.FunctionalTests</TestGroupName>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
</PropertyGroup>

<ItemGroup>
Expand Down