PR feedback

Author: JamesNK

src/Http/Http.Abstractions/src/Extensions/EndpointBuilder.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.AspNetCore.Builder;
@@ -15,7 +16,14 @@ public abstract class EndpointBuilder
     /// <summary>
     /// Gets the list of filters that apply to this endpoint.
     /// </summary>
-    public IList<Func<EndpointFilterFactoryContext, EndpointFilterDelegate, EndpointFilterDelegate>> FilterFactories => _filterFactories ??= new();
+    public IList<Func<EndpointFilterFactoryContext, EndpointFilterDelegate, EndpointFilterDelegate>> FilterFactories
+    {
+        [RequiresDynamicCode("Filter factories generate dynamic code and aren't compatible with native AOT applications.")]
+        get
+        {
+            return _filterFactories ??= new();
+        }
+    }
 
     /// <summary>
     /// Gets or sets the delegate used to process requests for the endpoint.

src/Http/Http.Extensions/src/RequestDelegateFactory.cs

@@ -262,7 +262,7 @@ private static RequestDelegateFactoryContext CreateFactoryContext(RequestDelegat
         }
 
         var serviceProvider = options?.ServiceProvider ?? options?.EndpointBuilder?.ApplicationServices ?? EmptyServiceProvider.Instance;
-        var endpointBuilder = options?.EndpointBuilder ?? new RDFEndpointBuilder(serviceProvider);
+        var endpointBuilder = options?.EndpointBuilder ?? new RdfEndpointBuilder(serviceProvider);
         var jsonSerializerOptions = serviceProvider.GetService<IOptions<JsonOptions>>()?.Value.SerializerOptions;
 
         var factoryContext = new RequestDelegateFactoryContext
@@ -2525,9 +2525,9 @@ public Task ExecuteAsync(HttpContext httpContext)
         }
     }
 
