Bring back the RemoteSessionSettings.mustMatchDriverOptions field

Author: RenderMichael

dotnet/src/webdriver/Remote/RemoteSessionSettings.cs

@@ -19,11 +19,9 @@
 
 using OpenQA.Selenium.Remote;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text.Json;
-using System.Text.Json.Nodes;
 
 namespace OpenQA.Selenium
 {
@@ -36,6 +34,7 @@ public class RemoteSessionSettings : ICapabilities
         private const string AlwaysMatchCapabilityName = "alwaysMatch";
 
         private readonly List<string> reservedSettingNames = new List<string>() { FirstMatchCapabilityName, AlwaysMatchCapabilityName };
+        private DriverOptions mustMatchDriverOptions;
         private List<DriverOptions> firstMatchOptions = new List<DriverOptions>();
         private Dictionary<string, object> remoteMetadataSettings = new Dictionary<string, object>();
 
@@ -61,7 +60,7 @@ public RemoteSessionSettings()
         /// </param>
         public RemoteSessionSettings(DriverOptions mustMatchDriverOptions, params DriverOptions[] firstMatchDriverOptions)
         {
-            this.MustMatchDriverOptions = mustMatchDriverOptions;
+            this.mustMatchDriverOptions = mustMatchDriverOptions;
             foreach (DriverOptions firstMatchOption in firstMatchDriverOptions)
             {
                 this.AddFirstMatchDriverOption(firstMatchOption);
@@ -71,7 +70,7 @@ public RemoteSessionSettings(DriverOptions mustMatchDriverOptions, params Driver
         /// <summary>
         /// Gets a value indicating the options that must be matched by the remote end to create a session.
         /// </summary>
-        internal DriverOptions MustMatchDriverOptions { get; private set; }
+        internal DriverOptions MustMatchDriverOptions => this.mustMatchDriverOptions;
 
         /// <summary>
         /// Gets a value indicating the number of options that may be matched by the remote end to create a session.
@@ -143,9 +142,9 @@ public void AddMetadataSetting(string settingName, object settingValue)
         /// <param name="options">The <see cref="DriverOptions"/> to add to the list of "first matched" options.</param>
         public void AddFirstMatchDriverOption(DriverOptions options)
         {
-            if (MustMatchDriverOptions != null)
+            if (this.mustMatchDriverOptions != null)
             {
-                DriverOptionsMergeResult mergeResult = MustMatchDriverOptions.GetMergeResult(options);
+                DriverOptionsMergeResult mergeResult = this.mustMatchDriverOptions.GetMergeResult(options);
                 if (mergeResult.IsMergeConflict)
                 {
                     string msg = string.Format(CultureInfo.InvariantCulture, "You cannot request the same capability in both must-match and first-match capabilities. You are attempting to add a first-match driver options object that defines a capability, '{0}', that is already defined in the must-match driver options.", mergeResult.MergeConflictOptionName);
@@ -180,7 +179,7 @@ public void SetMustMatchDriverOptions(DriverOptions options)
                 }
             }
 
-            this.MustMatchDriverOptions = options;
+            this.mustMatchDriverOptions = options;
         }
 
         /// <summary>
@@ -238,7 +237,7 @@ public Dictionary<string, object> ToDictionary()
                 capabilitiesDictionary[remoteMetadataSetting.Key] = remoteMetadataSetting.Value;
             }
 
-            if (this.MustMatchDriverOptions != null)
+            if (this.mustMatchDriverOptions != null)
             {
                 capabilitiesDictionary["alwaysMatch"] = GetAlwaysMatchOptionsAsSerializableDictionary();
             }
@@ -274,7 +273,7 @@ internal DriverOptions GetFirstMatchDriverOptions(int firstMatchIndex)
 
         private IDictionary<string, object> GetAlwaysMatchOptionsAsSerializableDictionary()
         {
-            return this.MustMatchDriverOptions.ToDictionary();
+            return this.mustMatchDriverOptions.ToDictionary();
         }
 
         private List<object> GetFirstMatchOptionsAsSerializableList()