Merge branch 'master' into v19

Author: kblok

.github/workflows/dotnet.yml

@@ -90,7 +90,7 @@ jobs:
     - name: Test (Linux)
       if: matrix.os == 'ubuntu-latest'
       env:
-        PRODUCT: ${{ matrix.browser }}
+        BROWSER: ${{ matrix.browser }}
         HEADLESS_MODE: ${{ matrix.mode }}
       run: |
           Xvfb :1 -screen 5 1024x768x8 &
@@ -100,7 +100,7 @@ jobs:
     - name: Test (Windows)
       if: matrix.os == 'windows-latest'
       env:
-        PRODUCT: ${{ matrix.browser }}
+        BROWSER: ${{ matrix.browser }}
         HEADLESS_MODE: ${{ matrix.mode }}
       run: |
         cd .\lib\PuppeteerSharp.Tests

lib/PuppeteerSharp.Nunit/PuppeteerTestAttribute.cs

@@ -21,7 +21,7 @@ public class PuppeteerTestAttribute : NUnitAttribute, IApplyToTest
     {
         private static TestExpectation[] _localExpectations;
         private static TestExpectation[] _upstreamExpectations;
-        public static readonly bool IsChrome = Environment.GetEnvironmentVariable("PRODUCT") != "FIREFOX";
+        public static readonly bool IsChrome = Environment.GetEnvironmentVariable("BROWSER") != "FIREFOX";
         // TODO: Change implementation when we implement Webdriver Bidi
         public static readonly bool IsCdp = true;
         public static readonly HeadlessMode Headless =

lib/PuppeteerSharp/BrowserFetcher.cs

@@ -206,8 +206,8 @@ internal static string GetBrowsersLocation()
             return assemblyDirectory.FullName;
         }
 
-        private static string GetDownloadURL(SupportedBrowser product, Platform platform, string baseUrl, string buildId)
-            => _downloadsUrl[product](platform, buildId, baseUrl);
+        private static string GetDownloadURL(SupportedBrowser browser, Platform platform, string baseUrl, string buildId)
+            => _downloadsUrl[browser](platform, buildId, baseUrl);
 
         private static void ExtractTar(string zipPath, string folderPath)
         {

lib/PuppeteerSharp/BrowserFetcherOptions.cs

@@ -16,7 +16,7 @@ public class BrowserFetcherOptions
         public delegate Task CustomFileDownloadAction(string address, string fileName);
 
         /// <summary>
-        /// Product. Defaults to Chrome.
+        /// Browser. Defaults to Chrome.
         /// </summary>
         public SupportedBrowser Browser { get; set; } = SupportedBrowser.Chrome;
 

lib/PuppeteerSharp/LaunchOptions.cs

@@ -53,7 +53,7 @@ public bool Headless
         /// <summary>
         /// Additional arguments to pass to the browser instance. List of Chromium flags can be found <a href="http://peter.sh/experiments/chromium-command-line-switches/">here</a>.
         /// </summary>
-        public string[] Args { get; set; } = Array.Empty<string>();
+        public string[] Args { get; set; } = [];
 
         /// <summary>
         /// Maximum time in milliseconds to wait for the browser instance to start. Defaults to 30000 (30 seconds). Pass 0 to disable timeout.

lib/PuppeteerSharp/Launcher.cs

@@ -64,7 +64,7 @@ public async Task<IBrowser> LaunchAsync(LaunchOptions options)
             {
                 SupportedBrowser.Chrome or SupportedBrowser.Chromium => new ChromeLauncher(executable, options),
                 SupportedBrowser.Firefox => new FirefoxLauncher(executable, options),
-                _ => throw new ArgumentException("Invalid product"),
+                _ => throw new ArgumentException("Invalid browser"),
             };
 
             try
@@ -136,14 +136,14 @@ public async Task<IBrowser> ConnectAsync(ConnectOptions options)
 
                 var version = await connection.SendAsync<BrowserGetVersionResponse>("Browser.getVersion").ConfigureAwait(false);
 
-                var product = version.Product.ToLower(CultureInfo.CurrentCulture).Contains("firefox")
+                var browser = version.Product.ToLower(CultureInfo.CurrentCulture).Contains("firefox")
                   ? SupportedBrowser.Firefox
                   : SupportedBrowser.Chromium;
 
                 var response = await connection.SendAsync<GetBrowserContextsResponse>("Target.getBrowserContexts").ConfigureAwait(false);
                 return await CdpBrowser
                     .CreateAsync(
-                        product,
+                        browser,
                         connection,
                         response.BrowserContextIds,
                         options.AcceptInsecureCerts,