Merge branch 'trunk' into webelement-nullable-2

Author: RenderMichael

dotnet/src/support/UI/PopupWindowFinder.cs

@@ -131,7 +131,7 @@ public string Invoke(Action popupMethod)
 
             ReadOnlyCollection<string> existingHandles = this.driver.WindowHandles;
             popupMethod();
-            WebDriverWait wait = new WebDriverWait(new SystemClock(), this.driver, this.timeout, this.sleepInterval);
+            WebDriverWait wait = new WebDriverWait(SystemClock.Instance, this.driver, this.timeout, this.sleepInterval);
             string popupHandle = wait.Until<string>((d) =>
             {
                 string? foundHandle = null;

dotnet/src/support/UI/SlowLoadableComponent{T}.cs

@@ -43,7 +43,7 @@ public abstract class SlowLoadableComponent<T> : LoadableComponent<T>
         /// </summary>
         /// <param name="timeout">The <see cref="TimeSpan"/> within which the component should be loaded.</param>
         protected SlowLoadableComponent(TimeSpan timeout)
-            : this(timeout, new SystemClock())
+            : this(timeout, SystemClock.Instance)
         {
         }
 

dotnet/src/webdriver/By.cs

@@ -299,6 +299,8 @@ public void SetPermission(string permissionName, string permissionValue)
         /// Creates a session to communicate with a browser using the Chromium Developer Tools debugging protocol.
         /// </summary>
         /// <returns>The active session to use to communicate with the Chromium Developer Tools debugging protocol.</returns>
+        [RequiresUnreferencedCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
+        [RequiresDynamicCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
         public DevToolsSession GetDevToolsSession()
         {
             return GetDevToolsSession(new DevToolsOptions() { ProtocolVersion = DevToolsSession.AutoDetectDevToolsProtocolVersion });
@@ -308,6 +310,8 @@ public DevToolsSession GetDevToolsSession()
         /// Creates a session to communicate with a browser using the Chromium Developer Tools debugging protocol.
         /// </summary>
         /// <returns>The active session to use to communicate with the Chromium Developer Tools debugging protocol.</returns>
+        [RequiresUnreferencedCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
+        [RequiresDynamicCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
         public DevToolsSession GetDevToolsSession(DevToolsOptions options)
         {
             if (this.devToolsSession == null)
@@ -330,7 +334,7 @@ public DevToolsSession GetDevToolsSession(DevToolsOptions options)
 
                 try
                 {
-                    DevToolsSession session = new DevToolsSession(debuggerAddress?.ToString(), options);
+                    DevToolsSession session = new DevToolsSession(debuggerAddress?.ToString()!, options);
                     Task.Run(async () => await session.StartSession()).GetAwaiter().GetResult();
                     this.devToolsSession = session;
                 }
@@ -349,6 +353,8 @@ public DevToolsSession GetDevToolsSession(DevToolsOptions options)
         /// <param name="devToolsProtocolVersion">The version of the Chromium Developer Tools protocol to use. Defaults to autodetect the protocol version.</param>
         /// <returns>The active session to use to communicate with the Chromium Developer Tools debugging protocol.</returns>
         [Obsolete("Use GetDevToolsSession(DevToolsOptions options)")]
+        [RequiresUnreferencedCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
+        [RequiresDynamicCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
         public DevToolsSession GetDevToolsSession(int devToolsProtocolVersion)
         {
             return GetDevToolsSession(new DevToolsOptions() { ProtocolVersion = devToolsProtocolVersion });

dotnet/src/webdriver/Chromium/ChromiumDriver.cs

@@ -615,7 +615,7 @@ private static void AddAndroidOptions(Dictionary<string, object> chromeOptions,
 
             if (!string.IsNullOrEmpty(androidOptions.AndroidProcess))
             {
-                chromeOptions["androidProcess"] = androidOptions.AndroidProcess;
+                chromeOptions["androidProcess"] = androidOptions.AndroidProcess!;
             }
 
             if (androidOptions.UseRunningApp)

dotnet/src/webdriver/Chromium/ChromiumOptions.cs

@@ -24,6 +24,8 @@
 using System.Linq;
 using System.Text.Json.Serialization;
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
@@ -32,15 +34,20 @@ namespace OpenQA.Selenium
     [Serializable]
     public class Cookie
     {
-        private string cookieName;
-        private string cookieValue;
-        private string cookiePath;
-        private string cookieDomain;
-        private string sameSite;
-        private bool isHttpOnly;
-        private bool secure;
-        private DateTime? cookieExpiry;
-        private readonly string[] sameSiteValues = { "Strict", "Lax", "None" };
+        private readonly string cookieName;
+        private readonly string cookieValue;
+        private readonly string? cookiePath;
+        private readonly string? cookieDomain;
+        private readonly string? sameSite;
+        private readonly bool isHttpOnly;
+        private readonly bool secure;
+        private readonly DateTime? cookieExpiry;
+        private readonly HashSet<string?> sameSiteValues = new HashSet<string?>()
+        {
+            "Strict",
+            "Lax",
+            "None"
+        };
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Cookie"/> class with a specific name and value.
@@ -65,7 +72,7 @@ public Cookie(string name, string value)
         /// <exception cref="ArgumentException">If the name is <see langword="null"/> or an empty string,
         /// or if it contains a semi-colon.</exception>
         /// <exception cref="ArgumentNullException">If the value is <see langword="null"/>.</exception>
-        public Cookie(string name, string value, string path)
+        public Cookie(string name, string value, string? path)
             : this(name, value, path, null)
         {
         }
@@ -81,7 +88,7 @@ public Cookie(string name, string value, string path)
         /// <exception cref="ArgumentException">If the name is <see langword="null"/> or an empty string,
         /// or if it contains a semi-colon.</exception>
         /// <exception cref="ArgumentNullException">If the value is <see langword="null"/>.</exception>
-        public Cookie(string name, string value, string path, DateTime? expiry)
+        public Cookie(string name, string value, string? path, DateTime? expiry)
             : this(name, value, null, path, expiry)
         {
         }
@@ -98,7 +105,7 @@ public Cookie(string name, string value, string path, DateTime? expiry)
         /// <exception cref="ArgumentException">If the name is <see langword="null"/> or an empty string,
         /// or if it contains a semi-colon.</exception>
         /// <exception cref="ArgumentNullException">If the value is <see langword="null"/>.</exception>
-        public Cookie(string name, string value, string domain, string path, DateTime? expiry)
+        public Cookie(string name, string value, string? domain, string? path, DateTime? expiry)
             : this(name, value, domain, path, expiry, false, false, null)
         {
         }
@@ -118,7 +125,7 @@ public Cookie(string name, string value, string domain, string path, DateTime? e
         /// <exception cref="ArgumentException">If the name and value are both an empty string,
         /// if the name contains a semi-colon, or if same site value is not valid.</exception>
         /// <exception cref="ArgumentNullException">If the name, value or currentUrl is <see langword="null"/>.</exception>
-        public Cookie(string name, string value, string domain, string path, DateTime? expiry, bool secure, bool isHttpOnly, string sameSite)
+        public Cookie(string name, string value, string? domain, string? path, DateTime? expiry, bool secure, bool isHttpOnly, string? sameSite)
         {
             if (name == null)
             {
@@ -135,7 +142,7 @@ public Cookie(string name, string value, string domain, string path, DateTime? e
                 throw new ArgumentException("Cookie name and value cannot both be empty string");
             }
 
-            if (name.IndexOf(';') != -1)
+            if (name.Contains(';'))
             {
                 throw new ArgumentException("Cookie names cannot contain a ';': " + name, nameof(name));
             }
@@ -172,77 +179,52 @@ public Cookie(string name, string value, string domain, string path, DateTime? e
         /// Gets the name of the cookie.
         /// </summary>
         [JsonPropertyName("name")]
-        public string Name
-        {
-            get { return this.cookieName; }
-        }
+        public string Name => this.cookieName;
 
         /// <summary>
         /// Gets the value of the cookie.
         /// </summary>
         [JsonPropertyName("value")]
-        public string Value
-        {
-            get { return this.cookieValue; }
-        }
+        public string Value => this.cookieValue;
 
         /// <summary>
         /// Gets the domain of the cookie.
         /// </summary>
         [JsonPropertyName("domain")]
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string Domain
-        {
-            get { return this.cookieDomain; }
-        }
+        public string? Domain => this.cookieDomain;
 
         /// <summary>
         /// Gets the path of the cookie.
         /// </summary>
         [JsonPropertyName("path")]
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public virtual string Path
-        {
-            get { return this.cookiePath; }
-        }
+        public virtual string? Path => this.cookiePath;
 
         /// <summary>
         /// Gets a value indicating whether the cookie is secure.
         /// </summary>
         [JsonPropertyName("secure")]
-        public virtual bool Secure
-        {
-            get { return this.secure; }
-        }
+        public virtual bool Secure => this.secure;
 
         /// <summary>
         /// Gets a value indicating whether the cookie is an HTTP-only cookie.
         /// </summary>
         [JsonPropertyName("httpOnly")]
-        public virtual bool IsHttpOnly
-        {
-            get { return this.isHttpOnly; }
-
-        }
+        public virtual bool IsHttpOnly => this.isHttpOnly;
 
         /// <summary>
         /// Gets the SameSite setting for the cookie.
         /// </summary>
         [JsonPropertyName("sameSite")]
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public virtual string SameSite
-        {
-            get { return this.sameSite; }
-        }
+        public virtual string? SameSite => this.sameSite;
 
         /// <summary>
         /// Gets the expiration date of the cookie.
         /// </summary>
         [JsonIgnore]
-        public DateTime? Expiry
-        {
-            get { return this.cookieExpiry; }
-        }
+        public DateTime? Expiry => this.cookieExpiry;
 
         /// <summary>
         /// Gets the cookie expiration date in seconds from the defined zero date (01 January 1970 00:00:00 UTC).
@@ -273,54 +255,54 @@ internal long? ExpirySeconds
         /// </summary>
         /// <param name="rawCookie">The Dictionary object containing the cookie parameters.</param>
         /// <returns>A <see cref="Cookie"/> object with the proper parameters set.</returns>
-        public static Cookie FromDictionary(Dictionary<string, object> rawCookie)
+        public static Cookie FromDictionary(Dictionary<string, object?> rawCookie)
         {
             if (rawCookie == null)
             {
                 throw new ArgumentNullException(nameof(rawCookie));
             }
 
-            string name = rawCookie["name"].ToString();
+            string name = rawCookie["name"]!.ToString()!;
             string value = string.Empty;
-            if (rawCookie["value"] != null)
+            if (rawCookie.TryGetValue("value", out object? valueObj))
             {
-                value = rawCookie["value"].ToString();
+                value = valueObj!.ToString()!;
             }
 
             string path = "/";
-            if (rawCookie.ContainsKey("path") && rawCookie["path"] != null)
+            if (rawCookie.TryGetValue("path", out object? pathObj) && pathObj != null)
             {
-                path = rawCookie["path"].ToString();
+                path = pathObj.ToString()!;
             }
 
             string domain = string.Empty;
-            if (rawCookie.ContainsKey("domain") && rawCookie["domain"] != null)
+            if (rawCookie.TryGetValue("domain", out object? domainObj) && domainObj != null)
             {
-                domain = rawCookie["domain"].ToString();
+                domain = domainObj.ToString()!;
             }
 
             DateTime? expires = null;
-            if (rawCookie.ContainsKey("expiry") && rawCookie["expiry"] != null)
+            if (rawCookie.TryGetValue("expiry", out object? expiryObj) && expiryObj != null)
             {
-                expires = ConvertExpirationTime(rawCookie["expiry"].ToString());
+                expires = ConvertExpirationTime(expiryObj.ToString()!);
             }
 
             bool secure = false;
-            if (rawCookie.ContainsKey("secure") && rawCookie["secure"] != null)
+            if (rawCookie.TryGetValue("secure", out object? secureObj) && secureObj != null)
             {
-                secure = bool.Parse(rawCookie["secure"].ToString());
+                secure = bool.Parse(secureObj.ToString()!);
             }
 
             bool isHttpOnly = false;
-            if (rawCookie.ContainsKey("httpOnly") && rawCookie["httpOnly"] != null)
+            if (rawCookie.TryGetValue("httpOnly", out object? httpOnlyObj) && httpOnlyObj != null)
             {
-                isHttpOnly = bool.Parse(rawCookie["httpOnly"].ToString());
+                isHttpOnly = bool.Parse(httpOnlyObj.ToString()!);
             }
 
-            string sameSite = null;
-            if (rawCookie.ContainsKey("sameSite") && rawCookie["sameSite"] != null)
+            string? sameSite = null;
+            if (rawCookie.TryGetValue("sameSite", out object? sameSiteObj))
             {
-                sameSite = rawCookie["sameSite"].ToString();
+                sameSite = sameSiteObj?.ToString();
             }
 
             return new ReturnedCookie(name, value, domain, path, expires, secure, isHttpOnly, sameSite);
@@ -348,7 +330,7 @@ public override string ToString()
         /// <returns><see langword="true"/> if the specified <see cref="object">Object</see>
         /// is equal to the current <see cref="object">Object</see>; otherwise,
         /// <see langword="false"/>.</returns>
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             // Two cookies are equal if the name and value match
             if (this == obj)
@@ -378,16 +360,15 @@ public override int GetHashCode()
             return this.cookieName.GetHashCode();
         }
 
-        private static string StripPort(string domain)
+        private static string? StripPort(string? domain)
         {
-            return string.IsNullOrEmpty(domain) ? null : domain.Split(':')[0];
+            return string.IsNullOrEmpty(domain) ? null : domain!.Split(':')[0];
         }
 
         private static DateTime? ConvertExpirationTime(string expirationTime)
         {
             DateTime? expires = null;
-            double seconds = 0;
-            if (double.TryParse(expirationTime, NumberStyles.Number, CultureInfo.InvariantCulture, out seconds))
+            if (double.TryParse(expirationTime, NumberStyles.Number, CultureInfo.InvariantCulture, out double seconds))
             {
                 try
                 {

dotnet/src/webdriver/Cookie.cs

@@ -20,6 +20,7 @@
 using OpenQA.Selenium.Internal.Logging;
 using System;
 using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Net.Http;
 using System.Text.Json;
@@ -35,8 +36,12 @@ namespace OpenQA.Selenium.DevTools
     /// Represents a WebSocket connection to a running DevTools instance that can be used to send
     /// commands and receive events.
     ///</summary>
+    [RequiresUnreferencedCode(CDP_AOTIncompatibilityMessage)]
+    [RequiresDynamicCode(CDP_AOTIncompatibilityMessage)]
     public class DevToolsSession : IDevToolsSession
     {
+        internal const string CDP_AOTIncompatibilityMessage = "CDP is not compatible with trimming or AOT.";
+
         /// <summary>
         /// A value indicating that the version of the DevTools protocol in use
         /// by the browser should be automatically detected.
@@ -496,7 +501,7 @@ private async Task InitializeSocketConnection()
             LogTrace("Creating WebSocket");
             this.connection = new WebSocketConnection(this.openConnectionWaitTimeSpan, this.closeConnectionWaitTimeSpan);
             connection.DataReceived += OnConnectionDataReceived;
-            await connection.Start(this.EndpointAddress).ConfigureAwait(false);
+            await connection.Start(this.EndpointAddress!).ConfigureAwait(false);
             LogTrace("WebSocket created");
         }