[AOT] Enable analysis and annotate Http.Results

eng/TrimmableProjects.props

@@ -25,6 +25,7 @@
     <TrimmableProject Include="Microsoft.AspNetCore.Http.Abstractions" />
     <TrimmableProject Include="Microsoft.AspNetCore.Http.Extensions" />
     <TrimmableProject Include="Microsoft.AspNetCore.Http.Features" />
+    <TrimmableProject Include="Microsoft.AspNetCore.Http.Results" />
     <TrimmableProject Include="Microsoft.AspNetCore.Http" />
     <TrimmableProject Include="Microsoft.AspNetCore.Metadata" />
     <TrimmableProject Include="Microsoft.AspNetCore.Routing.Abstractions" />

src/Http/Http.Abstractions/test/RouteValueDictionaryTests.cs

@@ -358,6 +358,57 @@ public void CreateFromObject_MixedCaseThrows()
         Assert.Equal(message, exception.Message, ignoreCase: true);
     }
 
+    [Fact]
+    public void CreateFromObject_Struct_ReadValues()
+    {
+        // Arrange
+        var obj = new StructAddress() { City = "Singapore" };
+
+        // Act
+        var dict = new RouteValueDictionary(obj);
+
+        // Assert
+        Assert.NotNull(dict._propertyStorage);
+        AssertEmptyArrayStorage(dict);
+        Assert.Collection(
+            dict.OrderBy(kvp => kvp.Key),
+            kvp => { Assert.Equal("City", kvp.Key); Assert.Equal("Singapore", kvp.Value); },
+            kvp => { Assert.Equal("State", kvp.Key); Assert.Null(kvp.Value); });
+    }
+
+    [Fact]
+    public void CreateFromObject_NullableStruct_ReadValues()
+    {
+        // Arrange
+        StructAddress? obj = new StructAddress() { City = "Singapore" };
+
+        // Act
+        var dict = new RouteValueDictionary(obj);
+
+        // Assert
+        Assert.NotNull(dict._propertyStorage);
+        AssertEmptyArrayStorage(dict);
+        Assert.Collection(
+            dict.OrderBy(kvp => kvp.Key),
+            kvp => { Assert.Equal("City", kvp.Key); Assert.Equal("Singapore", kvp.Value); },
+            kvp => { Assert.Equal("State", kvp.Key); Assert.Null(kvp.Value); });
+    }
+
+    [Fact]
+    public void CreateFromObject_NullStruct_ReadValues()
+    {
+        // Arrange
+        StructAddress? obj = null;
+
+        // Act
+        var dict = new RouteValueDictionary(obj);
+
+        // Assert
+        Assert.Null(dict._propertyStorage);
+        AssertEmptyArrayStorage(dict);
+        Assert.Empty(dict);
+    }
+
     // Our comparer is hardcoded to be OrdinalIgnoreCase no matter what.
     [Fact]
     public void Comparer_IsOrdinalIgnoreCase()
@@ -2164,4 +2215,11 @@ private class Address
 
         public string? State { get; set; }
     }
+
+    private struct StructAddress
+    {
+        public string? City { get; set; }
+
+        public string? State { get; set; }
+    }
 }

src/Http/Http.Results/src/AcceptedAtRoute.cs

@@ -1,9 +1,11 @@
 // 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 System.Reflection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http.Metadata;
+using Microsoft.AspNetCore.Internal;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -22,11 +24,24 @@ public sealed class AcceptedAtRoute : IResult, IEndpointMetadataProvider, IStatu
     /// provided.
     /// </summary>
     /// <param name="routeValues">The route data to use for generating the URL.</param>
+    [RequiresUnreferencedCode(RouteValueDictionaryTrimmerWarning.Warning)]
     internal AcceptedAtRoute(object? routeValues)
         : this(routeName: null, routeValues: routeValues)
     {
     }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AcceptedAtRoute"/> class with the values
