Win?

Author: nvborisenko

dotnet/src/webdriver/Command.cs

@@ -101,7 +101,7 @@ public string ParametersAsJsonString
                 string parametersString = string.Empty;
                 if (this.commandParameters != null && this.commandParameters.Count > 0)
                 {
-                    parametersString = JsonSerializer.Serialize(this.commandParameters);
+                    parametersString = JsonSerializer.Serialize(new SerializableCommand() { Data = this.commandParameters }, CommandSerializerContext.Default.SerializableCommand);
                 }
 
                 if (string.IsNullOrEmpty(parametersString))
@@ -133,4 +133,19 @@ private static Dictionary<string, object> ConvertParametersFromJson(string value
             return parameters;
         }
     }
+
+    internal class SerializableCommand
+    {
+        [JsonExtensionData]
+        public Dictionary<string, object> Data { get; set; }
+    }
+
+    [JsonSerializable(typeof(SerializableCommand))]
+
+    [JsonSerializable(typeof(IList<object>))]
+    [JsonSerializable(typeof(System.Collections.ObjectModel.ReadOnlyCollection<string>))]
+    internal partial class CommandSerializerContext : JsonSerializerContext
+    {
+
+    }
 }

dotnet/src/webdriver/Response.cs

@@ -21,6 +21,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium
 {
@@ -31,7 +32,8 @@ public class Response
     {
         private readonly static JsonSerializerOptions s_jsonSerializerOptions = new()
         {
-            Converters = { new ResponseValueJsonConverter() }
+            TypeInfoResolver = ResponseSerializerContext.Default,
+            Converters = { new ResponseValueJsonConverter() } // we still need it to make `Object` as `Dictionary`
         };
 
         private object responseValue;
@@ -208,4 +210,16 @@ public override string ToString()
             return string.Format(CultureInfo.InvariantCulture, "({0} {1}: {2})", this.SessionId, this.Status, this.Value);
         }
     }
+
+    internal class DeserializableResponse
+    {
+        [JsonExtensionData]
+        public Dictionary<string, object> Data { get; set; }
+    }
+
+    [JsonSerializable(typeof(DeserializableResponse))]
+    internal partial class ResponseSerializerContext : JsonSerializerContext
+    {
+
+    }
 }