Resolve conflicts

Author: aguspe

dotnet/src/webdriver/DevTools/DevToolsCommandData.cs

@@ -35,7 +35,7 @@ public class DevToolsCommandData
         /// <summary>
         /// Initializes a new instance of the DevToolsCommandData class.
         /// </summary>
-        /// <param name="commandId">The ID of the commmand execution.</param>
+        /// <param name="commandId">The ID of the command execution.</param>
         /// <param name="commandName">The method name of the DevTools command.</param>
         /// <param name="commandParameters">The parameters of the DevTools command.</param>
         /// <exception cref="ArgumentNullException">If <paramref name="commandName"/> is <see langword="null"/>.</exception>
@@ -47,7 +47,7 @@ public DevToolsCommandData(long commandId, string commandName, JsonNode commandP
         /// <summary>
         /// Initializes a new instance of the DevToolsCommandData class.
         /// </summary>
-        /// <param name="commandId">The ID of the commmand execution.</param>
+        /// <param name="commandId">The ID of the command execution.</param>
         /// <param name="sessionId">The session ID of the current command execution.</param>
         /// <param name="commandName">The method name of the DevTools command.</param>
         /// <param name="commandParameters">The parameters of the DevTools command.</param>

dotnet/src/webdriver/DevTools/DevToolsDomains.cs

@@ -82,7 +82,7 @@ public abstract class DevToolsDomains
         /// Initializes the supplied DevTools session's domains for the specified browser version.
         /// </summary>
         /// <param name="protocolVersion">The version of the DevTools Protocol to use.</param>
-        /// <param name="session">The <see cref="DevToolsSession"/> for which to initialiize the domains.</param>
+        /// <param name="session">The <see cref="DevToolsSession"/> for which to initialize the domains.</param>
         /// <returns>The <see cref="DevToolsDomains"/> object containing the version-specific domains.</returns>
         /// <exception cref="ArgumentException">If <paramref name="protocolVersion"/> is negative.</exception>
         /// <exception cref="WebDriverException">If the desired protocol version is not supported.</exception>
@@ -95,7 +95,7 @@ public static DevToolsDomains InitializeDomains(int protocolVersion, DevToolsSes
         /// Initializes the supplied DevTools session's domains for the specified browser version within the specified number of versions.
         /// </summary>
         /// <param name="protocolVersion">The version of the DevTools Protocol to use.</param>
-        /// <param name="session">The <see cref="DevToolsSession"/> for which to initialiize the domains.</param>
+        /// <param name="session">The <see cref="DevToolsSession"/> for which to initialize the domains.</param>
         /// <param name="versionRange">The range of versions within which to match the provided version number. Defaults to 5 versions.</param>
         /// <returns>The <see cref="DevToolsDomains"/> object containing the version-specific domains.</returns>
         /// <exception cref="ArgumentException">If <paramref name="protocolVersion"/> is negative.</exception>

dotnet/src/webdriver/DevTools/DevToolsSession.cs

@@ -50,7 +50,7 @@ public class DevToolsSessionLogMessageEventArgs : EventArgs
         /// <param name="level">The level of the log message.</param>
         /// <param name="message">The content of the log message.</param>
         /// <param name="args">Arguments to be substituted when the message is formatted.</param>
-        public DevToolsSessionLogMessageEventArgs(DevToolsSessionLogLevel level, string message, params object[] args)
+        public DevToolsSessionLogMessageEventArgs(DevToolsSessionLogLevel level, string message, params object?[] args)
         {
             Level = level;
             Message = string.Format(message, args);

dotnet/src/webdriver/DevTools/DevToolsSessionLogMessageEventArgs.cs

@@ -88,8 +88,7 @@ public string V8VersionNumber
             get
             {
                 //Get the v8 version
-                var v8VersionRegex = new Regex(@"^(\d+)\.(\d+)\.(\d+)(\.\d+.*)?");
-                var v8VersionMatch = v8VersionRegex.Match(V8Version);
+                var v8VersionMatch = Regex.Match(V8Version, @"^(\d+)\.(\d+)\.(\d+)(\.\d+.*)?");
                 if (v8VersionMatch.Success == false || v8VersionMatch.Groups.Count < 4)
                 {
                     throw new InvalidOperationException($"Unable to determine v8 version number from v8 version string ({V8Version})");
@@ -115,8 +114,7 @@ public string WebKitVersionHash
             get
             {
                 //Get the webkit version hash.
-                var webkitVersionRegex = new Regex(@"\s\(@(\b[0-9a-f]{5,40}\b)");
-                var webkitVersionMatch = webkitVersionRegex.Match(WebKitVersion);
+                var webkitVersionMatch = Regex.Match(WebKitVersion, @"\s\(@(\b[0-9a-f]{5,40}\b)");
                 if (webkitVersionMatch.Success == false || webkitVersionMatch.Groups.Count != 2)
                 {
                     throw new InvalidOperationException($"Unable to determine webkit version hash from webkit version string ({WebKitVersion})");

dotnet/src/webdriver/DevTools/DevToolsVersionInfo.cs

@@ -23,6 +23,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
@@ -34,18 +36,18 @@ public interface IDevToolsSession : IDisposable
         /// <summary>
         /// Event raised when the DevToolsSession logs informational messages.
         /// </summary>
-        event EventHandler<DevToolsSessionLogMessageEventArgs> LogMessage;
+        event EventHandler<DevToolsSessionLogMessageEventArgs>? LogMessage;
 
         /// <summary>
         /// Event raised an event notification is received from the DevTools session.
         /// </summary>
-        event EventHandler<DevToolsEventReceivedEventArgs> DevToolsEventReceived;
+        event EventHandler<DevToolsEventReceivedEventArgs>? DevToolsEventReceived;
 
         /// <summary>
-        /// Gets the domains that are valid for the specfied version of Developer Tools connection.
+        /// Gets the domains that are valid for the specified version of Developer Tools connection.
         /// </summary>
         /// <typeparam name="T">
-        /// A <see cref="DevToolsSessionDomains"/> type specific to the version of Develoepr Tools with which to communicate.
+        /// A <see cref="DevToolsSessionDomains"/> type specific to the version of Developer Tools with which to communicate.
         /// </typeparam>
         /// <returns>The version-specific domains for this Developer Tools connection.</returns>
         T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains;
@@ -59,7 +61,7 @@ public interface IDevToolsSession : IDisposable
         /// <param name="millisecondsTimeout">The execution timeout of the command in milliseconds.</param>
         /// <param name="throwExceptionIfResponseNotReceived"><see langword="true"/> to throw an exception if a response is not received; otherwise, <see langword="false"/>.</param>
         /// <returns>The command response object implementing the <see cref="ICommandResponse{T}"/> interface.</returns>
-        Task<ICommandResponse<TCommand>> SendCommand<TCommand>(TCommand command, CancellationToken cancellationToken, int? millisecondsTimeout, bool throwExceptionIfResponseNotReceived)
+        Task<ICommandResponse<TCommand>?> SendCommand<TCommand>(TCommand command, CancellationToken cancellationToken, int? millisecondsTimeout, bool throwExceptionIfResponseNotReceived)
             where TCommand : ICommand;
 
         /// <summary>
@@ -72,7 +74,7 @@ Task<ICommandResponse<TCommand>> SendCommand<TCommand>(TCommand command, Cancell
         /// <param name="millisecondsTimeout">The execution timeout of the command in milliseconds.</param>
         /// <param name="throwExceptionIfResponseNotReceived"><see langword="true"/> to throw an exception if a response is not received; otherwise, <see langword="false"/>.</param>
         /// <returns>The command response object implementing the <see cref="ICommandResponse{T}"/> interface.</returns>
-        Task<TCommandResponse> SendCommand<TCommand, TCommandResponse>(TCommand command, CancellationToken cancellationToken, int? millisecondsTimeout, bool throwExceptionIfResponseNotReceived)
+        Task<TCommandResponse?> SendCommand<TCommand, TCommandResponse>(TCommand command, CancellationToken cancellationToken, int? millisecondsTimeout, bool throwExceptionIfResponseNotReceived)
             where TCommand : ICommand
             where TCommandResponse : ICommandResponse<TCommand>;
 

dotnet/src/webdriver/DevTools/IDevToolsSession.cs

@@ -20,6 +20,8 @@
 using System;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
@@ -30,17 +32,17 @@ public abstract class JavaScript
         /// <summary>
         /// Occurs when a JavaScript script binding is called.
         /// </summary>
-        public event EventHandler<BindingCalledEventArgs> BindingCalled;
+        public event EventHandler<BindingCalledEventArgs>? BindingCalled;
 
         /// <summary>
         /// Occurs when the browser's JavaScript console API is called.
         /// </summary>
-        public event EventHandler<ConsoleApiCalledEventArgs> ConsoleApiCalled;
+        public event EventHandler<ConsoleApiCalledEventArgs>? ConsoleApiCalled;
 
         /// <summary>
         /// Occurs when a JavaScript exception is thrown.
         /// </summary>
-        public event EventHandler<ExceptionThrownEventArgs> ExceptionThrown;
+        public event EventHandler<ExceptionThrownEventArgs>? ExceptionThrown;
 
         /// <summary>
         /// Asynchronously enables the Runtime domain in the DevTools Protocol.

dotnet/src/webdriver/DevTools/JavaScript.cs

@@ -20,6 +20,8 @@
 using System;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
@@ -30,7 +32,7 @@ public abstract class Log
         /// <summary>
         /// Occurs when an entry is added to the browser's log.
         /// </summary>
-        public event EventHandler<EntryAddedEventArgs> EntryAdded;
+        public event EventHandler<EntryAddedEventArgs>? EntryAdded;
 
         /// <summary>
         /// Asynchronously enables manipulation of the browser's log.

dotnet/src/webdriver/DevTools/Log.cs

@@ -21,6 +21,8 @@
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
@@ -31,12 +33,12 @@ public abstract class Target
         /// <summary>
         /// Occurs when a target is detached.
         /// </summary>
-        public event EventHandler<TargetDetachedEventArgs> TargetDetached;
+        public event EventHandler<TargetDetachedEventArgs>? TargetDetached;
 
         /// <summary>
         /// Occurs when a target is attached.
         /// </summary>
-        public event EventHandler<TargetAttachedEventArgs> TargetAttached;
+        public event EventHandler<TargetAttachedEventArgs>? TargetAttached;
 
         /// <summary>
         /// Asynchronously gets the targets available for this session.
@@ -46,7 +48,7 @@ public abstract class Target
         /// contains the list of <see cref="TargetInfo"/> objects describing the
         /// targets available for this session.
         /// </returns>
-        public abstract Task<ReadOnlyCollection<TargetInfo>> GetTargets(Object settings = null);
+        public abstract Task<ReadOnlyCollection<TargetInfo>> GetTargets(object? settings = null);
 
         /// <summary>
         /// Asynchronously attaches to a target.
@@ -66,7 +68,7 @@ public abstract class Target
         /// <returns>
         /// A task representing the asynchronous detach operation.
         /// </returns>
-        public abstract Task DetachFromTarget(string sessionId = null, string targetId = null);
+        public abstract Task DetachFromTarget(string? sessionId = null, string? targetId = null);
 
         /// <summary>
         /// Asynchronously sets the DevTools Protocol connection to automatically attach to new targets.

dotnet/src/webdriver/DevTools/Target.cs

@@ -17,46 +17,69 @@
 // under the License.
 // </copyright>
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
     /// Represents information about the target of a DevTools Protocol command
     /// </summary>
     public class TargetInfo
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TargetInfo"/> type.
+        /// </summary>
+        /// <param name="targetId">The ID of the target.</param>
+        /// <param name="type">The type of target.</param>
+        /// <param name="title">The title of the target.</param>
+        /// <param name="url">The URL of the target.</param>
+        /// <param name="isAttached">Whether the protocol is attached to the target.</param>
+        /// <param name="openerId">The ID of the opener of the target.</param>
+        /// <param name="browserContextId">The browser context ID.</param>
+        public TargetInfo(string targetId, string type, string title, string url, bool isAttached, string? openerId, string? browserContextId)
+        {
+            this.TargetId = targetId;
+            this.Type = type;
+            this.Title = title;
+            this.Url = url;
+            this.IsAttached = isAttached;
+            this.OpenerId = openerId;
+            this.BrowserContextId = browserContextId;
+        }
+
         /// <summary>
         /// Gets the ID of the target.
         /// </summary>
-        public string TargetId { get; internal set; }
+        public string TargetId { get; }
 
         /// <summary>
         /// Gets the type of target.
         /// </summary>
-        public string Type { get; internal set; }
+        public string Type { get; }
 
         /// <summary>
         /// Gets the title of the target.
         /// </summary>
-        public string Title { get; internal set; }
+        public string Title { get; }
 
         /// <summary>
         /// Gets the URL of the target.
         /// </summary>
-        public string Url { get; internal set; }
+        public string Url { get; }
 
         /// <summary>
         /// Gets a value indicating if the protocol is attached to the target.
         /// </summary>
-        public bool IsAttached { get; internal set; }
+        public bool IsAttached { get; }
 
         /// <summary>
         /// Gets the ID of the opener of the target.
         /// </summary>
-        public string OpenerId { get; internal set; }
+        public string? OpenerId { get; }
 
         /// <summary>
         /// Gets the browser context ID.
         /// </summary>
-        public string BrowserContextId { get; internal set; }
+        public string? BrowserContextId { get; }
     }
 }