Merge in 'release/7.0-rc1' changes

Author: dotnet-bot

src/Http/Http.Features/src/IHttpWebTransportFeature.cs

@@ -8,6 +8,7 @@ namespace Microsoft.AspNetCore.Http.Features;
 /// <summary>
 /// API for accepting and retrieving WebTransport sessions.
 /// </summary>
+[RequiresPreviewFeatures("WebTransport is a preview feature")]
 public interface IHttpWebTransportFeature
 {
     /// <summary>
@@ -20,6 +21,5 @@ public interface IHttpWebTransportFeature
     /// </summary>
     /// <param name="cancellationToken">The cancellation token to cancel waiting for the session.</param>
     /// <returns>An instance of a WebTransportSession which will be used to control the connection.</returns>
-    [RequiresPreviewFeatures("WebTransport is a preview feature")]
     ValueTask<IWebTransportSession> AcceptAsync(CancellationToken cancellationToken = default);
 }

src/Http/Http.Features/src/IWebTransportSession.cs

@@ -1,13 +1,15 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Runtime.Versioning;
 using Microsoft.AspNetCore.Connections;
 
 namespace Microsoft.AspNetCore.Http.Features;
 
 /// <summary>
 /// Controls the session and streams of a WebTransport session.
 /// </summary>
+[RequiresPreviewFeatures("WebTransport is a preview feature")]
 public interface IWebTransportSession
 {
     /// <summary>

src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.Generated.cs

@@ -11,6 +11,8 @@
 using Microsoft.AspNetCore.Http.Features.Authentication;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Features;
 
+#pragma warning disable CA2252 // WebTransport is a preview feature
+
 #nullable enable
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http

src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs

@@ -1169,7 +1169,9 @@ private Pipe CreateRequestBodyPipe(uint windowSize)
         }
     }
 
+#pragma warning disable CA2252 // WebTransport is a preview feature
     public override async ValueTask<IWebTransportSession> AcceptAsync(CancellationToken token)
+#pragma warning restore CA2252 // WebTransport is a preview feature
     {
         if (_isWebTransportSessionAccepted)
         {

src/Servers/Kestrel/Core/src/Internal/WebTransport/WebTransportSession.cs

@@ -13,6 +13,7 @@
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.WebTransport;
 
+#pragma warning disable CA2252 // WebTransport is a preview feature
 internal sealed class WebTransportSession : IWebTransportSession
 {
     private static readonly IStreamDirectionFeature _outputStreamDirectionFeature = new DefaultStreamDirectionFeature(canRead: false, canWrite: true);
@@ -190,3 +191,4 @@ internal bool TryRemoveStream(long streamId)
         return success;
     }
 }
+#pragma warning restore CA2252 // WebTransport is a preview feature

src/Servers/Kestrel/Core/test/Http1/Http1HttpProtocolFeatureCollectionTests.cs

@@ -127,7 +127,9 @@ public void FeaturesSetByTypeSameAsGeneric()
         _collection[typeof(IHttpExtendedConnectFeature)] = CreateHttp1Connection();
         _collection[typeof(IHttpUpgradeFeature)] = CreateHttp1Connection();
         _collection[typeof(IPersistentStateFeature)] = CreateHttp1Connection();
+#pragma warning disable CA2252 // WebTransport is a preview feature
         _collection.Set<IHttpWebTransportFeature>(CreateHttp1Connection());
+#pragma warning restore CA2252 // WebTransport is a preview feature
 
         CompareGenericGetterToIndexer();
 
@@ -155,7 +157,9 @@ public void FeaturesSetByGenericSameAsByType()
         _collection.Set<IHttpExtendedConnectFeature>(CreateHttp1Connection());
         _collection.Set<IHttpUpgradeFeature>(CreateHttp1Connection());
         _collection.Set<IPersistentStateFeature>(CreateHttp1Connection());
+#pragma warning disable CA2252 // WebTransport is a preview feature
         _collection.Set<IHttpWebTransportFeature>(CreateHttp1Connection());
+#pragma warning restore CA2252 // WebTransport is a preview feature
 
         CompareGenericGetterToIndexer();
 

src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/WebTransport/WebTransportHandshakeTests.cs

@@ -27,11 +27,11 @@ await Http3Api.InitializeConnectionAsync(async context =>
         {
             var success = true;
 
+#pragma warning disable CA2252 // WebTransport is a preview feature
             var webTransportFeature = context.Features.GetRequiredFeature<IHttpWebTransportFeature>();
 
             success &= webTransportFeature.IsWebTransportRequest;
 
-#pragma warning disable CA2252 // This API requires opting into preview features
             try
             {
                 var session = await webTransportFeature.AcceptAsync(CancellationToken.None).DefaultTimeout(); // todo session is null here

src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/WebTransport/WebTransportTestUtilities.cs

@@ -22,13 +22,13 @@ internal class WebTransportTestUtilities
 
     public static async ValueTask<WebTransportSession> GenerateSession(Http3InMemory inMemory, TaskCompletionSource exitSessionTcs)
     {
+#pragma warning disable CA2252 // WebTransport is a preview feature
         var appCompletedTcs = new TaskCompletionSource<IWebTransportSession>(TaskCreationOptions.RunContinuationsAsynchronously);
 
         await inMemory.InitializeConnectionAsync(async context =>
         {
             var webTransportFeature = context.Features.GetRequiredFeature<IHttpWebTransportFeature>();
 
-#pragma warning disable CA2252 // This API requires opting into preview features
             try
             {
                 var session = await webTransportFeature.AcceptAsync(CancellationToken.None).DefaultTimeout();
@@ -38,7 +38,7 @@ await inMemory.InitializeConnectionAsync(async context =>
             {
                 appCompletedTcs.SetException(exception);
             }
-#pragma warning restore CA2252
+#pragma warning restore CA2252 // WebTransport is a preview feature
 
             // wait for the test to tell us to kill the application
             await exitSessionTcs.Task;

src/Servers/Kestrel/tools/CodeGenerator/HttpProtocolFeatureCollection.cs

@@ -88,7 +88,9 @@ public static string GenerateFile()
 using Microsoft.AspNetCore.Connections.Features;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http.Features.Authentication;
-using Microsoft.AspNetCore.Server.Kestrel.Core.Features;";
+using Microsoft.AspNetCore.Server.Kestrel.Core.Features;
+
+#pragma warning disable CA2252 // WebTransport is a preview feature";
 
         return FeatureCollectionGenerator.GenerateFile(
             namespaceName: "Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http",