[dotnet][cdp] add support for Chrome 98 and remove support for Chrome 95

Author: titusfortner

dotnet/selenium-dotnet-version.bzl

@@ -7,9 +7,9 @@ SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0", "netstandard2.1", "net5.0"]
 
 SUPPORTED_DEVTOOLS_VERSIONS = [
     "v85",
-    "v95",
     "v96",
-    "v97"
+    "v97",
+    "v98"
 ]
 
 ASSEMBLY_COMPANY = "Selenium Committers"

dotnet/src/webdriver/DevTools/DevToolsDomains.cs

@@ -37,9 +37,9 @@ public abstract class DevToolsDomains
         // added to this dictionary.
         private static readonly Dictionary<int, Type> SupportedDevToolsVersions = new Dictionary<int, Type>()
         {
+            { 98, typeof(V98.V98Domains) },
             { 97, typeof(V97.V97Domains) },
             { 96, typeof(V96.V96Domains) },
-            { 95, typeof(V95.V95Domains) },
             { 85, typeof(V85.V85Domains) }
         };
 

dotnet/src/webdriver/DevTools/v95/V95Domains.cs renamed to dotnet/src/webdriver/DevTools/v98/V98Domains.cs

@@ -1,4 +1,4 @@
-// <copyright file="V95Domains.cs" company="WebDriver Committers">
+// <copyright file="V98Domains.cs" company="WebDriver Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -19,24 +19,24 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenQA.Selenium.DevTools.V95
+namespace OpenQA.Selenium.DevTools.V98
 {
     /// <summary>
-    /// Class containing the domain implementation for version 94 of the DevTools Protocol.
+    /// Class containing the domain implementation for version 98 of the DevTools Protocol.
     /// </summary>
-    public class V95Domains : DevToolsDomains
+    public class V98Domains : DevToolsDomains
     {
         private DevToolsSessionDomains domains;
 
-        public V95Domains(DevToolsSession session)
+        public V98Domains(DevToolsSession session)
         {
             this.domains = new DevToolsSessionDomains(session);
         }
 
         /// <summary>
         /// Gets the DevTools Protocol version for which this class is valid.
         /// </summary>
-        public static int DevToolsVersion => 95;
+        public static int DevToolsVersion => 98;
 
         /// <summary>
         /// Gets the version-specific domains for the DevTools session. This value must be cast to a version specific type to be at all useful.
@@ -46,21 +46,21 @@ public V95Domains(DevToolsSession session)
         /// <summary>
         /// Gets the object used for manipulating network information in the browser.
         /// </summary>
-        public override DevTools.Network Network => new V95Network(domains.Network, domains.Fetch);
+        public override DevTools.Network Network => new V98Network(domains.Network, domains.Fetch);
 
         /// <summary>
         /// Gets the object used for manipulating the browser's JavaScript execution.
         /// </summary>
-        public override JavaScript JavaScript => new V95JavaScript(domains.Runtime, domains.Page);
+        public override JavaScript JavaScript => new V98JavaScript(domains.Runtime, domains.Page);
 
         /// <summary>
         /// Gets the object used for manipulating DevTools Protocol targets.
         /// </summary>
-        public override DevTools.Target Target => new V95Target(domains.Target);
+        public override DevTools.Target Target => new V98Target(domains.Target);
 
         /// <summary>
         /// Gets the object used for manipulating the browser's logs.
         /// </summary>
-        public override DevTools.Log Log => new V95Log(domains.Log);
+        public override DevTools.Log Log => new V98Log(domains.Log);
     }
 }

dotnet/src/webdriver/DevTools/v95/V95JavaScript.cs renamed to dotnet/src/webdriver/DevTools/v98/V98JavaScript.cs

@@ -1,4 +1,4 @@
-// <copyright file="V95JavaScript.cs" company="WebDriver Committers">
+// <copyright file="V98JavaScript.cs" company="WebDriver Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -18,25 +18,25 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using OpenQA.Selenium.DevTools.V95.Page;
-using OpenQA.Selenium.DevTools.V95.Runtime;
+using OpenQA.Selenium.DevTools.V98.Page;
+using OpenQA.Selenium.DevTools.V98.Runtime;
 
