More PR feedback

Author: MackinnonBuck

src/Components/Server/src/Circuits/RemoteJSRuntime.cs

@@ -48,7 +48,7 @@ public RemoteJSRuntime(
         DefaultAsyncTimeout = _options.JSInteropDefaultCallTimeout;
         ElementReferenceContext = new WebElementReferenceContext(this);
         JsonSerializerOptions.Converters.Add(new ElementReferenceJsonConverter(ElementReferenceContext));
-        JsonSerializerOptions.MakeReadOnly();
+        JsonSerializerOptions.MakeReadOnly(populateMissingResolver: JsonSerializer.IsReflectionEnabledByDefault);
     }
 
     internal void Initialize(CircuitClientProxy clientProxy)

src/Components/Web/src/WebRenderer.cs

@@ -44,8 +44,9 @@ public WebRenderer(
 
         var jsRuntime = serviceProvider.GetRequiredService<IJSRuntime>();
         var jsRuntimeJsonSerializerOptions = new JsonSerializerOptions(jsRuntime.JsonSerializerOptions);
-        jsRuntimeJsonSerializerOptions.TypeInfoResolverChain.Insert(0, JsonConverterFactoryTypeInfoResolver<DotNetObjectReference<WebRendererInteropMethods>>.Instance);
-        jsRuntimeJsonSerializerOptions.TypeInfoResolverChain.Insert(0, WebRendererSerializerContext.Default);
+        jsRuntimeJsonSerializerOptions.TypeInfoResolverChain.Clear();
+        jsRuntimeJsonSerializerOptions.TypeInfoResolverChain.Add(WebRendererSerializerContext.Default);
+        jsRuntimeJsonSerializerOptions.TypeInfoResolverChain.Add(JsonConverterFactoryTypeInfoResolver<DotNetObjectReference<WebRendererInteropMethods>>.Instance);
 
         jsRuntime.InvokeVoidAsync(
             "Blazor._internal.attachWebRendererInterop",

src/Components/WebAssembly/WebAssembly.Authentication/test/WebAssemblyAuthenticationServiceCollectionExtensionsTests.cs

@@ -12,12 +12,10 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 
 public class WebAssemblyAuthenticationServiceCollectionExtensionsTests
 {
-    private static readonly JsonSerializerOptions JsonOptions = new();
-
     [Fact]
     public void CanResolve_AccessTokenProvider()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         builder.Services.AddApiAuthorization();
         var host = builder.Build();
 
@@ -27,7 +25,7 @@ public void CanResolve_AccessTokenProvider()
     [Fact]
     public void CanResolve_IRemoteAuthenticationService()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         builder.Services.AddApiAuthorization();
         var host = builder.Build();
 
@@ -37,7 +35,7 @@ public void CanResolve_IRemoteAuthenticationService()
     [Fact]
     public void ApiAuthorizationOptions_ConfigurationDefaultsGetApplied()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         builder.Services.AddApiAuthorization();
         var host = builder.Build();
 
@@ -71,7 +69,7 @@ public void ApiAuthorizationOptions_ConfigurationDefaultsGetApplied()
     [Fact]
     public void ApiAuthorizationOptionsConfigurationCallback_GetsCalledOnce()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         var calls = 0;
         builder.Services.AddApiAuthorization(options =>
         {
@@ -98,7 +96,7 @@ public void ApiAuthorizationOptionsConfigurationCallback_GetsCalledOnce()
     [Fact]
     public void ApiAuthorizationTestAuthenticationState_SetsUpConfiguration()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         var calls = 0;
         builder.Services.AddApiAuthorization<TestAuthenticationState>(options => calls++);
 
@@ -124,7 +122,7 @@ public void ApiAuthorizationTestAuthenticationState_SetsUpConfiguration()
     [Fact]
     public void ApiAuthorizationTestAuthenticationState_NoCallback_SetsUpConfiguration()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         builder.Services.AddApiAuthorization<TestAuthenticationState>();
 
         var host = builder.Build();
@@ -147,7 +145,7 @@ public void ApiAuthorizationTestAuthenticationState_NoCallback_SetsUpConfigurati
     [Fact]
     public void ApiAuthorizationCustomAuthenticationStateAndAccount_SetsUpConfiguration()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         var calls = 0;
         builder.Services.AddApiAuthorization<TestAuthenticationState, TestAccount>(options => calls++);
 
@@ -173,7 +171,7 @@ public void ApiAuthorizationCustomAuthenticationStateAndAccount_SetsUpConfigurat
     [Fact]
     public void ApiAuthorizationTestAuthenticationStateAndAccount_NoCallback_SetsUpConfiguration()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         builder.Services.AddApiAuthorization<TestAuthenticationState, TestAccount>();
 
         var host = builder.Build();
@@ -196,7 +194,7 @@ public void ApiAuthorizationTestAuthenticationStateAndAccount_NoCallback_SetsUpC
     [Fact]
     public void ApiAuthorizationOptions_DefaultsCanBeOverriden()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         builder.Services.AddApiAuthorization(options =>
         {
             options.AuthenticationPaths.LogInPath = "a";
@@ -247,7 +245,7 @@ public void ApiAuthorizationOptions_DefaultsCanBeOverriden()
     [Fact]
     public void OidcOptions_ConfigurationDefaultsGetApplied()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         builder.Services.Replace(ServiceDescriptor.Singleton<NavigationManager, TestNavigationManager>());
         builder.Services.AddOidcAuthentication(options => { });
         var host = builder.Build();
@@ -286,7 +284,7 @@ public void OidcOptions_ConfigurationDefaultsGetApplied()
     [Fact]
     public void OidcOptions_DefaultsCanBeOverriden()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         builder.Services.AddOidcAuthentication(options =>
         {
             options.AuthenticationPaths.LogInPath = "a";
@@ -348,7 +346,7 @@ public void OidcOptions_DefaultsCanBeOverriden()
     [Fact]
     public void AddOidc_ConfigurationGetsCalledOnce()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         var calls = 0;
 
         builder.Services.AddOidcAuthentication(options => calls++);
@@ -365,7 +363,7 @@ public void AddOidc_ConfigurationGetsCalledOnce()
     [Fact]
     public void AddOidc_CustomState_SetsUpConfiguration()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         var calls = 0;
 
         builder.Services.AddOidcAuthentication<TestAuthenticationState>(options => options.ProviderOptions.Authority = (++calls).ToString(CultureInfo.InvariantCulture));
@@ -387,7 +385,7 @@ public void AddOidc_CustomState_SetsUpConfiguration()
     [Fact]
     public void AddOidc_CustomStateAndAccount_SetsUpConfiguration()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
         var calls = 0;
 
         builder.Services.AddOidcAuthentication<TestAuthenticationState, TestAccount>(options => options.ProviderOptions.Authority = (++calls).ToString(CultureInfo.InvariantCulture));
@@ -409,7 +407,7 @@ public void AddOidc_CustomStateAndAccount_SetsUpConfiguration()
     [Fact]
     public void OidcProviderOptionsAndDependencies_NotResolvedFromRootScope()
     {
-        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(), JsonOptions);
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
 
         var calls = 0;
 

src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHostBuilder.cs

@@ -4,7 +4,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Reflection;
-using System.Text.Json;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Infrastructure;
 using Microsoft.AspNetCore.Components.RenderTree;
@@ -27,7 +26,6 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 /// </summary>
 public sealed class WebAssemblyHostBuilder
 {
-    private readonly JsonSerializerOptions _jsonOptions;
     private readonly IInternalJSImportMethods _jsMethods;
     private Func<IServiceProvider> _createServiceProvider;
     private RootComponentTypeCache? _rootComponentCache;
@@ -49,9 +47,7 @@ public static WebAssemblyHostBuilder CreateDefault(string[]? args = default)
     {
         // We don't use the args for anything right now, but we want to accept them
         // here so that it shows up this way in the project templates.
-        var builder = new WebAssemblyHostBuilder(
-            InternalJSImportMethods.Instance,
-            DefaultWebAssemblyJSRuntime.Instance.ReadJsonSerializerOptions());
+        var builder = new WebAssemblyHostBuilder(InternalJSImportMethods.Instance);
 
         WebAssemblyCultureProvider.Initialize();
 
@@ -65,14 +61,11 @@ public static WebAssemblyHostBuilder CreateDefault(string[]? args = default)
     /// <summary>
     /// Creates an instance of <see cref="WebAssemblyHostBuilder"/> with the minimal configuration.
     /// </summary>
-    internal WebAssemblyHostBuilder(
-        IInternalJSImportMethods jsMethods,
-        JsonSerializerOptions jsonOptions)
+    internal WebAssemblyHostBuilder(IInternalJSImportMethods jsMethods)
     {
         // Private right now because we don't have much reason to expose it. This can be exposed
         // in the future if we want to give people a choice between CreateDefault and something
         // less opinionated.
-        _jsonOptions = jsonOptions;
         _jsMethods = jsMethods;
         Configuration = new WebAssemblyHostConfiguration();
         RootComponents = new RootComponentMappingCollection();

src/Components/WebAssembly/WebAssembly/src/Infrastructure/WebAssemblyJsonSerializerContext.cs

@@ -0,0 +1,21 @@
+// 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;
+
+namespace Microsoft.AspNetCore.Components.WebAssembly.Infrastructure;
+
+[JsonSourceGenerationOptions(
+    PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
+    PropertyNameCaseInsensitive = true,
+    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+
+// Required for WebAssemblyComponentParameterDeserializer
+[JsonSerializable(typeof(ComponentParameter[]))]
+[JsonSerializable(typeof(JsonElement))]
+[JsonSerializable(typeof(IList<object>))]
+
+// Required for DefaultWebAssemblyJSRuntime
+[JsonSerializable(typeof(RootComponentOperationBatch))]
+internal sealed partial class WebAssemblyJsonSerializerContext : JsonSerializerContext;

src/Components/WebAssembly/WebAssembly/src/Prerendering/WebAssemblyComponentParameterDeserializer.cs

@@ -3,18 +3,13 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
-using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Components.WebAssembly.Infrastructure;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
 namespace Microsoft.AspNetCore.Components;
 
 internal sealed class WebAssemblyComponentParameterDeserializer
 {
-    private static readonly JsonSerializerOptions _jsonSerializerOptions = new(WebAssemblyComponentSerializationSettings.JsonSerializationOptions)
-    {
-        TypeInfoResolver = WebAssemblyComponentParameterDeserializerSerializerContext.Default,
-    };
-
     private readonly ComponentParametersTypeCache _parametersCache;
 
     public WebAssemblyComponentParameterDeserializer(
@@ -65,7 +60,7 @@ public ParameterView DeserializeParameters(IList<ComponentParameter> parametersD
                     var parameterValue = JsonSerializer.Deserialize(
                         value.GetRawText(),
                         parameterType,
-                        WebAssemblyComponentSerializationSettings.JsonSerializationOptions);
+                        WebAssemblyJsonSerializerContext.Default);
 
                     parametersDictionary[definition.Name] = parameterValue;
                 }
@@ -83,17 +78,12 @@ public ParameterView DeserializeParameters(IList<ComponentParameter> parametersD
     [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "The correct members will be preserved by the above DynamicDependency.")]
     public static ComponentParameter[] GetParameterDefinitions(string parametersDefinitions)
     {
-        return JsonSerializer.Deserialize<ComponentParameter[]>(parametersDefinitions, _jsonSerializerOptions)!;
+        return JsonSerializer.Deserialize(parametersDefinitions, WebAssemblyJsonSerializerContext.Default.ComponentParameterArray)!;
     }
 
     [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "We expect application code is configured to preserve component parameter types.")]
     public static IList<object> GetParameterValues(string parameterValues)
     {
-        return JsonSerializer.Deserialize<IList<object>>(parameterValues, _jsonSerializerOptions)!;
+        return JsonSerializer.Deserialize(parameterValues, WebAssemblyJsonSerializerContext.Default.IListObject)!;
     }
 }
-
-[JsonSerializable(typeof(ComponentParameter[]))]
-[JsonSerializable(typeof(JsonElement))]
-[JsonSerializable(typeof(IList<object>))]
-internal sealed partial class WebAssemblyComponentParameterDeserializerSerializerContext : JsonSerializerContext;

src/Components/WebAssembly/WebAssembly/src/Services/DefaultWebAssemblyJSRuntime.cs

@@ -6,8 +6,8 @@
 using System.Runtime.InteropServices.JavaScript;
 using System.Runtime.Versioning;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.AspNetCore.Components.WebAssembly.Infrastructure;
 using Microsoft.JSInterop;
 using Microsoft.JSInterop.Infrastructure;
 using Microsoft.JSInterop.WebAssembly;
@@ -17,11 +17,6 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Services;
 
 internal sealed partial class DefaultWebAssemblyJSRuntime : WebAssemblyJSRuntime
 {
-    private static readonly JsonSerializerOptions _rootComponentSerializerOptions = new(WebAssemblyComponentSerializationSettings.JsonSerializationOptions)
-    {
-        TypeInfoResolver = DefaultWebAssemblyJSRuntimeJsonSerializerContext.Default,
-    };
-
     public static readonly DefaultWebAssemblyJSRuntime Instance = new();
 
     private readonly RootComponentTypeCache _rootComponentCache = new();
@@ -35,11 +30,12 @@ internal sealed partial class DefaultWebAssemblyJSRuntime : WebAssemblyJSRuntime
     [DynamicDependency(nameof(BeginInvokeDotNet))]
     [DynamicDependency(nameof(ReceiveByteArrayFromJS))]
     [DynamicDependency(nameof(UpdateRootComponentsCore))]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = $"The call to {nameof(JsonSerializerOptions.MakeReadOnly)} only populates the missing resolver when reflection is enabled")]
     private DefaultWebAssemblyJSRuntime()
     {
         ElementReferenceContext = new WebElementReferenceContext(this);
         JsonSerializerOptions.Converters.Add(new ElementReferenceJsonConverter(ElementReferenceContext));
-        JsonSerializerOptions.MakeReadOnly();
+        JsonSerializerOptions.MakeReadOnly(populateMissingResolver: JsonSerializer.IsReflectionEnabledByDefault);
     }
 
     [JSExport]
@@ -116,9 +112,9 @@ public static void UpdateRootComponentsCore(string operationsJson)
     [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "The correct members will be preserved by the above DynamicDependency")]
     internal static RootComponentOperationBatch DeserializeOperations(string operationsJson)
     {
-        var deserialized = JsonSerializer.Deserialize<RootComponentOperationBatch>(
+        var deserialized = JsonSerializer.Deserialize(
             operationsJson,
-            _rootComponentSerializerOptions)!;
+            WebAssemblyJsonSerializerContext.Default.RootComponentOperationBatch)!;
 
         for (var i = 0; i < deserialized.Operations.Length; i++)
         {
@@ -169,6 +165,3 @@ protected override Task TransmitStreamAsync(long streamId, DotNetStreamReference
         return TransmitDataStreamToJS.TransmitStreamAsync(this, "Blazor._internal.receiveWebAssemblyDotNetDataStream", streamId, dotNetStreamReference);
     }
 }
-
-[JsonSerializable(typeof(RootComponentOperationBatch))]
-internal sealed partial class DefaultWebAssemblyJSRuntimeJsonSerializerContext : JsonSerializerContext;