-    private sealed class RDFEndpointBuilder : EndpointBuilder
+    private sealed class RdfEndpointBuilder : EndpointBuilder
     {
-        public RDFEndpointBuilder(IServiceProvider applicationServices)
+        public RdfEndpointBuilder(IServiceProvider applicationServices)
         {
             ApplicationServices = applicationServices;
         }

src/Http/Routing/src/Builder/EndpointFilterExtensions.cs

@@ -13,12 +13,15 @@ namespace Microsoft.AspNetCore.Http;
 /// </summary>
 public static class EndpointFilterExtensions
 {
+    internal const string FilterRequiresDynamicCodeWarning = "Filter factories generate dynamic code and aren't compatible with native AOT applications.";
+
     /// <summary>
     /// Registers a filter onto the route handler.
     /// </summary>
     /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
     /// <param name="filter">The <see cref="IEndpointFilter"/> to register.</param>
     /// <returns>A <see cref="RouteHandlerBuilder"/> that can be used to further customize the route handler.</returns>
+    [RequiresDynamicCode(FilterRequiresDynamicCodeWarning)]
     public static TBuilder AddEndpointFilter<TBuilder>(this TBuilder builder, IEndpointFilter filter) where TBuilder : IEndpointConventionBuilder =>
         builder.AddEndpointFilterFactory((routeHandlerContext, next) => (context) => filter.InvokeAsync(context, next));
 
@@ -29,6 +32,7 @@ public static TBuilder AddEndpointFilter<TBuilder>(this TBuilder builder, IEndpo
     /// <typeparam name="TFilterType">The type of the <see cref="IEndpointFilter"/> to register.</typeparam>
     /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
     /// <returns>A <see cref="RouteHandlerBuilder"/> that can be used to further customize the route handler.</returns>
+    [RequiresDynamicCode(FilterRequiresDynamicCodeWarning)]
     public static TBuilder AddEndpointFilter<TBuilder, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TFilterType>(this TBuilder builder)
         where TBuilder : IEndpointConventionBuilder
         where TFilterType : IEndpointFilter
@@ -63,6 +67,7 @@ public static TBuilder AddEndpointFilter<TBuilder>(this TBuilder builder, IEndpo
     /// <typeparam name="TFilterType">The type of the <see cref="IEndpointFilter"/> to register.</typeparam>
     /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
     /// <returns>A <see cref="RouteHandlerBuilder"/> that can be used to further customize the route handler.</returns>
+    [RequiresDynamicCode(FilterRequiresDynamicCodeWarning)]
     public static RouteHandlerBuilder AddEndpointFilter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TFilterType>(this RouteHandlerBuilder builder)
         where TFilterType : IEndpointFilter
     {
@@ -76,6 +81,7 @@ public static TBuilder AddEndpointFilter<TBuilder>(this TBuilder builder, IEndpo
     /// <typeparam name="TFilterType">The type of the <see cref="IEndpointFilter"/> to register.</typeparam>
     /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
     /// <returns>A <see cref="RouteHandlerBuilder"/> that can be used to further customize the route handler.</returns>
+    [RequiresDynamicCode(FilterRequiresDynamicCodeWarning)]
     public static RouteGroupBuilder AddEndpointFilter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TFilterType>(this RouteGroupBuilder builder)
         where TFilterType : IEndpointFilter
     {
@@ -89,6 +95,7 @@ public static TBuilder AddEndpointFilter<TBuilder>(this TBuilder builder, IEndpo
     /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
     /// <param name="routeHandlerFilter">A method representing the core logic of the filter.</param>
     /// <returns>A <see cref="RouteHandlerBuilder"/> that can be used to further customize the route handler.</returns>
+    [RequiresDynamicCode(FilterRequiresDynamicCodeWarning)]
     public static TBuilder AddEndpointFilter<TBuilder>(this TBuilder builder, Func<EndpointFilterInvocationContext, EndpointFilterDelegate, ValueTask<object?>> routeHandlerFilter)
         where TBuilder : IEndpointConventionBuilder
     {
@@ -101,6 +108,7 @@ public static TBuilder AddEndpointFilter<TBuilder>(this TBuilder builder, Func<E
     /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
     /// <param name="filterFactory">A method representing the logic for constructing the filter.</param>
     /// <returns>A <see cref="RouteHandlerBuilder"/> that can be used to further customize the route handler.</returns>
+    [RequiresDynamicCode(FilterRequiresDynamicCodeWarning)]
     public static TBuilder AddEndpointFilterFactory<TBuilder>(this TBuilder builder, Func<EndpointFilterFactoryContext, EndpointFilterDelegate, EndpointFilterDelegate> filterFactory)
         where TBuilder : IEndpointConventionBuilder
     {

src/Http/Routing/src/RouteEndpointDataSource.cs

@@ -202,7 +202,7 @@ private RouteEndpointBuilder CreateRouteEndpointBuilder(
         // they can do so via IEndpointConventionBuilder.Finally like the do to override any other entry-specific metadata.
         if (isRouteHandler)
         {
-            rdfOptions = CreateRDFOptions(entry, pattern, builder);
+            rdfOptions = CreateRdfOptions(entry, pattern, builder);
             rdfMetadataResult = RequestDelegateFactory.InferMetadata(entry.RouteHandler.Method, rdfOptions);
         }
 
@@ -227,7 +227,7 @@ private RouteEndpointBuilder CreateRouteEndpointBuilder(
 
         if (isRouteHandler || builder.FilterFactories.Count > 0)
         {
-            rdfOptions ??= CreateRDFOptions(entry, pattern, builder);
+            rdfOptions ??= CreateRdfOptions(entry, pattern, builder);
 
             // We ignore the returned EndpointMetadata has been already populated since we passed in non-null EndpointMetadata.
             // We always set factoryRequestDelegate in case something is still referencing the redirected version of the RequestDelegate.
@@ -259,7 +259,7 @@ private RouteEndpointBuilder CreateRouteEndpointBuilder(
         return builder;
     }
 
-    private RequestDelegateFactoryOptions CreateRDFOptions(RouteEntry entry, RoutePattern pattern, RouteEndpointBuilder builder)
+    private RequestDelegateFactoryOptions CreateRdfOptions(RouteEntry entry, RoutePattern pattern, RouteEndpointBuilder builder)
     {
         var routeParamNames = new List<string>(pattern.Parameters.Count);
         foreach (var parameter in pattern.Parameters)