Merge branch 'trunk' into rbe_eif

Author: aguspe

dotnet/src/webdriver/Chromium/ChromiumDriver.cs

@@ -361,6 +361,8 @@ public DevToolsSession GetDevToolsSession(int devToolsProtocolVersion)
         /// <summary>
         /// Closes a DevTools session.
         /// </summary>
+        [RequiresUnreferencedCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
+        [RequiresDynamicCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
         public void CloseDevToolsSession()
         {
             if (this.devToolsSession != null)

dotnet/src/webdriver/Command.cs

@@ -33,7 +33,11 @@ public class Command
     {
         private readonly static JsonSerializerOptions s_jsonSerializerOptions = new()
         {
-            TypeInfoResolver = JsonTypeInfoResolver.Combine(CommandJsonSerializerContext.Default, new DefaultJsonTypeInfoResolver()),
+            TypeInfoResolverChain =
+            {
+                CommandJsonSerializerContext.Default,
+                new DefaultJsonTypeInfoResolver()
+            },
             Converters = { new ResponseValueJsonConverter() }
         };
 
@@ -86,17 +90,14 @@ public string ParametersAsJsonString
         {
             get
             {
-                string parametersString;
                 if (this.Parameters != null && this.Parameters.Count > 0)
                 {
-                    parametersString = JsonSerializer.Serialize(this.Parameters, s_jsonSerializerOptions);
+                    return JsonSerializer.Serialize(this.Parameters, s_jsonSerializerOptions);
                 }
                 else
                 {
-                    parametersString = "{}";
+                    return "{}";
                 }
-
-                return parametersString;
             }
         }
 
@@ -118,7 +119,7 @@ public override string ToString()
         /// <exception cref="ArgumentNullException">If <paramref name="value"/> is <see langword="null"/>.</exception>
         private static Dictionary<string, object?>? ConvertParametersFromJson(string value)
         {
-            Dictionary<string, object?>? parameters = JsonSerializer.Deserialize<Dictionary<string, object?>>(value, s_jsonSerializerOptions);
+            Dictionary<string, object?>? parameters = JsonSerializer.Deserialize<Dictionary<string, object?>>(value, CommandJsonSerializerContext.Default.DictionaryStringObject!);
             return parameters;
         }
     }
@@ -167,5 +168,6 @@ public override string ToString()
     [JsonSerializable(typeof(Dictionary<string, short>))]
     [JsonSerializable(typeof(Dictionary<string, ushort>))]
     [JsonSerializable(typeof(Dictionary<string, string>))]
+    [JsonSourceGenerationOptions(Converters = [typeof(ResponseValueJsonConverter)])]
     internal partial class CommandJsonSerializerContext : JsonSerializerContext;
 }

dotnet/src/webdriver/Internal/FileUtilities.cs

@@ -168,9 +168,10 @@ public static string GetCurrentDirectory()
             string? location = null;
 
             // Make sure not to call Path.GetDirectoryName if assembly location is null or empty
-            if (!string.IsNullOrEmpty(executingAssembly.Location))
+            string assemblyLocation = executingAssembly.Location;
+            if (!string.IsNullOrEmpty(assemblyLocation))
             {
-                location = Path.GetDirectoryName(executingAssembly.Location);
+                location = Path.GetDirectoryName(assemblyLocation);
             }
 
             if (string.IsNullOrEmpty(location))