[dotnet] Annotate Nullable Reference Types on OpenQA.Selenium.Internal (SeleniumHQ#14840)

RenderMichael · sandeepsuryaprasad · commit 8009d93e18ad · 2024-12-02T14:41:10.000+05:30
diff --git a/dotnet/src/webdriver/ICapabilities.cs b/dotnet/src/webdriver/ICapabilities.cs
@@ -19,6 +19,8 @@
 
 using System;
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
@@ -49,6 +51,6 @@ public interface ICapabilities
         /// <param name="capability">The capability to get.</param>
         /// <returns>An object associated with the capability, or <see langword="null"/>
         /// if the capability is not set on the browser.</returns>
-        object GetCapability(string capability);
+        object? GetCapability(string capability);
     }
 }
diff --git a/dotnet/src/webdriver/Internal/AndroidOptions.cs b/dotnet/src/webdriver/Internal/AndroidOptions.cs
@@ -19,55 +19,43 @@
 
 using System;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Internal
 {
     /// <summary>
     /// Provides a base class for options for browsers to be automated on Android.
     /// </summary>
     public class AndroidOptions
     {
-        private string androidPackage;
-        private string androidDeviceSerial;
-        private string androidActivity;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="AndroidOptions"/> class.
         /// </summary>
         /// <param name="androidPackage"></param>
+        /// <exception cref="ArgumentException">If <paramref name="androidPackage"/> is <see langword="null"/> or <see cref="string.Empty"/>.</exception>
         protected AndroidOptions(string androidPackage)
         {
             if (string.IsNullOrEmpty(androidPackage))
             {
                 throw new ArgumentException("The Android package cannot be null or the empty string", nameof(androidPackage));
             }
 
-            this.androidPackage = androidPackage;
+            this.AndroidPackage = androidPackage;
         }
 
         /// <summary>
         /// The package name of the application to automate.
         /// </summary>
-        public string AndroidPackage
-        {
-            get { return this.androidPackage; }
-        }
+        public string AndroidPackage { get; }
 
         /// <summary>
         /// The serial number of the device on which to launch the application.
         /// </summary>
-        public string AndroidDeviceSerial
-        {
-            get { return this.androidDeviceSerial; }
-            set { this.androidDeviceSerial = value; }
-        }
+        public string? AndroidDeviceSerial { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the Activity hosting the app.
         /// </summary>
-        public string AndroidActivity
-        {
-            get { return this.androidActivity; }
-            set { this.androidActivity = value; }
-        }
+        public string? AndroidActivity { get; set; }
     }
 }
diff --git a/dotnet/src/webdriver/Internal/FileUtilities.cs b/dotnet/src/webdriver/Internal/FileUtilities.cs
@@ -23,6 +23,8 @@
 using System.IO;
 using System.Reflection;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Internal
 {
     /// <summary>
@@ -40,7 +42,7 @@ internal static class FileUtilities
         /// <returns><see langword="true"/> if the copy is completed; otherwise <see langword="false"/>.</returns>
         public static bool CopyDirectory(string sourceDirectory, string destinationDirectory)
         {
-            bool copyComplete = false;
+            bool copyComplete;
             DirectoryInfo sourceDirectoryInfo = new DirectoryInfo(sourceDirectory);
             DirectoryInfo destinationDirectoryInfo = new DirectoryInfo(destinationDirectory);
 
@@ -132,7 +134,7 @@ public static string FindFile(string fileName)
 
             // If it's not in the same directory as the executing assembly,
             // try looking in the system path.
-            string systemPath = Environment.GetEnvironmentVariable("PATH");
+            string? systemPath = Environment.GetEnvironmentVariable("PATH");
             if (!string.IsNullOrEmpty(systemPath))
             {
                 string expandedPath = Environment.ExpandEnvironmentVariables(systemPath);
@@ -165,7 +167,7 @@ public static string FindFile(string fileName)
         public static string GetCurrentDirectory()
         {
             Assembly executingAssembly = typeof(FileUtilities).Assembly;
-            string location = null;
+            string? location = null;
 
             // Make sure not to call Path.GetDirectoryName if assembly location is null or empty
             if (!string.IsNullOrEmpty(executingAssembly.Location))
@@ -184,13 +186,13 @@ public static string GetCurrentDirectory()
                 location = Directory.GetCurrentDirectory();
             }
 
-            string currentDirectory = location;
+            string currentDirectory = location!;
 
             // If we're shadow copying, get the directory from the codebase instead
             if (AppDomain.CurrentDomain.ShadowCopyFiles)
             {
                 Uri uri = new Uri(executingAssembly.CodeBase);
-                currentDirectory = Path.GetDirectoryName(uri.LocalPath);
+                currentDirectory = Path.GetDirectoryName(uri.LocalPath)!;
             }
 
             return currentDirectory;
diff --git a/dotnet/src/webdriver/Internal/IFindsElement.cs b/dotnet/src/webdriver/Internal/IFindsElement.cs
@@ -19,6 +19,8 @@
 
 using System.Collections.ObjectModel;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Internal
 {
     /// <summary>
diff --git a/dotnet/src/webdriver/Internal/IHasCapabilitiesDictionary.cs b/dotnet/src/webdriver/Internal/IHasCapabilitiesDictionary.cs
@@ -19,6 +19,8 @@
 
 using System.Collections.Generic;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Internal
 {
     /// <summary>
diff --git a/dotnet/src/webdriver/Internal/ResourceUtilities.cs b/dotnet/src/webdriver/Internal/ResourceUtilities.cs
@@ -22,15 +22,17 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Internal
 {
     /// <summary>
     /// Encapsulates methods for finding and extracting WebDriver resources.
     /// </summary>
     internal static class ResourceUtilities
     {
-        private static string productVersion;
-        private static string platformFamily;
+        private static string? productVersion;
+        private static string? platformFamily;
 
         /// <summary>
         /// Gets a string representing the informational version of the Selenium product.
@@ -60,18 +62,7 @@ public static string ProductVersion
         /// <summary>
         /// Gets a string representing the platform family on which the Selenium assembly is executing.
         /// </summary>
-        public static string PlatformFamily
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(platformFamily))
-                {
-                    platformFamily = GetPlatformString();
-                }
-
-                return platformFamily;
-            }
-        }
+        public static string PlatformFamily => platformFamily ??= GetPlatformString();
 
         /// <summary>
         /// Gets a <see cref="Stream"/> that contains the resource to use.
@@ -94,7 +85,7 @@ public static string PlatformFamily
         /// </remarks>
         public static Stream GetResourceStream(string fileName, string resourceId)
         {
-            Stream resourceStream = null;
+            Stream? resourceStream;
             string resourceFilePath = Path.Combine(FileUtilities.GetCurrentDirectory(), Path.GetFileName(fileName));
             if (File.Exists(resourceFilePath))
             {
@@ -125,20 +116,22 @@ public static Stream GetResourceStream(string fileName, string resourceId)
 
         private static string GetPlatformString()
         {
-            string platformName = "unknown";
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                platformName = "windows";
+                return "windows";
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {
-                platformName = "linux";
+                return "linux";
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                platformName = "mac";
+                return "mac";
+            }
+            else
+            {
+                return "unknown";
             }
-            return platformName;
         }
     }
 }
diff --git a/dotnet/src/webdriver/Internal/ResponseValueJsonConverter.cs b/dotnet/src/webdriver/Internal/ResponseValueJsonConverter.cs
@@ -22,14 +22,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Internal
 {
     /// <summary>
     /// Converts the response to JSON
     /// </summary>
     internal class ResponseValueJsonConverter : JsonConverter<object>
     {
-        public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override object? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return ProcessReadToken(ref reader, options);
         }
@@ -67,19 +69,19 @@ public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOp
             }
         }
 
-        private static object ProcessReadToken(ref Utf8JsonReader reader, JsonSerializerOptions options)
+        private static object? ProcessReadToken(ref Utf8JsonReader reader, JsonSerializerOptions options)
         {
             // Recursively processes a token. This is required for elements that next other elements.
-            object processedObject;
+            object? processedObject;
 
             switch (reader.TokenType)
             {
                 case JsonTokenType.StartObject:
                     {
-                        Dictionary<string, object> dictionaryValue = [];
+                        Dictionary<string, object?> dictionaryValue = [];
                         while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
                         {
-                            string elementKey = reader.GetString();
+                            string elementKey = reader.GetString()!;
                             reader.Read();
                             dictionaryValue.Add(elementKey, ProcessReadToken(ref reader, options));
                         }
@@ -90,7 +92,7 @@ private static object ProcessReadToken(ref Utf8JsonReader reader, JsonSerializer
 
                 case JsonTokenType.StartArray:
                     {
-                        List<object> arrayValue = [];
+                        List<object?> arrayValue = [];
                         while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
                         {
                             arrayValue.Add(ProcessReadToken(ref reader, options));
diff --git a/dotnet/src/webdriver/Internal/ReturnedCapabilities.cs b/dotnet/src/webdriver/Internal/ReturnedCapabilities.cs
@@ -22,13 +22,15 @@
 using System.Collections.ObjectModel;
 using System.Globalization;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Internal
 {
     /// <summary>
     /// Class to Create the capabilities of the browser you require for <see cref="IWebDriver"/>.
     /// If you wish to use default values use the static methods
     /// </summary>
-    internal class ReturnedCapabilities : ICapabilities, IHasCapabilitiesDictionary
+    internal sealed class ReturnedCapabilities : ICapabilities, IHasCapabilitiesDictionary
     {
         private readonly Dictionary<string, object> capabilities = new Dictionary<string, object>();
 
@@ -43,32 +45,26 @@ public ReturnedCapabilities()
         /// Initializes a new instance of the <see cref="ReturnedCapabilities"/> class
         /// </summary>
         /// <param name="rawMap">Dictionary of items for the remote driver</param>
-        public ReturnedCapabilities(Dictionary<string, object> rawMap)
+        public ReturnedCapabilities(Dictionary<string, object>? rawMap)
         {
             if (rawMap != null)
             {
-                foreach (string key in rawMap.Keys)
+                foreach (KeyValuePair<string, object> rawItem in rawMap)
                 {
-                    this.capabilities[key] = rawMap[key];
+                    this.capabilities[rawItem.Key] = rawItem.Value;
                 }
             }
         }
 
         /// <summary>
-        /// Gets the browser name
+        /// Gets the browser name, or <see cref="string.Empty"/> if not specified.
         /// </summary>
         public string BrowserName
         {
             get
             {
-                string name = string.Empty;
-                object capabilityValue = this.GetCapability(CapabilityType.BrowserName);
-                if (capabilityValue != null)
-                {
-                    name = capabilityValue.ToString();
-                }
-
-                return name;
+                object? capabilityValue = this.GetCapability(CapabilityType.BrowserName);
+                return capabilityValue?.ToString() ?? string.Empty;
             }
         }
 
@@ -84,30 +80,24 @@ public object this[string capabilityName]
         {
             get
             {
-                if (!this.capabilities.ContainsKey(capabilityName))
+                if (!this.capabilities.TryGetValue(capabilityName, out object? capabilityValue))
                 {
                     throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "The capability {0} is not present in this set of capabilities", capabilityName));
                 }
 
-                return this.capabilities[capabilityName];
+                return capabilityValue;
             }
         }
 
         /// <summary>
         /// Gets the underlying Dictionary for a given set of capabilities.
         /// </summary>
-        IDictionary<string, object> IHasCapabilitiesDictionary.CapabilitiesDictionary
-        {
-            get { return this.CapabilitiesDictionary; }
-        }
+        IDictionary<string, object> IHasCapabilitiesDictionary.CapabilitiesDictionary => this.CapabilitiesDictionary;
 
         /// <summary>
         /// Gets the internal capabilities dictionary.
         /// </summary>
-        internal IDictionary<string, object> CapabilitiesDictionary
-        {
-            get { return new ReadOnlyDictionary<string, object>(this.capabilities); }
-        }
+        internal IDictionary<string, object> CapabilitiesDictionary => new ReadOnlyDictionary<string, object>(this.capabilities);
 
         /// <summary>
         /// Gets a value indicating whether the browser has a given capability.
@@ -125,15 +115,14 @@ public bool HasCapability(string capability)
         /// <param name="capability">The capability to get.</param>
         /// <returns>An object associated with the capability, or <see langword="null"/>
         /// if the capability is not set on the browser.</returns>
-        public object GetCapability(string capability)
+        public object? GetCapability(string capability)
         {
-            object capabilityValue = null;
-            if (this.capabilities.ContainsKey(capability))
+            if (this.capabilities.TryGetValue(capability, out object? capabilityValue))
             {
-                capabilityValue = this.capabilities[capability];
+                return capabilityValue;
             }
 
-            return capabilityValue;
+            return null;
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`
`20`	`20`	`using System;`
`21`	`21`
	`22`	`+#nullable enable`
	`23`	`+`
`22`	`24`	`namespace OpenQA.Selenium`
`23`	`25`	`{`
`24`	`26`	`/// <summary>`
`@@ -49,6 +51,6 @@ public interface ICapabilities`
`49`	`51`	`/// <param name="capability">The capability to get.</param>`
`50`	`52`	`/// <returns>An object associated with the capability, or <see langword="null"/>`
`51`	`53`	`/// if the capability is not set on the browser.</returns>`
`52`		`- object GetCapability(string capability);`
	`54`	`+ object? GetCapability(string capability);`
`53`	`55`	`}`
`54`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,17 @@`
`22`	`22`	`using System.Reflection;`
`23`	`23`	`using System.Runtime.InteropServices;`
`24`	`24`
	`25`	`+#nullable enable`
	`26`	`+`
`25`	`27`	`namespace OpenQA.Selenium.Internal`
`26`	`28`	`{`
`27`	`29`	`/// <summary>`
`28`	`30`	`/// Encapsulates methods for finding and extracting WebDriver resources.`
`29`	`31`	`/// </summary>`
`30`	`32`	`internal static class ResourceUtilities`
`31`	`33`	`{`
`32`		`- private static string productVersion;`
`33`		`- private static string platformFamily;`
	`34`	`+ private static string? productVersion;`
	`35`	`+ private static string? platformFamily;`
`34`	`36`
`35`	`37`	`/// <summary>`
`36`	`38`	`/// Gets a string representing the informational version of the Selenium product.`
`@@ -60,18 +62,7 @@ public static string ProductVersion`
`60`	`62`	`/// <summary>`
`61`	`63`	`/// Gets a string representing the platform family on which the Selenium assembly is executing.`
`62`	`64`	`/// </summary>`
`63`		`- public static string PlatformFamily`
`64`		`- {`
`65`		`- get`
`66`		`- {`
`67`		`- if (string.IsNullOrEmpty(platformFamily))`
`68`		`- {`
`69`		`- platformFamily = GetPlatformString();`
`70`		`- }`
`71`		`-`
`72`		`- return platformFamily;`
`73`		`- }`
`74`		`- }`
	`65`	`+ public static string PlatformFamily => platformFamily ??= GetPlatformString();`
`75`	`66`
`76`	`67`	`/// <summary>`
`77`	`68`	`/// Gets a <see cref="Stream"/> that contains the resource to use.`
`@@ -94,7 +85,7 @@ public static string PlatformFamily`
`94`	`85`	`/// </remarks>`
`95`	`86`	`public static Stream GetResourceStream(string fileName, string resourceId)`
`96`	`87`	`{`
`97`		`- Stream resourceStream = null;`
	`88`	`+ Stream? resourceStream;`
`98`	`89`	`string resourceFilePath = Path.Combine(FileUtilities.GetCurrentDirectory(), Path.GetFileName(fileName));`
`99`	`90`	`if (File.Exists(resourceFilePath))`
`100`	`91`	`{`
`@@ -125,20 +116,22 @@ public static Stream GetResourceStream(string fileName, string resourceId)`
`125`	`116`
`126`	`117`	`private static string GetPlatformString()`
`127`	`118`	`{`
`128`		`- string platformName = "unknown";`
`129`	`119`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))`
`130`	`120`	`{`
`131`		`- platformName = "windows";`
	`121`	`+ return "windows";`
`132`	`122`	`}`
`133`	`123`	`else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))`
`134`	`124`	`{`
`135`		`- platformName = "linux";`
	`125`	`+ return "linux";`
`136`	`126`	`}`
`137`	`127`	`else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))`
`138`	`128`	`{`
`139`		`- platformName = "mac";`
	`129`	`+ return "mac";`
	`130`	`+ }`
	`131`	`+ else`
	`132`	`+ {`
	`133`	`+ return "unknown";`
`140`	`134`	`}`
`141`		`- return platformName;`
`142`	`135`	`}`
`143`	`136`	`}`
`144`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,16 @@`
`22`	`22`	`using System.Text.Json;`
`23`	`23`	`using System.Text.Json.Serialization;`
`24`	`24`
	`25`	`+#nullable enable`
	`26`	`+`
`25`	`27`	`namespace OpenQA.Selenium.Internal`
`26`	`28`	`{`
`27`	`29`	`/// <summary>`
`28`	`30`	`/// Converts the response to JSON`
`29`	`31`	`/// </summary>`
`30`	`32`	`internal class ResponseValueJsonConverter : JsonConverter<object>`
`31`	`33`	`{`
`32`		`- public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
	`34`	`+ public override object? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
`33`	`35`	`{`
`34`	`36`	`return ProcessReadToken(ref reader, options);`
`35`	`37`	`}`
`@@ -67,19 +69,19 @@ public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOp`
`67`	`69`	`}`
`68`	`70`	`}`
`69`	`71`
`70`		`- private static object ProcessReadToken(ref Utf8JsonReader reader, JsonSerializerOptions options)`
	`72`	`+ private static object? ProcessReadToken(ref Utf8JsonReader reader, JsonSerializerOptions options)`
`71`	`73`	`{`
`72`	`74`	`// Recursively processes a token. This is required for elements that next other elements.`
`73`		`- object processedObject;`
	`75`	`+ object? processedObject;`
`74`	`76`
`75`	`77`	`switch (reader.TokenType)`
`76`	`78`	`{`
`77`	`79`	`case JsonTokenType.StartObject:`
`78`	`80`	`{`
`79`		`- Dictionary<string, object> dictionaryValue = [];`
	`81`	`+ Dictionary<string, object?> dictionaryValue = [];`
`80`	`82`	`while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)`
`81`	`83`	`{`
`82`		`- string elementKey = reader.GetString();`
	`84`	`+ string elementKey = reader.GetString()!;`
`83`	`85`	`reader.Read();`
`84`	`86`	`dictionaryValue.Add(elementKey, ProcessReadToken(ref reader, options));`
`85`	`87`	`}`
`@@ -90,7 +92,7 @@ private static object ProcessReadToken(ref Utf8JsonReader reader, JsonSerializer`
`90`	`92`
`91`	`93`	`case JsonTokenType.StartArray:`
`92`	`94`	`{`
`93`		`- List<object> arrayValue = [];`
	`95`	`+ List<object?> arrayValue = [];`
`94`	`96`	`while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)`
`95`	`97`	`{`
`96`	`98`	`arrayValue.Add(ProcessReadToken(ref reader, options));`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,15 @@`
`22`	`22`	`using System.Collections.ObjectModel;`
`23`	`23`	`using System.Globalization;`
`24`	`24`
	`25`	`+#nullable enable`
	`26`	`+`
`25`	`27`	`namespace OpenQA.Selenium.Internal`
`26`	`28`	`{`
`27`	`29`	`/// <summary>`
`28`	`30`	`/// Class to Create the capabilities of the browser you require for <see cref="IWebDriver"/>.`
`29`	`31`	`/// If you wish to use default values use the static methods`
`30`	`32`	`/// </summary>`
`31`		`- internal class ReturnedCapabilities : ICapabilities, IHasCapabilitiesDictionary`
	`33`	`+ internal sealed class ReturnedCapabilities : ICapabilities, IHasCapabilitiesDictionary`
`32`	`34`	`{`
`33`	`35`	`private readonly Dictionary<string, object> capabilities = new Dictionary<string, object>();`
`34`	`36`
`@@ -43,32 +45,26 @@ public ReturnedCapabilities()`
`43`	`45`	`/// Initializes a new instance of the <see cref="ReturnedCapabilities"/> class`
`44`	`46`	`/// </summary>`
`45`	`47`	`/// <param name="rawMap">Dictionary of items for the remote driver</param>`
`46`		`- public ReturnedCapabilities(Dictionary<string, object> rawMap)`
	`48`	`+ public ReturnedCapabilities(Dictionary<string, object>? rawMap)`
`47`	`49`	`{`
`48`	`50`	`if (rawMap != null)`
`49`	`51`	`{`
`50`		`- foreach (string key in rawMap.Keys)`
	`52`	`+ foreach (KeyValuePair<string, object> rawItem in rawMap)`
`51`	`53`	`{`
`52`		`- this.capabilities[key] = rawMap[key];`
	`54`	`+ this.capabilities[rawItem.Key] = rawItem.Value;`
`53`	`55`	`}`
`54`	`56`	`}`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`/// <summary>`
`58`		`- /// Gets the browser name`
	`60`	`+ /// Gets the browser name, or <see cref="string.Empty"/> if not specified.`
`59`	`61`	`/// </summary>`
`60`	`62`	`public string BrowserName`
`61`	`63`	`{`
`62`	`64`	`get`
`63`	`65`	`{`
`64`		`- string name = string.Empty;`
`65`		`- object capabilityValue = this.GetCapability(CapabilityType.BrowserName);`
`66`		`- if (capabilityValue != null)`
`67`		`- {`
`68`		`- name = capabilityValue.ToString();`
`69`		`- }`
`70`		`-`
`71`		`- return name;`
	`66`	`+ object? capabilityValue = this.GetCapability(CapabilityType.BrowserName);`
	`67`	`+ return capabilityValue?.ToString() ?? string.Empty;`
`72`	`68`	`}`
`73`	`69`	`}`
`74`	`70`
`@@ -84,30 +80,24 @@ public object this[string capabilityName]`
`84`	`80`	`{`
`85`	`81`	`get`
`86`	`82`	`{`
`87`		`- if (!this.capabilities.ContainsKey(capabilityName))`
	`83`	`+ if (!this.capabilities.TryGetValue(capabilityName, out object? capabilityValue))`
`88`	`84`	`{`
`89`	`85`	`throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "The capability {0} is not present in this set of capabilities", capabilityName));`
`90`	`86`	`}`
`91`	`87`
`92`		`- return this.capabilities[capabilityName];`
	`88`	`+ return capabilityValue;`
`93`	`89`	`}`
`94`	`90`	`}`
`95`	`91`
`96`	`92`	`/// <summary>`
`97`	`93`	`/// Gets the underlying Dictionary for a given set of capabilities.`
`98`	`94`	`/// </summary>`
`99`		`- IDictionary<string, object> IHasCapabilitiesDictionary.CapabilitiesDictionary`
`100`		`- {`
`101`		`- get { return this.CapabilitiesDictionary; }`
`102`		`- }`
	`95`	`+ IDictionary<string, object> IHasCapabilitiesDictionary.CapabilitiesDictionary => this.CapabilitiesDictionary;`
`103`	`96`
`104`	`97`	`/// <summary>`
`105`	`98`	`/// Gets the internal capabilities dictionary.`
`106`	`99`	`/// </summary>`
`107`		`- internal IDictionary<string, object> CapabilitiesDictionary`
`108`		`- {`
`109`		`- get { return new ReadOnlyDictionary<string, object>(this.capabilities); }`
`110`		`- }`
	`100`	`+ internal IDictionary<string, object> CapabilitiesDictionary => new ReadOnlyDictionary<string, object>(this.capabilities);`
`111`	`101`
`112`	`102`	`/// <summary>`
`113`	`103`	`/// Gets a value indicating whether the browser has a given capability.`
`@@ -125,15 +115,14 @@ public bool HasCapability(string capability)`
`125`	`115`	`/// <param name="capability">The capability to get.</param>`
`126`	`116`	`/// <returns>An object associated with the capability, or <see langword="null"/>`
`127`	`117`	`/// if the capability is not set on the browser.</returns>`
`128`		`- public object GetCapability(string capability)`
	`118`	`+ public object? GetCapability(string capability)`
`129`	`119`	`{`
`130`		`- object capabilityValue = null;`
`131`		`- if (this.capabilities.ContainsKey(capability))`
	`120`	`+ if (this.capabilities.TryGetValue(capability, out object? capabilityValue))`
`132`	`121`	`{`
`133`		`- capabilityValue = this.capabilities[capability];`
	`122`	`+ return capabilityValue;`
`134`	`123`	`}`
`135`	`124`
`136`		`- return capabilityValue;`
	`125`	`+ return null;`
`137`	`126`	`}`
`138`	`127`
`139`	`128`	`/// <summary>`