-namespace OpenQA.Selenium.DevTools.V95
+namespace OpenQA.Selenium.DevTools.V98
 {
     /// <summary>
     /// Class containing the JavaScript implementation for version 89 of the DevTools Protocol.
     /// </summary>
-    public class V95JavaScript : JavaScript
+    public class V98JavaScript : JavaScript
     {
         private RuntimeAdapter runtime;
         private PageAdapter page;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="V95JavaScript"/> class.
+        /// Initializes a new instance of the <see cref="V98JavaScript"/> class.
         /// </summary>
         /// <param name="runtime">The DevTools Protocol adapter for the Runtime domain.</param>
         /// <param name="page">The DevTools Protocol adapter for the Page domain.</param>
-        public V95JavaScript(RuntimeAdapter runtime, PageAdapter page)
+        public V98JavaScript(RuntimeAdapter runtime, PageAdapter page)
         {
             this.runtime = runtime;
             this.page = page;

dotnet/src/webdriver/DevTools/v95/V95Log.cs renamed to dotnet/src/webdriver/DevTools/v98/V98Log.cs

@@ -1,4 +1,4 @@
-// <copyright file="V95Log.cs" company="WebDriver Committers">
+// <copyright file="V98Log.cs" company="WebDriver Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -20,22 +20,22 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using OpenQA.Selenium.DevTools.V95.Log;
+using OpenQA.Selenium.DevTools.V98.Log;
 
-namespace OpenQA.Selenium.DevTools.V95
+namespace OpenQA.Selenium.DevTools.V98
 {
     /// <summary>
     /// Class containing the browser's log as referenced by version 89 of the DevTools Protocol.
     /// </summary>
-    public class V95Log : DevTools.Log
+    public class V98Log : DevTools.Log
     {
         private LogAdapter adapter;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="V95Log"/> class.
+        /// Initializes a new instance of the <see cref="V98Log"/> class.
         /// </summary>
         /// <param name="adapter">The adapter for the Log domain.</param>
-        public V95Log(LogAdapter adapter)
+        public V98Log(LogAdapter adapter)
         {
             this.adapter = adapter;
             this.adapter.EntryAdded += OnAdapterEntryAdded;

dotnet/src/webdriver/DevTools/v95/V95Network.cs renamed to dotnet/src/webdriver/DevTools/v98/V98Network.cs

@@ -1,4 +1,4 @@
-// <copyright file="V95Network.cs" company="WebDriver Committers">
+// <copyright file="V98Network.cs" company="WebDriver Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -20,25 +20,25 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
-using OpenQA.Selenium.DevTools.V95.Fetch;
-using OpenQA.Selenium.DevTools.V95.Network;
+using OpenQA.Selenium.DevTools.V98.Fetch;
+using OpenQA.Selenium.DevTools.V98.Network;
 
-namespace OpenQA.Selenium.DevTools.V95
+namespace OpenQA.Selenium.DevTools.V98
 {
     /// <summary>
     /// Class providing functionality for manipulating network calls using version 89 of the DevTools Protocol
     /// </summary>
-    public class V95Network : DevTools.Network
+    public class V98Network : DevTools.Network
     {
         private FetchAdapter fetch;
         private NetworkAdapter network;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="V95Network"/> class.
+        /// Initializes a new instance of the <see cref="V98Network"/> class.
         /// </summary>
         /// <param name="network">The adapter for the Network domain.</param>
         /// <param name="fetch">The adapter for the Fetch domain.</param>
-        public V95Network(NetworkAdapter network, FetchAdapter fetch)
+        public V98Network(NetworkAdapter network, FetchAdapter fetch)
         {
             this.network = network;
             this.fetch = fetch;
@@ -80,12 +80,12 @@ public override async Task DisableNetwork()
         /// <returns>A task that represents the asynchronous operation.</returns>
         public override async Task EnableFetchForAllPatterns()
         {
-            await fetch.Enable(new OpenQA.Selenium.DevTools.V95.Fetch.EnableCommandSettings()
+            await fetch.Enable(new OpenQA.Selenium.DevTools.V98.Fetch.EnableCommandSettings()
             {
-                Patterns = new OpenQA.Selenium.DevTools.V95.Fetch.RequestPattern[]
+                Patterns = new OpenQA.Selenium.DevTools.V98.Fetch.RequestPattern[]
                 {
-                    new OpenQA.Selenium.DevTools.V95.Fetch.RequestPattern() { UrlPattern = "*", RequestStage = RequestStage.Request },
-                    new OpenQA.Selenium.DevTools.V95.Fetch.RequestPattern() { UrlPattern = "*", RequestStage = RequestStage.Response }
+                    new OpenQA.Selenium.DevTools.V98.Fetch.RequestPattern() { UrlPattern = "*", RequestStage = RequestStage.Request },
+                    new OpenQA.Selenium.DevTools.V98.Fetch.RequestPattern() { UrlPattern = "*", RequestStage = RequestStage.Response }
                 },
                 HandleAuthRequests = true
             });
@@ -208,9 +208,9 @@ public override async Task ContinueWithAuth(string requestId, string userName, s
             await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings()
             {
                 RequestId = requestId,
-                AuthChallengeResponse = new V95.Fetch.AuthChallengeResponse()
+                AuthChallengeResponse = new V98.Fetch.AuthChallengeResponse()
                 {
-                    Response = V95.Fetch.AuthChallengeResponseResponseValues.ProvideCredentials,
+                    Response = V98.Fetch.AuthChallengeResponseResponseValues.ProvideCredentials,
                     Username = userName,
                     Password = password
                 }
@@ -227,9 +227,9 @@ public override async Task CancelAuth(string requestId)
             await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings()
             {
                 RequestId = requestId,
-                AuthChallengeResponse = new OpenQA.Selenium.DevTools.V95.Fetch.AuthChallengeResponse()
+                AuthChallengeResponse = new OpenQA.Selenium.DevTools.V98.Fetch.AuthChallengeResponse()
                 {
-                    Response = V95.Fetch.AuthChallengeResponseResponseValues.CancelAuth
+                    Response = V98.Fetch.AuthChallengeResponseResponseValues.CancelAuth
                 }
             });
         }

dotnet/src/webdriver/DevTools/v95/V95Target.cs renamed to dotnet/src/webdriver/DevTools/v98/V98Target.cs

@@ -1,4 +1,4 @@
-// <copyright file="V95Target.cs" company="WebDriver Committers">
+// <copyright file="V98Target.cs" company="WebDriver Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -21,22 +21,22 @@
 using System.Collections.ObjectModel;
 using System.Text;
 using System.Threading.Tasks;
-using OpenQA.Selenium.DevTools.V95.Target;
+using OpenQA.Selenium.DevTools.V98.Target;
 
-namespace OpenQA.Selenium.DevTools.V95
+namespace OpenQA.Selenium.DevTools.V98
 {
     /// <summary>
-    /// Class providing functionality for manipulating targets for version 94 of the DevTools Protocol
+    /// Class providing functionality for manipulating targets for version 98 of the DevTools Protocol
     /// </summary>
-    public class V95Target : DevTools.Target
+    public class V98Target : DevTools.Target
     {
         private TargetAdapter adapter;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="V95Target"/> class.
+        /// Initializes a new instance of the <see cref="V98Target"/> class.
         /// </summary>
         /// <param name="adapter">The adapter for the Target domain.</param>
-        public V95Target(TargetAdapter adapter)
+        public V98Target(TargetAdapter adapter)
         {
             this.adapter = adapter;
             adapter.DetachedFromTarget += OnDetachedFromTarget;

dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd

@@ -27,13 +27,6 @@ if not exist  "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v85\DevToolsSession
   popd
 )
 
-if not exist  "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v95\DevToolsSessionDomains.cs" (
-  echo Generating CDP code for version 95
-  pushd "%1..\..\.."
-  bazel build //dotnet/src/webdriver/cdp:generate-v95
-  popd
-)
-
 if not exist  "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v96\DevToolsSessionDomains.cs" (
   echo Generating CDP code for version 96
   pushd "%1..\..\.."
@@ -47,3 +40,10 @@ if not exist  "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v97\DevToolsSession
   bazel build //dotnet/src/webdriver/cdp:generate-v97
   popd
 )
+
+if not exist  "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v98\DevToolsSessionDomains.cs" (
+  echo Generating CDP code for version 98
+  pushd "%1..\..\.."
+  bazel build //dotnet/src/webdriver/cdp:generate-v98
+  popd
+)

dotnet/src/webdriver/WebDriver.csproj.prebuild.sh

@@ -23,12 +23,6 @@ then
   bazel build //dotnet/src/webdriver/cdp:generate-v85
 fi
 
-if [[ ! -f "$1../../../bazel-bin/dotnet/src/webdriver/cdp/v95/DevToolsSessionDomains.cs" ]]
-then
-  echo "Generating CDP code for version 95"
-  bazel build //dotnet/src/webdriver/cdp:generate-v95
-fi
-
 if [[ ! -f "$1../../../bazel-bin/dotnet/src/webdriver/cdp/v96/DevToolsSessionDomains.cs" ]]
 then
   echo "Generating CDP code for version 96"
@@ -40,3 +34,9 @@ then
   echo "Generating CDP code for version 97"
   bazel build //dotnet/src/webdriver/cdp:generate-v97
 fi
+
+if [[ ! -f "$1../../../bazel-bin/dotnet/src/webdriver/cdp/v98/DevToolsSessionDomains.cs" ]]
+then
+  echo "Generating CDP code for version 98"
+  bazel build //dotnet/src/webdriver/cdp:generate-v98
+fi