Merge branch 'trunk' into trunk

Author: RenderMichael

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() }
         };
 

dotnet/src/webdriver/SeleniumManager.cs

@@ -40,8 +40,6 @@ public static class SeleniumManager
     {
         private static readonly ILogger _logger = Log.GetLogger(typeof(SeleniumManager));
 
-        private static readonly JsonSerializerOptions _serializerOptions = new() { PropertyNameCaseInsensitive = true, TypeInfoResolver = SeleniumManagerSerializerContext.Default };
-
         private static readonly Lazy<string> _lazyBinaryFullPath = new(() =>
         {
             string? binaryFullPath = Environment.GetEnvironmentVariable("SE_MANAGER_PATH");
@@ -187,7 +185,7 @@ private static ResultResponse RunCommand(string fileName, string arguments)
 
             try
             {
-                jsonResponse = JsonSerializer.Deserialize<SeleniumManagerResponse>(output, _serializerOptions)!;
+                jsonResponse = JsonSerializer.Deserialize(output, SeleniumManagerSerializerContext.Default.SeleniumManagerResponse)!;
             }
             catch (Exception ex)
             {
@@ -210,11 +208,11 @@ private static ResultResponse RunCommand(string fileName, string arguments)
         }
     }
 
-    internal record SeleniumManagerResponse(IReadOnlyList<LogEntryResponse> Logs, ResultResponse Result)
+    internal sealed record SeleniumManagerResponse(IReadOnlyList<LogEntryResponse> Logs, ResultResponse Result)
     {
-        public record LogEntryResponse(string Level, string Message);
+        public sealed record LogEntryResponse(string Level, string Message);
 
-        public record ResultResponse
+        public sealed record ResultResponse
         (
             [property: JsonPropertyName("driver_path")]
             string DriverPath,
@@ -224,5 +222,6 @@ string BrowserPath
     }
 
     [JsonSerializable(typeof(SeleniumManagerResponse))]
-    internal partial class SeleniumManagerSerializerContext : JsonSerializerContext;
+    [JsonSourceGenerationOptions(PropertyNameCaseInsensitive = true)]
+    internal sealed partial class SeleniumManagerSerializerContext : JsonSerializerContext;
 }

dotnet/test/common/CommandTests.cs

@@ -0,0 +1,41 @@
+// <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;
+
+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}}"""));
+        }
+    }
+}