Merge in 'release/8.0' changes

dotnet-bot · dotnet-bot · commit f1661a62fa54 · 2023-10-26T21:34:48.000Z
diff --git a/src/Components/WebAssembly/WebAssembly/src/Services/DefaultWebAssemblyJSRuntime.cs b/src/Components/WebAssembly/WebAssembly/src/Services/DefaultWebAssemblyJSRuntime.cs
@@ -105,6 +105,7 @@ public static void UpdateRootComponentsCore(string operationsJson)
     }
 
     [DynamicDependency(JsonSerialized, typeof(RootComponentOperation))]
+    [DynamicDependency(JsonSerialized, typeof(RootComponentOperationBatch))]
     [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "The correct members will be preserved by the above DynamicDependency")]
     internal static RootComponentOperationBatch DeserializeOperations(string operationsJson)
     {

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ public static void UpdateRootComponentsCore(string operationsJson)`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`[DynamicDependency(JsonSerialized, typeof(RootComponentOperation))]`
	`108`	`+ [DynamicDependency(JsonSerialized, typeof(RootComponentOperationBatch))]`
`108`	`109`	`[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "The correct members will be preserved by the above DynamicDependency")]`
`109`	`110`	`internal static RootComponentOperationBatch DeserializeOperations(string operationsJson)`
`110`	`111`	`{`