+    /// provided.
+    /// </summary>
+    /// <param name="routeName">The name of the route to use for generating the URL.</param>
+    /// <param name="routeValues">The route data to use for generating the URL.</param>
+    [RequiresUnreferencedCode(RouteValueDictionaryTrimmerWarning.Warning)]
+    internal AcceptedAtRoute(string? routeName, object? routeValues)
+        : this(routeName, new RouteValueDictionary(routeValues))
+    {
+    }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="AcceptedAtRoute"/> class with the values
     /// provided.
@@ -35,10 +50,10 @@ internal AcceptedAtRoute(object? routeValues)
     /// <param name="routeValues">The route data to use for generating the URL.</param>
     internal AcceptedAtRoute(
         string? routeName,
-        object? routeValues)
+        RouteValueDictionary routeValues)
     {
         RouteName = routeName;
-        RouteValues = new RouteValueDictionary(routeValues);
+        RouteValues = routeValues;
     }
 
     /// <summary>

src/Http/Http.Results/src/AcceptedAtRouteOfT.cs

@@ -1,9 +1,11 @@
 // 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 System.Reflection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http.Metadata;
+using Microsoft.AspNetCore.Internal;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -24,11 +26,25 @@ public sealed class AcceptedAtRoute<TValue> : IResult, IEndpointMetadataProvider
     /// </summary>
     /// <param name="routeValues">The route data to use for generating the URL.</param>
     /// <param name="value">The value to format in the entity body.</param>
+    [RequiresUnreferencedCode(RouteValueDictionaryTrimmerWarning.Warning)]
     internal AcceptedAtRoute(object? routeValues, TValue? value)
         : this(routeName: null, routeValues: routeValues, value: value)
     {
     }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AcceptedAtRoute"/> class with the values
+    /// provided.
+    /// </summary>
+    /// <param name="routeName">The name of the route to use for generating the URL.</param>
+    /// <param name="routeValues">The route data to use for generating the URL.</param>
+    /// <param name="value">The value to format in the entity body.</param>
+    [RequiresUnreferencedCode(RouteValueDictionaryTrimmerWarning.Warning)]
+    internal AcceptedAtRoute(string? routeName, object? routeValues, TValue? value)
+        : this(routeName, new RouteValueDictionary(routeValues), value)
+    {
+    }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="AcceptedAtRoute"/> class with the values
     /// provided.
@@ -38,12 +54,12 @@ internal AcceptedAtRoute(object? routeValues, TValue? value)
     /// <param name="value">The value to format in the entity body.</param>
     internal AcceptedAtRoute(
         string? routeName,
-        object? routeValues,
+        RouteValueDictionary routeValues,
         TValue? value)
     {
         Value = value;
         RouteName = routeName;
-        RouteValues = new RouteValueDictionary(routeValues);
+        RouteValues = routeValues;
         HttpResultsHelper.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
     }
 

src/Http/Http.Results/src/CreatedAtRoute.cs

@@ -1,9 +1,11 @@
 // 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 System.Reflection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http.Metadata;
+using Microsoft.AspNetCore.Internal;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -22,11 +24,24 @@ public sealed class CreatedAtRoute : IResult, IEndpointMetadataProvider, IStatus
     /// provided.
     /// </summary>
     /// <param name="routeValues">The route data to use for generating the URL.</param>
+    [RequiresUnreferencedCode(RouteValueDictionaryTrimmerWarning.Warning)]
     internal CreatedAtRoute(object? routeValues)
         : this(routeName: null, routeValues: routeValues)
     {
     }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CreatedAtRoute"/> class with the values
+    /// provided.
+    /// </summary>
+    /// <param name="routeName">The name of the route to use for generating the URL.</param>
+    /// <param name="routeValues">The route data to use for generating the URL.</param>
+    [RequiresUnreferencedCode(RouteValueDictionaryTrimmerWarning.Warning)]
+    internal CreatedAtRoute(string? routeName, object? routeValues)
+        : this(routeName, new RouteValueDictionary(routeValues))
+    {
+    }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="CreatedAtRoute"/> class with the values
     /// provided.
