Merge branch 'trunk' into trunk

Author: AdamPDotty

MODULE.bazel

@@ -180,7 +180,7 @@ maven.install(
         "com.google.googlejavaformat:google-java-format:jar:1.24.0",
         "com.graphql-java:graphql-java:22.3",
         "dev.failsafe:failsafe:3.3.2",
-        "io.grpc:grpc-context:1.68.0",
+        "io.grpc:grpc-context:1.68.1",
         "io.lettuce:lettuce-core:6.4.0.RELEASE",
         "io.netty:netty-buffer:4.1.114.Final",
         "io.netty:netty-codec-http:4.1.114.Final",
@@ -199,9 +199,8 @@ maven.install(
         "io.opentelemetry:opentelemetry-sdk-testing:1.43.0",
         "io.opentelemetry:opentelemetry-sdk-trace:1.43.0",
         "io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha",
-        "io.ous:jtoml:2.0.0",
         "it.ozimov:embedded-redis:0.7.3",
-        "net.bytebuddy:byte-buddy:1.15.7",
+        "net.bytebuddy:byte-buddy:1.15.10",
         "org.htmlunit:htmlunit-core-js:4.5.0",
         "org.apache.commons:commons-exec:1.4.0",
         "org.apache.logging.log4j:log4j-core:2.24.1",
@@ -221,6 +220,7 @@ maven.install(
         "org.redisson:redisson:3.37.0",
         "org.slf4j:slf4j-api:2.0.16",
         "org.slf4j:slf4j-jdk14:2.0.16",
+        "org.tomlj:tomlj:1.1.1",
         "org.zeromq:jeromq:0.6.0",
     ],
     excluded_artifacts = [

dotnet/docs/api/index.md

@@ -3,29 +3,40 @@
     {
       "src": [
         {
+          "src": "../src/webdriver",
           "files": [
-            "src/webdriver/WebDriver.csproj",
-            "src/support/WebDriver.Support.csproj",
-            "bin/**/*.dll"
-          ],
-          "src": "../"
+            "**/*.csproj"
+          ]
         }
       ],
-      "dest": "api",
-      "includePrivateMembers": false,
-      "disableGitFeatures": false,
-      "disableDefaultFilter": false,
-      "noRestore": false,
-      "namespaceLayout": "flattened",
-      "memberLayout": "samePage",
-      "allowCompilationErrors": false
+      "dest": "webdriver",
+      "namespaceLayout": "nested",
+      "outputFormat": "apiPage"
+    },
+    {
+      "src": [
+        {
+          "src": "../src/support",
+          "files": [
+            "**/*.csproj"
+          ]
+        }
+      ],
+      "dest": "support",
+      "namespaceLayout": "nested",
+      "outputFormat": "apiPage"
     }
+
   ],
   "build": {
     "content": [
       {
-        "files": "**/*.{md|yml}",
-        "src": "api"
+        "files": [
+          "**/*.{md,yml}"
+        ],
+        "exclude": [
+          "_site/**"
+        ]
       }
     ],
     "resource": [
@@ -35,15 +46,16 @@
         ]
       }
     ],
-    "dest": "../../build/docs/api/dotnet",
-    "globalMetadataFiles": [],
-    "fileMetadataFiles": [],
+    "output": "../../build/docs/api/dotnet",
     "template": [
       "default",
       "modern"
     ],
-    "postProcessors": [],
-    "keepFileLink": false,
-    "disableGitFeatures": false
+    "globalMetadata": {
+      "_appName": "Selenium .NET API",
+      "_appLogoPath": "images/logo.svg",
+      "_appFaviconPath": "images/favicon.ico",
+      "_enableSearch": true
+    }
   }
 }

dotnet/docs/docfx.json

@@ -0,0 +1,9 @@
+---
+layout: landingPage
+---
+
+# Welcome to the Selenium .NET API Docs
+
+## Modules
+- [Selenium.WebDriver](/webdriver/OpenQA.Selenium.html)
+- [Selenium.Support](/support/OpenQA.Selenium.Support.html)

dotnet/docs/images/favicon.ico

@@ -0,0 +1,9 @@
+- name: Intro
+  href: index.md
+
+- name: Modules
+  items:
+  - name: WebDriver
+    href: webdriver/OpenQA.Selenium.yml
+  - name: Support
+    href: support/OpenQA.Selenium.Support.yml

dotnet/docs/images/logo.svg

@@ -0,0 +1,5 @@
+###############
+#  temp file  #
+###############
+*.yml
+.manifest

dotnet/docs/index.md

@@ -151,19 +151,18 @@ private static Dictionary<string, object> ConvertParametersFromJson(string value
     [JsonSerializable(typeof(ulong))]
     [JsonSerializable(typeof(short))]
     [JsonSerializable(typeof(ushort))]
-
     [JsonSerializable(typeof(string))]
 
     // Selenium WebDriver types
     [JsonSerializable(typeof(char[]))]
     [JsonSerializable(typeof(byte[]))]
+    [JsonSerializable(typeof(Chromium.ChromiumNetworkConditions))]
     [JsonSerializable(typeof(Cookie))]
     [JsonSerializable(typeof(ReturnedCookie))]
     [JsonSerializable(typeof(Proxy))]
 
     // Selenium Dictionaries, primarily used in Capabilities
     [JsonSerializable(typeof(Dictionary<string, object>))]
-
     [JsonSerializable(typeof(Dictionary<string, bool>))]
     [JsonSerializable(typeof(Dictionary<string, byte>))]
     [JsonSerializable(typeof(Dictionary<string, sbyte>))]
@@ -179,5 +178,6 @@ private static Dictionary<string, object> ConvertParametersFromJson(string value
     [JsonSerializable(typeof(Dictionary<string, ulong>))]
     [JsonSerializable(typeof(Dictionary<string, short>))]
     [JsonSerializable(typeof(Dictionary<string, ushort>))]
+    [JsonSerializable(typeof(Dictionary<string, string>))]
     internal partial class CommandJsonSerializerContext : JsonSerializerContext;
 }