Changing reflection-based json configuration

src/Http/Http.Abstractions/test/HttpValidationProblemDetailsJsonConverterTest.cs

@@ -3,13 +3,17 @@
 
 using System.Text;
 using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
 using Microsoft.AspNetCore.Http.Json;
 
 namespace Microsoft.AspNetCore.Http.Abstractions.Tests;
 
 public class HttpValidationProblemDetailsJsonConverterTest
 {
-    private static JsonSerializerOptions JsonSerializerOptions => new JsonOptions().SerializerOptions;
+    private static JsonSerializerOptions JsonSerializerOptions => new JsonSerializerOptions(new JsonOptions().SerializerOptions)
+    {
+        TypeInfoResolver = new DefaultJsonTypeInfoResolver()
+    };
 
     [Fact]
     public void Write_Works()

src/Http/Http.Abstractions/test/ProblemDetailsJsonConverterTest.cs

@@ -4,14 +4,18 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Nodes;
+using System.Text.Json.Serialization.Metadata;
 using Microsoft.AspNetCore.Http.Json;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Microsoft.AspNetCore.Http.Abstractions.Tests;
 
 public class ProblemDetailsJsonConverterTest
 {
-    private static JsonSerializerOptions JsonSerializerOptions => new JsonOptions().SerializerOptions;
+    private static JsonSerializerOptions JsonSerializerOptions => new JsonSerializerOptions(new JsonOptions().SerializerOptions)
+    {
+        TypeInfoResolver = new DefaultJsonTypeInfoResolver()
+    };
 
     [Fact]
     public void Read_ThrowsIfJsonIsIncomplete()

src/Http/Http.Extensions/src/HttpRequestJsonExtensions.cs

@@ -39,7 +39,7 @@ public static class HttpRequestJsonExtensions
         ArgumentNullException.ThrowIfNull(request);
 
         var options = ResolveSerializerOptions(request.HttpContext);
-        return request.ReadFromJsonAsync(jsonTypeInfo: (JsonTypeInfo<TValue>)options.GetTypeInfo(typeof(TValue)), cancellationToken);
+        return request.ReadFromJsonAsync(jsonTypeInfo: (JsonTypeInfo<TValue>)options.GetReadOnlyTypeInfo(typeof(TValue)), cancellationToken);
     }
 
     /// <summary>
@@ -175,7 +175,7 @@ public static class HttpRequestJsonExtensions
         ArgumentNullException.ThrowIfNull(request);
 
         var options = ResolveSerializerOptions(request.HttpContext);
-        return request.ReadFromJsonAsync(jsonTypeInfo: options.GetTypeInfo(type), cancellationToken);
+        return request.ReadFromJsonAsync(jsonTypeInfo: options.GetReadOnlyTypeInfo(type), cancellationToken);
     }
 
     /// <summary>

src/Http/Http.Extensions/src/HttpResponseJsonExtensions.cs

@@ -38,7 +38,7 @@ public static Task WriteAsJsonAsync<TValue>(
         ArgumentNullException.ThrowIfNull(response);
 
         var options = ResolveSerializerOptions(response.HttpContext);
-        return response.WriteAsJsonAsync(value, jsonTypeInfo: (JsonTypeInfo<TValue>)options.GetTypeInfo(typeof(TValue)), contentType: null, cancellationToken);
+        return response.WriteAsJsonAsync(value, jsonTypeInfo: (JsonTypeInfo<TValue>)options.GetReadOnlyTypeInfo(typeof(TValue)), contentType: null, cancellationToken);
     }
 
     /// <summary>
@@ -213,7 +213,7 @@ public static Task WriteAsJsonAsync(
         ArgumentNullException.ThrowIfNull(response);
 
         var options = ResolveSerializerOptions(response.HttpContext);
-        return response.WriteAsJsonAsync(value, jsonTypeInfo: options.GetTypeInfo(type), contentType: null, cancellationToken);
+        return response.WriteAsJsonAsync(value, jsonTypeInfo: options.GetReadOnlyTypeInfo(type), contentType: null, cancellationToken);
     }
 
     /// <summary>

src/Http/Http.Extensions/src/JsonOptions.cs

@@ -3,8 +3,6 @@
 
 using System.Text.Encodings.Web;
 using System.Text.Json;
-using System.Text.Json.Serialization.Metadata;
-using Microsoft.AspNetCore.Internal;
 
 #nullable enable
 
@@ -23,23 +21,11 @@ public class JsonOptions
         // Because these options are for producing content that is written directly to the request
         // (and not embedded in an HTML page for example), we can use UnsafeRelaxedJsonEscaping.
         Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-
-        // The JsonSerializerOptions.GetTypeInfo method is called directly and needs a defined resolver
-        // setting the default resolver (reflection-based) but the user can overwrite it directly or calling
-        // .AddContext<TContext>()
-        TypeInfoResolver = TrimmingAppContextSwitches.EnsureJsonTrimmability ? null : CreateDefaultTypeResolver()
     };
 
     // Use a copy so the defaults are not modified.
     /// <summary>
     /// Gets the <see cref="JsonSerializerOptions"/>.
     /// </summary>
     public JsonSerializerOptions SerializerOptions { get; internal set; } = new JsonSerializerOptions(DefaultSerializerOptions);
