PR feedback

Author: pranavkm

src/Components/Server/src/Circuits/CircuitHost.cs

@@ -402,7 +402,11 @@ public async Task DispatchEvent(string eventDescriptorJson, string eventArgsJson
             {
                 // JsonSerializerOptions are tightly bound to the JsonContext. Cache it on first use using a copy
                 // of the serializer settings.
-                _jsonContext ??= new(new JsonSerializerOptions(JSRuntime.ReadJsonSerializerOptions()));
+                if (_jsonContext is null)
+                {
+                    _jsonContext = new(new JsonSerializerOptions(JSRuntime.ReadJsonSerializerOptions()));
+                }
+
                 webEventData = WebEventData.Parse(Renderer, _jsonContext, eventDescriptorJson, eventArgsJson);
             }
             catch (Exception ex)

src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj

@@ -23,10 +23,9 @@
     <Reference Include="Microsoft.Extensions.FileProviders.Composite" />
     <Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
     <Reference Include="Microsoft.Extensions.Logging" />
-
     <!-- Required for S.T.J source generation -->
     <Reference Include="System.Text.Json" PrivateAssets="All" />
-
+    
     <Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />
     <Compile Include="$(SharedSourceRoot)LinkerFlags.cs" LinkBase="Shared" />
 

src/Components/Shared/src/WebEventJsonContext.cs

@@ -16,7 +16,6 @@
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
     <Reference Include="Microsoft.JSInterop" />
     <Reference Include="System.IO.Pipelines" />
-    <Reference Include="System.Text.Json" PrivateAssets="All" />
     <Compile Include="$(SharedSourceRoot)LinkerFlags.cs" LinkBase="Shared" />
   </ItemGroup>
 

src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj

@@ -41,7 +41,10 @@ public static Task DispatchEvent(WebEventDescriptor eventDescriptor, string even
 
             // JsonSerializerOptions are tightly bound to the JsonContext. Cache it on first use using a copy
             // of the serializer settings.
-            _jsonContext ??= new(new JsonSerializerOptions(jsonSerializerOptions));
+            if (_jsonContext is null)
+            {
+                _jsonContext = new(new JsonSerializerOptions(jsonSerializerOptions));
+            }
 
             var webEvent = WebEventData.Parse(renderer, _jsonContext, eventDescriptor, eventArgsJson);
             return renderer.DispatchEventAsync(

src/Components/WebAssembly/WebAssembly/src/Infrastructure/JSInteropMethods.cs

@@ -93,7 +93,11 @@ private Task DispatchBrowserEventAsync(PageContext pageContext, string eventDesc
             var jsonSerializerOptions = pageContext.JSRuntime.ReadJsonSerializerOptions();
             // JsonSerializerOptions are tightly bound to the JsonContext. Cache it on first use using a copy
             // of the serializer settings.
-            _jsonContext ??= new(new JsonSerializerOptions(jsonSerializerOptions));
+            if (_jsonContext is null)
+            {
+                _jsonContext = new(new JsonSerializerOptions(jsonSerializerOptions));
+            }
+
             var webEventData = WebEventData.Parse(renderer, _jsonContext, eventDescriptor, eventArgs);
             return renderer.DispatchEventAsync(
                 webEventData.EventHandlerId,