diff --git a/dotnet/selenium-dotnet-version.bzl b/dotnet/selenium-dotnet-version.bzl index b0f825defdbf5..f4f5f3d4403ab 100644 --- a/dotnet/selenium-dotnet-version.bzl +++ b/dotnet/selenium-dotnet-version.bzl @@ -6,9 +6,9 @@ SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0"] SUPPORTED_DEVTOOLS_VERSIONS = [ "v85", - "v115", "v116", "v117", + "v118", ] ASSEMBLY_COMPANY = "Selenium Committers" diff --git a/dotnet/src/webdriver/DevTools/DevToolsDomains.cs b/dotnet/src/webdriver/DevTools/DevToolsDomains.cs index d92f88c6445d6..aeb63fe540f83 100644 --- a/dotnet/src/webdriver/DevTools/DevToolsDomains.cs +++ b/dotnet/src/webdriver/DevTools/DevToolsDomains.cs @@ -37,9 +37,9 @@ public abstract class DevToolsDomains // added to this dictionary. private static readonly Dictionary SupportedDevToolsVersions = new Dictionary() { + { 118, typeof(V118.V118Domains) }, { 117, typeof(V117.V117Domains) }, { 116, typeof(V116.V116Domains) }, - { 115, typeof(V115.V115Domains) }, { 85, typeof(V85.V85Domains) } }; diff --git a/dotnet/src/webdriver/DevTools/v115/V115Domains.cs b/dotnet/src/webdriver/DevTools/v118/V118Domains.cs similarity index 81% rename from dotnet/src/webdriver/DevTools/v115/V115Domains.cs rename to dotnet/src/webdriver/DevTools/v118/V118Domains.cs index 00033bc264217..5c900f297298d 100644 --- a/dotnet/src/webdriver/DevTools/v115/V115Domains.cs +++ b/dotnet/src/webdriver/DevTools/v118/V118Domains.cs @@ -1,4 +1,4 @@ -// +// // 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,12 +19,12 @@ using System.Collections.Generic; using System.Text; -namespace OpenQA.Selenium.DevTools.V115 +namespace OpenQA.Selenium.DevTools.V118 { /// - /// Class containing the domain implementation for version 115 of the DevTools Protocol. + /// Class containing the domain implementation for version 118 of the DevTools Protocol. /// - public class V115Domains : DevToolsDomains + public class V118Domains : DevToolsDomains { private DevToolsSessionDomains domains; @@ -32,7 +32,7 @@ public class V115Domains : DevToolsDomains /// Initializes a new instance of the V115Domains class. /// /// The DevToolsSession to use with this set of domains. - public V115Domains(DevToolsSession session) + public V118Domains(DevToolsSession session) { this.domains = new DevToolsSessionDomains(session); } @@ -40,7 +40,7 @@ public V115Domains(DevToolsSession session) /// /// Gets the DevTools Protocol version for which this class is valid. /// - public static int DevToolsVersion => 115; + public static int DevToolsVersion => 118; /// /// Gets the version-specific domains for the DevTools session. This value must be cast to a version specific type to be at all useful. @@ -50,21 +50,21 @@ public V115Domains(DevToolsSession session) /// /// Gets the object used for manipulating network information in the browser. /// - public override DevTools.Network Network => new V115Network(domains.Network, domains.Fetch); + public override DevTools.Network Network => new V118Network(domains.Network, domains.Fetch); /// /// Gets the object used for manipulating the browser's JavaScript execution. /// - public override JavaScript JavaScript => new V115JavaScript(domains.Runtime, domains.Page); + public override JavaScript JavaScript => new V118JavaScript(domains.Runtime, domains.Page); /// /// Gets the object used for manipulating DevTools Protocol targets. /// - public override DevTools.Target Target => new V115Target(domains.Target); + public override DevTools.Target Target => new V118Target(domains.Target); /// /// Gets the object used for manipulating the browser's logs. /// - public override DevTools.Log Log => new V115Log(domains.Log); + public override DevTools.Log Log => new V118Log(domains.Log); } } diff --git a/dotnet/src/webdriver/DevTools/v115/V115JavaScript.cs b/dotnet/src/webdriver/DevTools/v118/V118JavaScript.cs similarity index 94% rename from dotnet/src/webdriver/DevTools/v115/V115JavaScript.cs rename to dotnet/src/webdriver/DevTools/v118/V118JavaScript.cs index 30605db994601..95d3ef164ec83 100644 --- a/dotnet/src/webdriver/DevTools/v115/V115JavaScript.cs +++ b/dotnet/src/webdriver/DevTools/v118/V118JavaScript.cs @@ -1,4 +1,4 @@ -// +// // 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.V115.Page; -using OpenQA.Selenium.DevTools.V115.Runtime; +using OpenQA.Selenium.DevTools.V118.Page; +using OpenQA.Selenium.DevTools.V118.Runtime; -namespace OpenQA.Selenium.DevTools.V115 +namespace OpenQA.Selenium.DevTools.V118 { /// - /// Class containing the JavaScript implementation for version 115 of the DevTools Protocol. + /// Class containing the JavaScript implementation for version 118 of the DevTools Protocol. /// - public class V115JavaScript : JavaScript + public class V118JavaScript : JavaScript { private RuntimeAdapter runtime; private PageAdapter page; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The DevTools Protocol adapter for the Runtime domain. /// The DevTools Protocol adapter for the Page domain. - public V115JavaScript(RuntimeAdapter runtime, PageAdapter page) + public V118JavaScript(RuntimeAdapter runtime, PageAdapter page) { this.runtime = runtime; this.page = page; diff --git a/dotnet/src/webdriver/DevTools/v115/V115Log.cs b/dotnet/src/webdriver/DevTools/v118/V118Log.cs similarity index 89% rename from dotnet/src/webdriver/DevTools/v115/V115Log.cs rename to dotnet/src/webdriver/DevTools/v118/V118Log.cs index c2d1611c33a67..099da81dbefc8 100644 --- a/dotnet/src/webdriver/DevTools/v115/V115Log.cs +++ b/dotnet/src/webdriver/DevTools/v118/V118Log.cs @@ -1,4 +1,4 @@ -// +// // 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.V115.Log; +using OpenQA.Selenium.DevTools.V118.Log; -namespace OpenQA.Selenium.DevTools.V115 +namespace OpenQA.Selenium.DevTools.V118 { /// - /// Class containing the browser's log as referenced by version 115 of the DevTools Protocol. + /// Class containing the browser's log as referenced by version 118 of the DevTools Protocol. /// - public class V115Log : DevTools.Log + public class V118Log : DevTools.Log { private LogAdapter adapter; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The adapter for the Log domain. - public V115Log(LogAdapter adapter) + public V118Log(LogAdapter adapter) { this.adapter = adapter; this.adapter.EntryAdded += OnAdapterEntryAdded; diff --git a/dotnet/src/webdriver/DevTools/v115/V115Network.cs b/dotnet/src/webdriver/DevTools/v118/V118Network.cs similarity index 95% rename from dotnet/src/webdriver/DevTools/v115/V115Network.cs rename to dotnet/src/webdriver/DevTools/v118/V118Network.cs index 6fbf3930173e5..38d414ae202de 100644 --- a/dotnet/src/webdriver/DevTools/v115/V115Network.cs +++ b/dotnet/src/webdriver/DevTools/v118/V118Network.cs @@ -1,4 +1,4 @@ -// +// // 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.V115.Fetch; -using OpenQA.Selenium.DevTools.V115.Network; +using OpenQA.Selenium.DevTools.V118.Fetch; +using OpenQA.Selenium.DevTools.V118.Network; -namespace OpenQA.Selenium.DevTools.V115 +namespace OpenQA.Selenium.DevTools.V118 { /// - /// Class providing functionality for manipulating network calls using version 115 of the DevTools Protocol + /// Class providing functionality for manipulating network calls using version 118 of the DevTools Protocol /// - public class V115Network : DevTools.Network + public class V118Network : DevTools.Network { private FetchAdapter fetch; private NetworkAdapter network; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The adapter for the Network domain. /// The adapter for the Fetch domain. - public V115Network(NetworkAdapter network, FetchAdapter fetch) + public V118Network(NetworkAdapter network, FetchAdapter fetch) { this.network = network; this.fetch = fetch; @@ -216,9 +216,9 @@ public override async Task ContinueWithAuth(string requestId, string userName, s await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings() { RequestId = requestId, - AuthChallengeResponse = new V115.Fetch.AuthChallengeResponse() + AuthChallengeResponse = new V118.Fetch.AuthChallengeResponse() { - Response = V115.Fetch.AuthChallengeResponseResponseValues.ProvideCredentials, + Response = V118.Fetch.AuthChallengeResponseResponseValues.ProvideCredentials, Username = userName, Password = password } @@ -235,9 +235,9 @@ public override async Task CancelAuth(string requestId) await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings() { RequestId = requestId, - AuthChallengeResponse = new OpenQA.Selenium.DevTools.V115.Fetch.AuthChallengeResponse() + AuthChallengeResponse = new OpenQA.Selenium.DevTools.V118.Fetch.AuthChallengeResponse() { - Response = V115.Fetch.AuthChallengeResponseResponseValues.CancelAuth + Response = V118.Fetch.AuthChallengeResponseResponseValues.CancelAuth } }).ConfigureAwait(false); } diff --git a/dotnet/src/webdriver/DevTools/v115/V115Target.cs b/dotnet/src/webdriver/DevTools/v118/V118Target.cs similarity index 93% rename from dotnet/src/webdriver/DevTools/v115/V115Target.cs rename to dotnet/src/webdriver/DevTools/v118/V118Target.cs index 23c7831b2d294..a46f195f8af69 100644 --- a/dotnet/src/webdriver/DevTools/v115/V115Target.cs +++ b/dotnet/src/webdriver/DevTools/v118/V118Target.cs @@ -1,4 +1,4 @@ -// +// // 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.V115.Target; +using OpenQA.Selenium.DevTools.V118.Target; -namespace OpenQA.Selenium.DevTools.V115 +namespace OpenQA.Selenium.DevTools.V118 { /// - /// Class providing functionality for manipulating targets for version 115 of the DevTools Protocol + /// Class providing functionality for manipulating targets for version 118 of the DevTools Protocol /// - public class V115Target : DevTools.Target + public class V118Target : DevTools.Target { private TargetAdapter adapter; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The adapter for the Target domain. - public V115Target(TargetAdapter adapter) + public V118Target(TargetAdapter adapter) { this.adapter = adapter; adapter.DetachedFromTarget += OnDetachedFromTarget; diff --git a/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd b/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd index ad0e1b570f665..e91cbe1deb732 100644 --- a/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd +++ b/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\v115\DevToolsSessionDomains.cs" ( - echo Generating CDP code for version 115 - pushd "%1..\..\.." - bazel build //dotnet/src/webdriver/cdp:generate-v115 - popd -) - if not exist "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v116\DevToolsSessionDomains.cs" ( echo Generating CDP code for version 116 pushd "%1..\..\.." @@ -47,3 +40,10 @@ if not exist "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v117\DevToolsSessio bazel build //dotnet/src/webdriver/cdp:generate-v117 popd ) + +if not exist "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v118\DevToolsSessionDomains.cs" ( + echo Generating CDP code for version 118 + pushd "%1..\..\.." + bazel build //dotnet/src/webdriver/cdp:generate-v118 + popd +) diff --git a/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh b/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh index d11b1a3b144d5..a8c48061507e4 100755 --- a/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh +++ b/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/v115/DevToolsSessionDomains.cs" ]] -then - echo "Generating CDP code for version 115" - bazel build //dotnet/src/webdriver/cdp:generate-v115 -fi - if [[ ! -f "$1../../../bazel-bin/dotnet/src/webdriver/cdp/v116/DevToolsSessionDomains.cs" ]] then echo "Generating CDP code for version 116" @@ -40,3 +34,9 @@ then echo "Generating CDP code for version 117" bazel build //dotnet/src/webdriver/cdp:generate-v117 fi + +if [[ ! -f "$1../../../bazel-bin/dotnet/src/webdriver/cdp/v118/DevToolsSessionDomains.cs" ]] +then + echo "Generating CDP code for version 118" + bazel build //dotnet/src/webdriver/cdp:generate-v118 +fi diff --git a/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs b/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs index fc1dce0c2c9d9..5dc8bdfddd954 100644 --- a/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs +++ b/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs @@ -20,7 +20,7 @@ public StableChannelChromeDriver(ChromeDriverService service, ChromeOptions opti public static ChromeOptions DefaultOptions { - get { return new ChromeOptions() { BrowserVersion = "117" }; } + get { return new ChromeOptions() { BrowserVersion = "118" }; } } } } diff --git a/dotnet/test/common/DevTools/DevToolsConsoleTest.cs b/dotnet/test/common/DevTools/DevToolsConsoleTest.cs index c6db8835d4834..633c833e97e58 100644 --- a/dotnet/test/common/DevTools/DevToolsConsoleTest.cs +++ b/dotnet/test/common/DevTools/DevToolsConsoleTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V117; + using CurrentCdpVersion = V118; [TestFixture] public class DevToolsConsoleTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsLogTest.cs b/dotnet/test/common/DevTools/DevToolsLogTest.cs index f6b6bb480e44b..05449f8512977 100644 --- a/dotnet/test/common/DevTools/DevToolsLogTest.cs +++ b/dotnet/test/common/DevTools/DevToolsLogTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V117; + using CurrentCdpVersion = V118; [TestFixture] public class DevToolsLogTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsNetworkTest.cs b/dotnet/test/common/DevTools/DevToolsNetworkTest.cs index 4636442dedd8e..bcde5d8391a3a 100644 --- a/dotnet/test/common/DevTools/DevToolsNetworkTest.cs +++ b/dotnet/test/common/DevTools/DevToolsNetworkTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V117; + using CurrentCdpVersion = V118; [TestFixture] public class DevToolsNetworkTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs b/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs index d895bd2ccbdb4..accaa9575c7b8 100644 --- a/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs +++ b/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs @@ -3,7 +3,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V117; + using CurrentCdpVersion = V118; [TestFixture] public class DevToolsPerformanceTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsProfilerTest.cs b/dotnet/test/common/DevTools/DevToolsProfilerTest.cs index 550a8eb408c59..621aa621ed88a 100644 --- a/dotnet/test/common/DevTools/DevToolsProfilerTest.cs +++ b/dotnet/test/common/DevTools/DevToolsProfilerTest.cs @@ -5,7 +5,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V117; + using CurrentCdpVersion = V118; [TestFixture] public class DevToolsProfilerTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsSecurityTest.cs b/dotnet/test/common/DevTools/DevToolsSecurityTest.cs index 4cddf84aec2c7..3d479d294f33f 100644 --- a/dotnet/test/common/DevTools/DevToolsSecurityTest.cs +++ b/dotnet/test/common/DevTools/DevToolsSecurityTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V117; + using CurrentCdpVersion = V118; [TestFixture] public class DevToolsSecurityTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsTargetTest.cs b/dotnet/test/common/DevTools/DevToolsTargetTest.cs index 385a3e42e3695..56035b389ddc7 100644 --- a/dotnet/test/common/DevTools/DevToolsTargetTest.cs +++ b/dotnet/test/common/DevTools/DevToolsTargetTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V117; + using CurrentCdpVersion = V118; [TestFixture] public class DevToolsTargetTest : DevToolsTestFixture