Merge branch 'trunk' into jspecify-enums

Author: VietND96

.github/workflows/update-documentation.yml

@@ -140,10 +140,6 @@ jobs:
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Selenium CI Bot"
-      - name: Install specific version of DocFX tool
-        #  Pinning to 2.75.3 to avoid breaking changes in newer versions
-        #  See https://github.com/dotnet/docfx/issues/9855
-        run: dotnet tool install --global --version 2.75.3 docfx
       - name: Update Documentation
         if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'dotnet'
         run: ./go dotnet:docs

MODULE.bazel

@@ -93,7 +93,7 @@ register_toolchains("@dotnet_toolchains//:all")
 oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
 oci.pull(
     name = "java_image_base",
-    digest = "sha256:161a1d97d592b3f1919801578c3a47c8e932071168a96267698f4b669c24c76d",
+    digest = "sha256:1df9f3e6a2de0544dd04f1840aa811d334045c9126f9e93d8da45448061ad51e",
     image = "gcr.io/distroless/java17",
 )
 oci.pull(

Rakefile

@@ -777,10 +777,9 @@ namespace :dotnet do
   task :docs, [:skip_update] do |_task, arguments|
     FileUtils.rm_rf('build/docs/api/dotnet/')
     begin
-      # Pinning to 2.75.3 to avoid breaking changes in newer versions
-      # See https://github.com/dotnet/docfx/issues/9855
+      # Pinning to 2.78.2 to avoid breaking changes in newer versions
       sh 'dotnet tool uninstall --global docfx || true'
-      sh 'dotnet tool install --global --version 2.75.3 docfx'
+      sh 'dotnet tool install --global --version 2.78.2 docfx'
       # sh 'dotnet tool update -g docfx'
     rescue StandardError
       puts 'Please ensure that .NET SDK is installed.'

dotnet/NuGet.Config

@@ -11,7 +11,7 @@
       ],
       "dest": "webdriver",
       "namespaceLayout": "nested",
-      "outputFormat": "apiPage"
+      //"outputFormat": "apiPage" // "apiPage" generation with errors
     },
     {
       "src": [
@@ -24,9 +24,8 @@
       ],
       "dest": "support",
       "namespaceLayout": "nested",
-      "outputFormat": "apiPage"
+      //"outputFormat": "apiPage" // "apiPage" generation with errors
     }
-
   ],
   "build": {
     "content": [

dotnet/docs/docfx.json

@@ -21,6 +21,8 @@
 using System.Collections.Generic;
 using System.Text;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Interactions
 {
     /// <summary>
@@ -29,7 +31,7 @@ namespace OpenQA.Selenium.Interactions
     /// </summary>
     public class ActionBuilder
     {
-        private Dictionary<InputDevice, ActionSequence> sequences = new Dictionary<InputDevice, ActionSequence>();
+        private readonly Dictionary<InputDevice, ActionSequence> sequences = new Dictionary<InputDevice, ActionSequence>();
 
         /// <summary>
         /// Adds an action to the built set of actions. Adding an action will
@@ -71,7 +73,7 @@ public IList<ActionSequence> ToActionSequenceList()
         /// </summary>
         public void ClearSequences()
         {
-            this.sequences = new Dictionary<InputDevice, ActionSequence>();
+            this.sequences.Clear();
         }
 
         /// <summary>
@@ -94,8 +96,7 @@ private void ProcessTick(params Interaction[] interactionsToAdd)
             List<InputDevice> usedDevices = new List<InputDevice>();
             foreach (Interaction interaction in interactionsToAdd)
             {
-                InputDevice actionDevice = interaction.SourceDevice;
-                if (usedDevices.Contains(actionDevice))
+                if (usedDevices.Contains(interaction.SourceDevice))
                 {
                     throw new ArgumentException("You can only add one action per device for a single tick.");
                 }
@@ -104,8 +105,9 @@ private void ProcessTick(params Interaction[] interactionsToAdd)
             List<InputDevice> unusedDevices = new List<InputDevice>(this.sequences.Keys);
             foreach (Interaction interaction in interactionsToAdd)
             {
-                ActionSequence sequence = this.FindSequence(interaction.SourceDevice);
+                ActionSequence sequence = this.GetOrAddSequence(interaction.SourceDevice);
                 sequence.AddAction(interaction);
+
                 unusedDevices.Remove(interaction.SourceDevice);
             }
 
@@ -116,11 +118,11 @@ private void ProcessTick(params Interaction[] interactionsToAdd)
             }
         }
 
-        private ActionSequence FindSequence(InputDevice device)
+        private ActionSequence GetOrAddSequence(InputDevice device)
         {
-            if (this.sequences.ContainsKey(device))
+            if (this.sequences.TryGetValue(device, out ActionSequence? existingSequence))
             {
-                return this.sequences[device];
+                return existingSequence;
             }
 
             int longestSequenceLength = 0;