-
-#pragma warning disable IL2026 // Suppressed in Microsoft.AspNetCore.Http.Extensions.WarningSuppressions.xml
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
-    private static IJsonTypeInfoResolver CreateDefaultTypeResolver()
-        => new DefaultJsonTypeInfoResolver();
-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
-#pragma warning restore IL2026 // Suppressed in Microsoft.AspNetCore.Http.Extensions.WarningSuppressions.xml
 }

src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.WarningSuppressions.xml

@@ -5,8 +5,8 @@
       <argument>ILLink</argument>
       <argument>IL2026</argument>
       <property name="Scope">member</property>
-      <property name="Target">M:Microsoft.AspNetCore.Http.Json.JsonOptions.CreateDefaultTypeResolver</property>
-      <property name="Justification">This warning is left in the product so developers get an ILLink warning when trimming an app, in future, only when Microsoft.AspNetCore.EnsureJsonTrimmability=false.</property>
+      <property name="Target">M:Microsoft.AspNetCore.Http.JsonSerializerExtensions.EnsureConfigured(System.Text.Json.JsonSerializerOptions)</property>
+      <property name="Justification">This warning is left in the product so developers get an ILLink warning when trimming an app only when Microsoft.AspNetCore.EnsureJsonTrimmability=false.</property>
     </attribute>
   </assembly>
 </linker>

src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj

@@ -25,7 +25,7 @@
     <Compile Include="$(SharedSourceRoot)Json\JsonSerializerExtensions.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)TrimmingAppContextSwitches.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)RouteHandlers\ExecuteHandlerHelper.cs" LinkBase="Shared"/>
-  </ItemGroup>  
+  </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="Properties\ILLink.Substitutions.xml" LogicalName="ILLink.Substitutions.xml" />

src/Http/Http.Extensions/src/ProblemDetailsJsonOptionsSetup.cs

@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-
 using System.Text.Json.Serialization.Metadata;
 using Microsoft.AspNetCore.Http.Json;
 using Microsoft.Extensions.Options;
@@ -11,15 +10,18 @@ internal sealed class ProblemDetailsJsonOptionsSetup : IPostConfigureOptions<Jso
 {
     public void PostConfigure(string? name, JsonOptions options)
     {
-        if (options.SerializerOptions.TypeInfoResolver is not null)
+        switch (options.SerializerOptions.TypeInfoResolver)
         {
-            if (options.SerializerOptions.IsReadOnly)
-            {
-                options.SerializerOptions = new(options.SerializerOptions);
-            }
-
-            // Combine the current resolver with our internal problem details context
-            options.SerializerOptions.TypeInfoResolver = JsonTypeInfoResolver.Combine(options.SerializerOptions.TypeInfoResolver!, ProblemDetailsJsonContext.Default);
+            case DefaultJsonTypeInfoResolver:
+                // Prepend our internal problem details context
+                options.SerializerOptions.TypeInfoResolver = JsonTypeInfoResolver.Combine(ProblemDetailsJsonContext.Default, options.SerializerOptions.TypeInfoResolver);
+                break;
+            case not null:
+                // Combine the current resolver with our internal problem details context
+                options.SerializerOptions.AddContext<ProblemDetailsJsonContext>();
+                break;
+            default:
+                break;
         }
     }
 }

src/Http/Http.Extensions/src/PublicAPI.Unshipped.txt

