Skip to content

Commit 487f484

Browse files
halter73wtgodbe
halter73
and
wtgodbe
authored
[release/6.0-rc2] Update sdk to 6.0.100-rc.2.21470.55 (#36783)
* 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 <[email protected]>
1 parent 007c622 commit 487f484

19 files changed

+35
-3
lines changed

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.100-rc.2.21457.23"
3+
"version": "6.0.100-rc.2.21470.55"
44
},
55
"tools": {
6-
"dotnet": "6.0.100-rc.2.21457.23",
6+
"dotnet": "6.0.100-rc.2.21470.55",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.27",

‎src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,9 @@ private Http3StreamContext CreateHttpStreamContext(ConnectionContext streamConte
457457
{
458458
var httpConnectionContext = new Http3StreamContext(
459459
_multiplexedContext.ConnectionId,
460+
#pragma warning disable CA2252 // Preview Features
460461
HttpProtocols.Http3,
462+
#pragma warning restore CA2252
461463
_context.AltSvcHeader,
462464
_multiplexedContext,
463465
_context.ServiceContext,
@@ -537,7 +539,9 @@ private async ValueTask<Http3ControlStream> CreateNewUnidirectionalStreamAsync<T
537539
var streamContext = await _multiplexedContext.ConnectAsync(features);
538540
var httpConnectionContext = new Http3StreamContext(
539541
_multiplexedContext.ConnectionId,
542+
#pragma warning disable CA2252 // Preview Features
540543
HttpProtocols.Http3,
544+
#pragma warning restore CA2252
541545
_context.AltSvcHeader,
542546
_multiplexedContext,
543547
_context.ServiceContext,

‎src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@ public async Task ProcessRequestsAsync<TContext>(IHttpApplication<TContext> http
7070
requestProcessor = new Http2Connection((HttpConnectionContext)_context);
7171
_protocolSelectionState = ProtocolSelectionState.Selected;
7272
break;
73+
#pragma warning disable CA2252 // Preview Features
7374
case HttpProtocols.Http3:
7475
requestProcessor = new Http3Connection((HttpMultiplexedConnectionContext)_context);
76+
#pragma warning restore CA2252
7577
_protocolSelectionState = ProtocolSelectionState.Selected;
7678
break;
7779
case HttpProtocols.None:
@@ -205,7 +207,9 @@ private HttpProtocols SelectProtocol()
205207
var isMultiplexTransport = _context is HttpMultiplexedConnectionContext;
206208
var http1Enabled = _context.Protocols.HasFlag(HttpProtocols.Http1);
207209
var http2Enabled = _context.Protocols.HasFlag(HttpProtocols.Http2);
210+
#pragma warning disable CA2252 // Preview Features
208211
var http3Enabled = _context.Protocols.HasFlag(HttpProtocols.Http3);
212+
#pragma warning restore CA2252
209213

210214
string? error = null;
211215

@@ -218,7 +222,9 @@ private HttpProtocols SelectProtocol()
218222
{
219223
if (http3Enabled)
220224
{
225+
#pragma warning disable CA2252 // Preview Features
221226
return HttpProtocols.Http3;
227+
#pragma warning restore CA2252
222228
}
223229

224230
error = $"Protocols {_context.Protocols} not supported on multiplexed transport.";

‎src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,9 @@ private static bool IsHex(char ch)
536536
public static AltSvcHeader? GetEndpointAltSvc(System.Net.IPEndPoint endpoint, HttpProtocols protocols)
537537
{
538538
var hasHttp1OrHttp2 = protocols.HasFlag(HttpProtocols.Http1) || protocols.HasFlag(HttpProtocols.Http2);
539+
#pragma warning disable CA2252 // Preview Features
539540
var hasHttp3 = protocols.HasFlag(HttpProtocols.Http3);
541+
#pragma warning restore CA2252
540542

541543
if (hasHttp1OrHttp2 && hasHttp3)
542544
{

‎src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,9 @@ async Task OnBind(ListenOptions options, CancellationToken onBindCancellationTok
168168
{
169169
var hasHttp1 = options.Protocols.HasFlag(HttpProtocols.Http1);
170170
var hasHttp2 = options.Protocols.HasFlag(HttpProtocols.Http2);
171+
#pragma warning disable CA2252 // Preview Features
171172
var hasHttp3 = options.Protocols.HasFlag(HttpProtocols.Http3);
173+
#pragma warning restore CA2252
172174
var hasTls = options.IsTls;
173175

174176
// Filter out invalid combinations.

‎src/Servers/Kestrel/Core/src/ListenOptionsHttpsExtensions.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,12 @@ public static ListenOptions UseHttps(this ListenOptions listenOptions, ServerOpt
256256
/// <returns>The <see cref="ListenOptions"/>.</returns>
257257
public static ListenOptions UseHttps(this ListenOptions listenOptions, ServerOptionsSelectionCallback serverOptionsSelectionCallback, object state, TimeSpan handshakeTimeout)
258258
{
259+
#pragma warning disable CA2252 // Preview Features
259260
if (listenOptions.Protocols.HasFlag(HttpProtocols.Http3))
260261
{
261262
throw new NotSupportedException($"{nameof(UseHttps)} with {nameof(ServerOptionsSelectionCallback)} is not supported with HTTP/3.");
262263
}
264+
#pragma warning restore CA2252
263265
return listenOptions.UseHttps(new TlsHandshakeCallbackOptions()
264266
{
265267
OnConnection = context => serverOptionsSelectionCallback(context.SslStream, context.ClientHelloInfo, context.State, context.CancellationToken),
@@ -287,10 +289,12 @@ public static ListenOptions UseHttps(this ListenOptions listenOptions, TlsHandsh
287289
throw new ArgumentException($"{nameof(TlsHandshakeCallbackOptions.OnConnection)} must not be null.");
288290
}
289291

292+
#pragma warning disable CA2252 // Preview Features
290293
if (listenOptions.Protocols.HasFlag(HttpProtocols.Http3))
291294
{
292295
throw new NotSupportedException($"{nameof(UseHttps)} with {nameof(TlsHandshakeCallbackOptions)} is not supported with HTTP/3.");
293296
}
297+
#pragma warning restore CA2252
294298

295299
var loggerFactory = listenOptions.KestrelServerOptions?.ApplicationServices.GetRequiredService<ILoggerFactory>() ?? NullLoggerFactory.Instance;
296300

‎src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<TestGroupName>Kestrel.Core.Tests</TestGroupName>
77
<DefineConstants>$(DefineConstants);KESTREL</DefineConstants>
8+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
89
</PropertyGroup>
910

1011
<ItemGroup>

‎src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ public static class WebHostBuilderKestrelExtensions
2929
/// </returns>
3030
public static IWebHostBuilder UseKestrel(this IWebHostBuilder hostBuilder)
3131
{
32+
#pragma warning disable CA2252 // Preview Features
3233
hostBuilder.UseQuic();
34+
#pragma warning restore CA2252
3335
return hostBuilder.ConfigureServices(services =>
3436
{
3537
// Don't override an already-configured transport

‎src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
5+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
56
</PropertyGroup>
67

78
<ItemGroup>

‎src/Servers/Kestrel/Transport.Libuv/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<!-- https://github.com/dotnet/aspnetcore/issues/22114 -->
88
<SkipHelixArm>true</SkipHelixArm>
99
<SkipHelixAlpine>true</SkipHelixAlpine>
10+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

‎src/Servers/Kestrel/Transport.Quic/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageTags>aspnetcore;kestrel</PackageTags>
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
10-
<NoWarn>CA1416;CS1591;CS0436;$(NoWarn)</NoWarn><!-- Conflicts between internal and public Quic APIs; Platform support warnings. -->
10+
<NoWarn>CA1416;CS1591;CS0436;$(NoWarn)</NoWarn> <!-- Conflicts between internal and public Quic APIs; Platform support warnings. -->
1111
<IsPackable>false</IsPackable>
1212
<Nullable>enable</Nullable>
13+
<EnablePreviewFeatures>True</EnablePreviewFeatures> <!-- System.Net.Quic is still in preview -->
1314
</PropertyGroup>
1415

1516
<ItemGroup>

‎src/Servers/Kestrel/Transport.Quic/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<ServerGarbageCollection>true</ServerGarbageCollection>
7+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
78
</PropertyGroup>
89

910
<ItemGroup>

‎src/Servers/Kestrel/perf/Microbenchmarks/Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ServerGarbageCollection>true</ServerGarbageCollection>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<TieredCompilation>false</TieredCompilation>
9+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
910
</PropertyGroup>
1011

1112
<ItemGroup>

‎src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<TestGroupName>InMemory.FunctionalTests</TestGroupName>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<DefineConstants>$(DefineConstants);IS_FUNCTIONAL_TESTS</DefineConstants>
9+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
910
</PropertyGroup>
1011

1112
<ItemGroup>

‎src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<SignAssembly>false</SignAssembly>
99
<SkipHelixArm>true</SkipHelixArm>
1010
<SkipHelixAlpine>true</SkipHelixAlpine>
11+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
1112
</PropertyGroup>
1213

1314
<ItemGroup>

‎src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<TestGroupName>Libuv.BindTests</TestGroupName>
77
<!-- https://github.com/dotnet/aspnetcore/issues/22114 -->
88
<SkipHelixQueues>Windows.10.Arm64;Windows.10.Arm64.Open;Windows.10.Arm64v8;Windows.10.Arm64v8.Open</SkipHelixQueues>
9+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
910
</PropertyGroup>
1011

1112
<ItemGroup>

‎src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<TestGroupName>Libuv.FunctionalTests</TestGroupName>
1010
<!-- https://github.com/dotnet/aspnetcore/issues/22114 -->
1111
<SkipHelixQueues>Windows.10.Arm64;Windows.10.Arm64.Open;Windows.10.Arm64v8;Windows.10.Arm64v8.Open</SkipHelixQueues>
12+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
1213
</PropertyGroup>
1314

1415
<ItemGroup>

‎src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<ServerGarbageCollection>true</ServerGarbageCollection>
66
<TestGroupName>Sockets.BindTests</TestGroupName>
7+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
78
</PropertyGroup>
89

910
<ItemGroup>

‎src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<DefineConstants>$(DefineConstants);SOCKETS</DefineConstants>
77
<ServerGarbageCollection>true</ServerGarbageCollection>
88
<TestGroupName>Sockets.FunctionalTests</TestGroupName>
9+
<EnablePreviewFeatures>true</EnablePreviewFeatures>
910
</PropertyGroup>
1011

1112
<ItemGroup>

0 commit comments

Comments
 (0)