From 702f846f33e9d0b0338a97e7f47939b53c6dd911 Mon Sep 17 00:00:00 2001
From: Michael Render <render.michael@gmail.com>
Date: Fri, 8 Nov 2024 15:04:00 -0500
Subject: [PATCH 1/2] [dotnet] Add reflection-based JSON serialization fallback
 to `Command`s

Fixes #14731
---
 dotnet/src/webdriver/Command.cs    |  3 ++-
 dotnet/test/common/CommandTests.cs | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 dotnet/test/common/CommandTests.cs

diff --git a/dotnet/src/webdriver/Command.cs b/dotnet/src/webdriver/Command.cs
index 38abb85480a3e..9cb96055cc952 100644
--- a/dotnet/src/webdriver/Command.cs
+++ b/dotnet/src/webdriver/Command.cs
@@ -21,6 +21,7 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
 
 namespace OpenQA.Selenium
 {
@@ -35,7 +36,7 @@ public class Command
 
         private readonly static JsonSerializerOptions s_jsonSerializerOptions = new()
         {
-            TypeInfoResolver = CommandJsonSerializerContext.Default,
+            TypeInfoResolver = JsonTypeInfoResolver.Combine(CommandJsonSerializerContext.Default, new DefaultJsonTypeInfoResolver()),
             Converters = { new ResponseValueJsonConverter() }
         };
 
diff --git a/dotnet/test/common/CommandTests.cs b/dotnet/test/common/CommandTests.cs
new file mode 100644
index 0000000000000..5e657ac4170c8
--- /dev/null
+++ b/dotnet/test/common/CommandTests.cs
@@ -0,0 +1,22 @@
+using NUnit.Framework;
+using System.Collections.Generic;
+
+namespace OpenQA.Selenium
+{
+    [TestFixture]
+    public class CommandTests
+    {
+        [Test]
+        public void CommandSerializesAnonymousType()
+        {
+            var parameters = new Dictionary<string, object>
+            {
+                ["arg"] = new { param1 = true, param2 = false },
+            };
+
+            var command = new Command(new SessionId("session"), "test command", parameters);
+
+            Assert.That(command.ParametersAsJsonString, Is.EqualTo("""{"arg":{"param1":true,"param2":false}}"""));
+        }
+    }
+}

From ad61f97ec012f8ee6701f8b44ca8efd5c222e637 Mon Sep 17 00:00:00 2001
From: Michael Render <render.michael@gmail.com>
Date: Fri, 8 Nov 2024 17:29:24 -0500
Subject: [PATCH 2/2] add file header

---
 dotnet/test/common/CommandTests.cs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/dotnet/test/common/CommandTests.cs b/dotnet/test/common/CommandTests.cs
index 5e657ac4170c8..f0480c034efd3 100644
--- a/dotnet/test/common/CommandTests.cs
+++ b/dotnet/test/common/CommandTests.cs
@@ -1,3 +1,22 @@
+// <copyright file="CommandTests.cs" company="Selenium Committers">
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+// </copyright>
+
 using NUnit.Framework;
 using System.Collections.Generic;