Merge branch 'trunk' into setup

Author: VietND96

dotnet/src/webdriver/Chromium/ChromiumDriverService.cs

@@ -208,7 +208,7 @@ protected static string ChromiumDriverServiceFileName(string fileName = DefaultC
             // straightforward as you might hope.
             // See: http://mono.wikia.com/wiki/Detecting_the_execution_platform
             // and https://msdn.microsoft.com/en-us/library/3a8hyw88(v=vs.110).aspx
-            const int PlatformMonoUnixValue = 128;
+            const PlatformID PlatformIDMonoUnix = (PlatformID)128;
 
             switch (Environment.OSVersion.Platform)
             {
@@ -221,17 +221,14 @@ protected static string ChromiumDriverServiceFileName(string fileName = DefaultC
 
                 case PlatformID.MacOSX:
                 case PlatformID.Unix:
+                case PlatformIDMonoUnix:
                     break;
 
                 // Don't handle the Xbox case. Let default handle it.
                 // case PlatformID.Xbox:
                 //     break;
-                default:
-                    if ((int)Environment.OSVersion.Platform == PlatformMonoUnixValue)
-                    {
-                        break;
-                    }
 
+                default:
                     throw new WebDriverException("Unsupported platform: " + Environment.OSVersion.Platform);
             }
 

dotnet/src/webdriver/Firefox/FirefoxDriverService.cs

@@ -263,7 +263,7 @@ private static string FirefoxDriverServiceFileName()
             // straightforward as you might hope.
             // See: http://mono.wikia.com/wiki/Detecting_the_execution_platform
             // and https://msdn.microsoft.com/en-us/library/3a8hyw88(v=vs.110).aspx
-            const int PlatformMonoUnixValue = 128;
+            const PlatformID PlatformIDMonoUnix = (PlatformID)128;
 
             switch (Environment.OSVersion.Platform)
             {
@@ -276,17 +276,13 @@ private static string FirefoxDriverServiceFileName()
 
                 case PlatformID.MacOSX:
                 case PlatformID.Unix:
+                case PlatformIDMonoUnix:
                     break;
 
                 // Don't handle the Xbox case. Let default handle it.
                 // case PlatformID.Xbox:
                 //     break;
                 default:
-                    if ((int)Environment.OSVersion.Platform == PlatformMonoUnixValue)
-                    {
-                        break;
-                    }
-
                     throw new WebDriverException("Unsupported platform: " + Environment.OSVersion.Platform);
             }
 

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);
     }
 }

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; }
     }
 }

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;

dotnet/src/webdriver/Internal/IFindsElement.cs

@@ -19,6 +19,8 @@
 
 using System.Collections.ObjectModel;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Internal
 {
     /// <summary>

dotnet/src/webdriver/Internal/IHasCapabilitiesDictionary.cs

@@ -19,6 +19,8 @@
 
 using System.Collections.Generic;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Internal
 {
     /// <summary>

dotnet/src/webdriver/Internal/Logging/ConsoleLogHandler.cs

@@ -19,6 +19,8 @@
 
 using System;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Internal.Logging
 {
     /// <summary>

dotnet/src/webdriver/Internal/Logging/FileLogHandler.cs

@@ -20,6 +20,8 @@
 using System;
 using System.IO;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Internal.Logging
 {
     /// <summary>
@@ -40,6 +42,7 @@ public class FileLogHandler : ILogHandler, IDisposable
         /// Initializes a new instance of the <see cref="FileLogHandler"/> class with the specified file path.
         /// </summary>
         /// <param name="filePath">The path of the log file.</param>
+        /// <exception cref="ArgumentException">If <paramref name="filePath"/> is <see langword="null"/> or <see cref="string.Empty"/>.</exception>
         public FileLogHandler(string filePath)
             : this(filePath, overwrite: true)
         {
@@ -51,6 +54,7 @@ public FileLogHandler(string filePath)
         /// </summary>
         /// <param name="filePath">The path of the log file.</param>
         /// <param name="overwrite">Specifies whether the file should be overwritten if it exists on the disk.</param>
+        /// <exception cref="ArgumentException">If <paramref name="filePath"/> is <see langword="null"/> or <see cref="string.Empty"/>.</exception>
         public FileLogHandler(string filePath, bool overwrite)
         {
             if (string.IsNullOrEmpty(filePath)) throw new ArgumentException("File log path cannot be null or empty.", nameof(filePath));
@@ -112,9 +116,9 @@ protected virtual void Dispose(bool disposing)
                     if (disposing)
                     {
                         _streamWriter?.Dispose();
-                        _streamWriter = null;
+                        _streamWriter = null!;
                         _fileStream?.Dispose();
-                        _fileStream = null;
+                        _fileStream = null!;
                     }
 
                     _isDisposed = true;

dotnet/src/webdriver/Internal/Logging/ILogContext.cs

@@ -19,6 +19,8 @@
 
 using System;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Internal.Logging
 {
     /// <summary>