@@ -1,3 +1,3 @@
 #nullable enable
 static Microsoft.AspNetCore.Http.HttpRequestJsonExtensions.ReadFromJsonAsync(this Microsoft.AspNetCore.Http.HttpRequest! request, System.Text.Json.Serialization.Metadata.JsonTypeInfo! jsonTypeInfo, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask<object?>
-static Microsoft.AspNetCore.Http.HttpResponseJsonExtensions.WriteAsJsonAsync(this Microsoft.AspNetCore.Http.HttpResponse! response, object? value, System.Text.Json.Serialization.Metadata.JsonTypeInfo! jsonTypeInfo, string? contentType = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+static Microsoft.AspNetCore.Http.HttpResponseJsonExtensions.WriteAsJsonAsync(this Microsoft.AspNetCore.Http.HttpResponse! response, object? value, System.Text.Json.Serialization.Metadata.JsonTypeInfo! jsonTypeInfo, string? contentType = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!

src/Http/Http.Extensions/test/HttpRequestJsonExtensionsTests.cs

@@ -4,6 +4,7 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
+using Microsoft.Extensions.DependencyInjection;
 
 #nullable enable
 

src/Http/Http.Extensions/test/HttpResponseJsonExtensionsTests.cs

@@ -6,7 +6,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
-using Microsoft.AspNetCore.Testing;
 
 #nullable enable
 

src/Http/Http.Extensions/test/JsonSerializerExtensionsTests.cs

@@ -0,0 +1,102 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.DotNet.RemoteExecutor;
+
+namespace Microsoft.AspNetCore.Http.Extensions.Tests;
+
+public partial class JsonSerializerExtensionsTests
+{
+    [ConditionalFact]
+    [RemoteExecutionSupported]
+    public void Configure_ThrowsForNullTypeInfoResolver_WhenEnsureJsonTrimmabilityTrue()
+    {
+        var options = new RemoteInvokeOptions();
+        options.RuntimeConfigurationOptions.Add("Microsoft.AspNetCore.EnsureJsonTrimmability", true.ToString());
+
+        using var remoteHandle = RemoteExecutor.Invoke(static () =>
+        {
+            // Arrange
+            var options = new JsonSerializerOptions();
+
+            // Act & Assert
+            Assert.Throws<InvalidOperationException>(() => JsonSerializerExtensions.EnsureConfigured(options));
+        }, options);
+    }
+
+    [ConditionalFact]
+    [RemoteExecutionSupported]
+    public void Configure_Works_WhenEnsureJsonTrimmabilityTrue()
+    {
+        var options = new RemoteInvokeOptions();
+        options.RuntimeConfigurationOptions.Add("Microsoft.AspNetCore.EnsureJsonTrimmability", true.ToString());
+
+        using var remoteHandle = RemoteExecutor.Invoke(static () =>
+        {
+            // Arrange
+            var options = new JsonSerializerOptions() { TypeInfoResolver = JsonSerializerExtensionsTestsContext.Default };
+
+            // Act
+            JsonSerializerExtensions.EnsureConfigured(options);
+
+            // Assert
+            Assert.NotNull(options.TypeInfoResolver);
+            Assert.IsType<JsonSerializerExtensionsTestsContext>(options.TypeInfoResolver);
+            Assert.True(options.IsReadOnly);
+        }, options);
+    }
+
+    [ConditionalFact]
+    [RemoteExecutionSupported]
+    public void DefaultSerializerOptions_Works_WhenEnsureJsonTrimmabilityFalse()
+    {
+        var options = new RemoteInvokeOptions();
+        options.RuntimeConfigurationOptions.Add("Microsoft.AspNetCore.EnsureJsonTrimmability", false.ToString());
+
+        using var remoteHandle = RemoteExecutor.Invoke(static () =>
+        {
+            // Arrange
+            var options = new JsonSerializerOptions();
+
+            // Act
+            JsonSerializerExtensions.EnsureConfigured(options);
+
+            // Assert
+            Assert.NotNull(options.TypeInfoResolver);
+            Assert.IsType<DefaultJsonTypeInfoResolver>(options.TypeInfoResolver);
+            Assert.True(options.IsReadOnly);
+        }, options);
+    }
+
+    [ConditionalFact]
+    [RemoteExecutionSupported]
+    public void DefaultSerializerOptions_Combines_WhenEnsureJsonTrimmabilityFalse()
+    {
+        var options = new RemoteInvokeOptions();
+        options.RuntimeConfigurationOptions.Add("Microsoft.AspNetCore.EnsureJsonTrimmability", false.ToString());
+
+        using var remoteHandle = RemoteExecutor.Invoke(static () =>
+        {
+            // Arrange
+            var options = new JsonSerializerOptions() { TypeInfoResolver = JsonSerializerExtensionsTestsContext.Default };
+
+            // Act
+            JsonSerializerExtensions.EnsureConfigured(options);
+
+            // Assert
+            Assert.NotNull(options.TypeInfoResolver);
+            Assert.IsNotType<DefaultJsonTypeInfoResolver>(options.TypeInfoResolver);
+            Assert.IsNotType<JsonSerializerExtensionsTestsContext>(options.TypeInfoResolver);
+            Assert.NotNull(options.TypeInfoResolver.GetTypeInfo(typeof(string), options));
+            Assert.True(options.IsReadOnly);
+        }, options);
+    }
+
+    [JsonSerializable(typeof(object))]
+    private partial class JsonSerializerExtensionsTestsContext : JsonSerializerContext
+    { }
+}

src/Http/Http.Extensions/test/ProblemDetailsDefaultWriterTest.cs

@@ -558,7 +558,12 @@ private static IServiceProvider CreateServices()
     private static DefaultProblemDetailsWriter GetWriter(ProblemDetailsOptions options = null, JsonOptions jsonOptions = null)
     {
         options ??= new ProblemDetailsOptions();
-        jsonOptions ??= new JsonOptions();
+
+        if (jsonOptions is null)
+        {
+            jsonOptions = new JsonOptions();
+            jsonOptions.SerializerOptions.TypeInfoResolver = new DefaultJsonTypeInfoResolver();
+        }
 
         return new DefaultProblemDetailsWriter(Options.Create(options), Options.Create(jsonOptions));
     }