@@ -35,10 +50,10 @@ internal CreatedAtRoute(object? routeValues)
     /// <param name="routeValues">The route data to use for generating the URL.</param>
     internal CreatedAtRoute(
         string? routeName,
-        object? routeValues)
+        RouteValueDictionary routeValues)
     {
         RouteName = routeName;
-        RouteValues = new RouteValueDictionary(routeValues);
+        RouteValues = routeValues;
     }
 
     /// <summary>

src/Http/Http.Results/src/CreatedAtRouteOfT.cs

@@ -1,9 +1,11 @@
 // 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 System.Reflection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http.Metadata;
+using Microsoft.AspNetCore.Internal;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -24,11 +26,25 @@ public sealed class CreatedAtRoute<TValue> : IResult, IEndpointMetadataProvider,
     /// </summary>
     /// <param name="routeValues">The route data to use for generating the URL.</param>
     /// <param name="value">The value to format in the entity body.</param>
+    [RequiresUnreferencedCode(RouteValueDictionaryTrimmerWarning.Warning)]
     internal CreatedAtRoute(object? routeValues, TValue? value)
         : this(routeName: null, routeValues: routeValues, value: value)
     {
     }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CreatedAtRoute"/> class with the values
+    /// provided.
+    /// </summary>
+    /// <param name="routeName">The name of the route to use for generating the URL.</param>
+    /// <param name="routeValues">The route data to use for generating the URL.</param>
+    /// <param name="value">The value to format in the entity body.</param>
+    [RequiresUnreferencedCode(RouteValueDictionaryTrimmerWarning.Warning)]
+    internal CreatedAtRoute(string? routeName, object? routeValues, TValue? value)
+        : this(routeName, new RouteValueDictionary(routeValues), value)
+    {
+    }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="CreatedAtRoute"/> class with the values
     /// provided.
@@ -38,12 +54,12 @@ internal CreatedAtRoute(object? routeValues, TValue? value)
     /// <param name="value">The value to format in the entity body.</param>
     internal CreatedAtRoute(
         string? routeName,
-        object? routeValues,
+        RouteValueDictionary routeValues,
         TValue? value)
     {
         Value = value;
         RouteName = routeName;
-        RouteValues = new RouteValueDictionary(routeValues);
+        RouteValues = routeValues;
         HttpResultsHelper.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
     }
 

src/Http/Http.Results/src/HttpResultsHelper.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 System.Text;
 using System.Text.Json;
 using Microsoft.AspNetCore.Internal;
@@ -15,6 +16,9 @@ internal static partial class HttpResultsHelper
     internal const string DefaultContentType = "text/plain; charset=utf-8";
     private static readonly Encoding DefaultEncoding = Encoding.UTF8;
 
+    // Remove once https://github.com/dotnet/aspnetcore/pull/45886 is done.
+    [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "<Pending>")]
+    [UnconditionalSuppressMessage("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.", Justification = "<Pending>")]
     public static Task WriteResultAsJsonAsync<T>(
         HttpContext httpContext,
         ILogger logger,

src/Http/Http.Results/src/Microsoft.AspNetCore.Http.Results.csproj

@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore</PackageTags>
     <IsPackable>false</IsPackable>
-    <Nullable>enable</Nullable>
+    <IsTrimmable>true</IsTrimmable>
     <RootNamespace>Microsoft.AspNetCore.Http.Result</RootNamespace>
   </PropertyGroup>
 
@@ -19,6 +19,7 @@
     <Compile Include="$(SharedSourceRoot)ProblemDetails\ProblemDetailsDefaults.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)ApiExplorerTypes\*.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)RoutingMetadata\AcceptsMetadata.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)RouteValueDictionaryTrimmerWarning.cs" LinkBase="Shared" />
   </ItemGroup>
 
   <ItemGroup>