Skip to content

Commit aa0733d

Browse files
pujaganijimevans
authored andcommitted
[dotnet] Remove CDP version support for 86 and 87. Add CDP version support for 90 and 91.
Signed-off-by: Jim Evans <[email protected]>
1 parent 0157c8f commit aa0733d

21 files changed

+261
-259
lines changed

dotnet/selenium-dotnet-version.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ SUPPORTED_DEVTOOLS_VERSIONS = [
99
"v85",
1010
"v88",
1111
"v89",
12+
"v90",
13+
"v91"
1214
]
1315

1416
ASSEMBLY_COMPANY = "Selenium Committers"

dotnet/src/webdriver/DevTools/DevToolsDomains.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ public abstract class DevToolsDomains
3737
// added to this dictionary.
3838
private static readonly Dictionary<int, Type> SupportedDevToolsVersions = new Dictionary<int, Type>()
3939
{
40+
{ 91, typeof(V91.V91Domains) },
41+
{ 90, typeof(V90.V90Domains) },
4042
{ 89, typeof(V89.V89Domains) },
4143
{ 88, typeof(V88.V88Domains) },
42-
{ 87, typeof(V87.V87Domains) },
43-
{ 86, typeof(V86.V86Domains) },
44-
{ 85, typeof(V85.V85Domains) }
44+
{ 85, typeof(V85.V85Domains) }
4545
};
4646

4747
/// <summary>

dotnet/src/webdriver/DevTools/v86/V86Domains.cs renamed to dotnet/src/webdriver/DevTools/v90/V90Domains.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// <copyright file="V86Domains.cs" company="WebDriver Committers">
1+
// <copyright file="V90Domains.cs" company="WebDriver Committers">
22
// Licensed to the Software Freedom Conservancy (SFC) under one
33
// or more contributor license agreements. See the NOTICE file
44
// distributed with this work for additional information
@@ -19,24 +19,24 @@
1919
using System.Collections.Generic;
2020
using System.Text;
2121

22-
namespace OpenQA.Selenium.DevTools.V86
22+
namespace OpenQA.Selenium.DevTools.V90
2323
{
2424
/// <summary>
25-
/// Class containing the domain implementation for version 86 of the DevTools Protocol.
25+
/// Class containing the domain implementation for version 90 of the DevTools Protocol.
2626
/// </summary>
27-
public class V86Domains : DevToolsDomains
27+
public class V90Domains : DevToolsDomains
2828
{
2929
private DevToolsSessionDomains domains;
3030

31-
public V86Domains(DevToolsSession session)
31+
public V90Domains(DevToolsSession session)
3232
{
3333
this.domains = new DevToolsSessionDomains(session);
3434
}
3535

3636
/// <summary>
3737
/// Gets the DevTools Protocol version for which this class is valid.
3838
/// </summary>
39-
public static int DevToolsVersion => 86;
39+
public static int DevToolsVersion => 90;
4040

4141
/// <summary>
4242
/// 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 V86Domains(DevToolsSession session)
4646
/// <summary>
4747
/// Gets the object used for manipulating network information in the browser.
4848
/// </summary>
49-
public override DevTools.Network Network => new V86Network(domains.Network, domains.Fetch);
49+
public override DevTools.Network Network => new V90Network(domains.Network, domains.Fetch);
5050

5151
/// <summary>
5252
/// Gets the object used for manipulating the browser's JavaScript execution.
5353
/// </summary>
54-
public override JavaScript JavaScript => new V86JavaScript(domains.Runtime, domains.Page);
54+
public override JavaScript JavaScript => new V90JavaScript(domains.Runtime, domains.Page);
5555

5656
/// <summary>
5757
/// Gets the object used for manipulating DevTools Protocol targets.
5858
/// </summary>
59-
public override DevTools.Target Target => new V86Target(domains.Target);
59+
public override DevTools.Target Target => new V90Target(domains.Target);
6060

6161
/// <summary>
6262
/// Gets the object used for manipulating the browser's logs.
6363
/// </summary>
64-
public override DevTools.Log Log => new V86Log(domains.Log);
64+
public override DevTools.Log Log => new V90Log(domains.Log);
6565
}
6666
}

dotnet/src/webdriver/DevTools/v86/V86JavaScript.cs renamed to dotnet/src/webdriver/DevTools/v90/V90JavaScript.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// <copyright file="V86JavaScript.cs" company="WebDriver Committers">
1+
// <copyright file="V90JavaScript.cs" company="WebDriver Committers">
22
// Licensed to the Software Freedom Conservancy (SFC) under one
33
// or more contributor license agreements. See the NOTICE file
44
// distributed with this work for additional information
@@ -18,25 +18,25 @@
1818
using System;
1919
using System.Collections.Generic;
2020
using System.Threading.Tasks;
21-
using OpenQA.Selenium.DevTools.V86.Page;
22-
using OpenQA.Selenium.DevTools.V86.Runtime;
21+
using OpenQA.Selenium.DevTools.V90.Page;
22+
using OpenQA.Selenium.DevTools.V90.Runtime;
2323

24-
namespace OpenQA.Selenium.DevTools.V86
24+
namespace OpenQA.Selenium.DevTools.V90
2525
{
2626
/// <summary>
27-
/// Class containing the JavaScript implementation for version 86 of the DevTools Protocol.
27+
/// Class containing the JavaScript implementation for version 89 of the DevTools Protocol.
2828
/// </summary>
29-
public class V86JavaScript : JavaScript
29+
public class V90JavaScript : JavaScript
3030
{
3131
private RuntimeAdapter runtime;
3232
private PageAdapter page;
3333

3434
/// <summary>
35-
/// Initializes a new instance of the <see cref="V86JavaScript"/> class.
35+
/// Initializes a new instance of the <see cref="V90JavaScript"/> class.
3636
/// </summary>
3737
/// <param name="runtime">The DevTools Protocol adapter for the Runtime domain.</param>
3838
/// <param name="page">The DevTools Protocol adapter for the Page domain.</param>
39-
public V86JavaScript(RuntimeAdapter runtime, PageAdapter page)
39+
public V90JavaScript(RuntimeAdapter runtime, PageAdapter page)
4040
{
4141
this.runtime = runtime;
4242
this.page = page;

dotnet/src/webdriver/DevTools/v87/V87Log.cs renamed to dotnet/src/webdriver/DevTools/v90/V90Log.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// <copyright file="V87Log.cs" company="WebDriver Committers">
1+
// <copyright file="V90Log.cs" company="WebDriver Committers">
22
// Licensed to the Software Freedom Conservancy (SFC) under one
33
// or more contributor license agreements. See the NOTICE file
44
// distributed with this work for additional information
@@ -20,22 +20,22 @@
2020
using System.Text;
2121
using System.Threading;
2222
using System.Threading.Tasks;
23-
using OpenQA.Selenium.DevTools.V87.Log;
23+
using OpenQA.Selenium.DevTools.V90.Log;
2424

25-
namespace OpenQA.Selenium.DevTools.V87
25+
namespace OpenQA.Selenium.DevTools.V90
2626
{
2727
/// <summary>
28-
/// Class containing the browser's log as referenced by version 87 of the DevTools Protocol.
28+
/// Class containing the browser's log as referenced by version 89 of the DevTools Protocol.
2929
/// </summary>
30-
public class V87Log : DevTools.Log
30+
public class V90Log : DevTools.Log
3131
{
3232
private LogAdapter adapter;
3333

3434
/// <summary>
35-
/// Initializes a new instance of the <see cref="V87Log"/> class.
35+
/// Initializes a new instance of the <see cref="V90Log"/> class.
3636
/// </summary>
3737
/// <param name="adapter">The adapter for the Log domain.</param>
38-
public V87Log(LogAdapter adapter)
38+
public V90Log(LogAdapter adapter)
3939
{
4040
this.adapter = adapter;
4141
this.adapter.EntryAdded += OnAdapterEntryAdded;

dotnet/src/webdriver/DevTools/v87/V87Network.cs renamed to dotnet/src/webdriver/DevTools/v90/V90Network.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// <copyright file="V87Network.cs" company="WebDriver Committers">
1+
// <copyright file="V90Network.cs" company="WebDriver Committers">
22
// Licensed to the Software Freedom Conservancy (SFC) under one
33
// or more contributor license agreements. See the NOTICE file
44
// distributed with this work for additional information
@@ -20,25 +20,25 @@
2020
using System.Collections.Generic;
2121
using System.Text;
2222
using System.Threading.Tasks;
23-
using OpenQA.Selenium.DevTools.V87.Fetch;
24-
using OpenQA.Selenium.DevTools.V87.Network;
23+
using OpenQA.Selenium.DevTools.V90.Fetch;
24+
using OpenQA.Selenium.DevTools.V90.Network;
2525

26-
namespace OpenQA.Selenium.DevTools.V87
26+
namespace OpenQA.Selenium.DevTools.V90
2727
{
2828
/// <summary>
29-
/// Class providing functionality for manipulating network calls using version 87 of the DevTools Protocol
29+
/// Class providing functionality for manipulating network calls using version 89 of the DevTools Protocol
3030
/// </summary>
31-
public class V87Network : DevTools.Network
31+
public class V90Network : DevTools.Network
3232
{
3333
private FetchAdapter fetch;
3434
private NetworkAdapter network;
3535

3636
/// <summary>
37-
/// Initializes a new instance of the <see cref="V87Network"/> class.
37+
/// Initializes a new instance of the <see cref="V90Network"/> class.
3838
/// </summary>
3939
/// <param name="network">The adapter for the Network domain.</param>
4040
/// <param name="fetch">The adapter for the Fetch domain.</param>
41-
public V87Network(NetworkAdapter network, FetchAdapter fetch)
41+
public V90Network(NetworkAdapter network, FetchAdapter fetch)
4242
{
4343
this.network = network;
4444
this.fetch = fetch;
@@ -80,12 +80,12 @@ public override async Task DisableNetwork()
8080
/// <returns>A task that represents the asynchronous operation.</returns>
8181
public override async Task EnableFetchForAllPatterns()
8282
{
83-
await fetch.Enable(new OpenQA.Selenium.DevTools.V87.Fetch.EnableCommandSettings()
83+
await fetch.Enable(new OpenQA.Selenium.DevTools.V90.Fetch.EnableCommandSettings()
8484
{
85-
Patterns = new OpenQA.Selenium.DevTools.V87.Fetch.RequestPattern[]
85+
Patterns = new OpenQA.Selenium.DevTools.V90.Fetch.RequestPattern[]
8686
{
87-
new OpenQA.Selenium.DevTools.V87.Fetch.RequestPattern() { UrlPattern = "*", RequestStage = RequestStage.Request },
88-
new OpenQA.Selenium.DevTools.V87.Fetch.RequestPattern() { UrlPattern = "*", RequestStage = RequestStage.Response }
87+
new OpenQA.Selenium.DevTools.V90.Fetch.RequestPattern() { UrlPattern = "*", RequestStage = RequestStage.Request },
88+
new OpenQA.Selenium.DevTools.V90.Fetch.RequestPattern() { UrlPattern = "*", RequestStage = RequestStage.Response }
8989
},
9090
HandleAuthRequests = true
9191
});
@@ -188,9 +188,9 @@ public override async Task ContinueWithAuth(string requestId, string userName, s
188188
await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings()
189189
{
190190
RequestId = requestId,
191-
AuthChallengeResponse = new V87.Fetch.AuthChallengeResponse()
191+
AuthChallengeResponse = new V90.Fetch.AuthChallengeResponse()
192192
{
193-
Response = V87.Fetch.AuthChallengeResponseResponseValues.ProvideCredentials,
193+
Response = V90.Fetch.AuthChallengeResponseResponseValues.ProvideCredentials,
194194
Username = userName,
195195
Password = password
196196
}
@@ -207,9 +207,9 @@ public override async Task CancelAuth(string requestId)
207207
await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings()
208208
{
209209
RequestId = requestId,
210-
AuthChallengeResponse = new OpenQA.Selenium.DevTools.V87.Fetch.AuthChallengeResponse()
210+
AuthChallengeResponse = new OpenQA.Selenium.DevTools.V90.Fetch.AuthChallengeResponse()
211211
{
212-
Response = V87.Fetch.AuthChallengeResponseResponseValues.CancelAuth
212+
Response = V90.Fetch.AuthChallengeResponseResponseValues.CancelAuth
213213
}
214214
});
215215
}

dotnet/src/webdriver/DevTools/v87/V87Target.cs renamed to dotnet/src/webdriver/DevTools/v90/V90Target.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// <copyright file="V87Target.cs" company="WebDriver Committers">
1+
// <copyright file="V90Target.cs" company="WebDriver Committers">
22
// Licensed to the Software Freedom Conservancy (SFC) under one
33
// or more contributor license agreements. See the NOTICE file
44
// distributed with this work for additional information
@@ -21,22 +21,22 @@
2121
using System.Collections.ObjectModel;
2222
using System.Text;
2323
using System.Threading.Tasks;
24-
using OpenQA.Selenium.DevTools.V87.Target;
24+
using OpenQA.Selenium.DevTools.V90.Target;
2525

26-
namespace OpenQA.Selenium.DevTools.V87
26+
namespace OpenQA.Selenium.DevTools.V90
2727
{
2828
/// <summary>
29-
/// Class providing functionality for manipulating targets for version 87 of the DevTools Protocol
29+
/// Class providing functionality for manipulating targets for version 89 of the DevTools Protocol
3030
/// </summary>
31-
public class V87Target : DevTools.Target
31+
public class V90Target : DevTools.Target
3232
{
3333
private TargetAdapter adapter;
3434

3535
/// <summary>
36-
/// Initializes a new instance of the <see cref="V87Target"/> class.
36+
/// Initializes a new instance of the <see cref="V90Target"/> class.
3737
/// </summary>
3838
/// <param name="adapter">The adapter for the Target domain.</param>
39-
public V87Target(TargetAdapter adapter)
39+
public V90Target(TargetAdapter adapter)
4040
{
4141
this.adapter = adapter;
4242
}

dotnet/src/webdriver/DevTools/v87/V87Domains.cs renamed to dotnet/src/webdriver/DevTools/v91/V91Domains.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// <copyright file="V87Domains.cs" company="WebDriver Committers">
1+
// <copyright file="V91Domains.cs" company="WebDriver Committers">
22
// Licensed to the Software Freedom Conservancy (SFC) under one
33
// or more contributor license agreements. See the NOTICE file
44
// distributed with this work for additional information
@@ -19,24 +19,24 @@
1919
using System.Collections.Generic;
2020
using System.Text;
2121

22-
namespace OpenQA.Selenium.DevTools.V87
22+
namespace OpenQA.Selenium.DevTools.V91
2323
{
2424
/// <summary>
25-
/// Class containing the domain implementation for version 87 of the DevTools Protocol.
25+
/// Class containing the domain implementation for version 90 of the DevTools Protocol.
2626
/// </summary>
27-
public class V87Domains : DevToolsDomains
27+
public class V91Domains : DevToolsDomains
2828
{
2929
private DevToolsSessionDomains domains;
3030

31-
public V87Domains(DevToolsSession session)
31+
public V91Domains(DevToolsSession session)
3232
{
3333
this.domains = new DevToolsSessionDomains(session);
3434
}
3535

3636
/// <summary>
3737
/// Gets the DevTools Protocol version for which this class is valid.
3838
/// </summary>
39-
public static int DevToolsVersion => 87;
39+
public static int DevToolsVersion => 90;
4040

4141
/// <summary>
4242
/// 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 V87Domains(DevToolsSession session)
4646
/// <summary>
4747
/// Gets the object used for manipulating network information in the browser.
4848
/// </summary>
49-
public override DevTools.Network Network => new V87Network(domains.Network, domains.Fetch);
49+
public override DevTools.Network Network => new V91Network(domains.Network, domains.Fetch);
5050

5151
/// <summary>
5252
/// Gets the object used for manipulating the browser's JavaScript execution.
5353
/// </summary>
54-
public override JavaScript JavaScript => new V87JavaScript(domains.Runtime, domains.Page);
54+
public override JavaScript JavaScript => new V91JavaScript(domains.Runtime, domains.Page);
5555

5656
/// <summary>
5757
/// Gets the object used for manipulating DevTools Protocol targets.
5858
/// </summary>
59-
public override DevTools.Target Target => new V87Target(domains.Target);
59+
public override DevTools.Target Target => new V91Target(domains.Target);
6060

6161
/// <summary>
6262
/// Gets the object used for manipulating the browser's logs.
6363
/// </summary>
64-
public override DevTools.Log Log => new V87Log(domains.Log);
64+
public override DevTools.Log Log => new V91Log(domains.Log);
6565
}
6666
}

dotnet/src/webdriver/DevTools/v87/V87JavaScript.cs renamed to dotnet/src/webdriver/DevTools/v91/V91JavaScript.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// <copyright file="V87JavaScript.cs" company="WebDriver Committers">
1+
// <copyright file="V91JavaScript.cs" company="WebDriver Committers">
22
// Licensed to the Software Freedom Conservancy (SFC) under one
33
// or more contributor license agreements. See the NOTICE file
44
// distributed with this work for additional information
@@ -18,25 +18,25 @@
1818
using System;
1919
using System.Collections.Generic;
2020
using System.Threading.Tasks;
21-
using OpenQA.Selenium.DevTools.V87.Page;
22-
using OpenQA.Selenium.DevTools.V87.Runtime;
21+
using OpenQA.Selenium.DevTools.V91.Page;
22+
using OpenQA.Selenium.DevTools.V91.Runtime;
2323

24-
namespace OpenQA.Selenium.DevTools.V87
24+
namespace OpenQA.Selenium.DevTools.V91
2525
{
2626
/// <summary>
27-
/// Class containing the JavaScript implementation for version 87 of the DevTools Protocol.
27+
/// Class containing the JavaScript implementation for version 89 of the DevTools Protocol.
2828
/// </summary>
29-
public class V87JavaScript : JavaScript
29+
public class V91JavaScript : JavaScript
3030
{
3131
private RuntimeAdapter runtime;
3232
private PageAdapter page;
3333

3434
/// <summary>
35-
/// Initializes a new instance of the <see cref="V87JavaScript"/> class.
35+
/// Initializes a new instance of the <see cref="V91JavaScript"/> class.
3636
/// </summary>
3737
/// <param name="runtime">The DevTools Protocol adapter for the Runtime domain.</param>
3838
/// <param name="page">The DevTools Protocol adapter for the Page domain.</param>
39-
public V87JavaScript(RuntimeAdapter runtime, PageAdapter page)
39+
public V91JavaScript(RuntimeAdapter runtime, PageAdapter page)
4040
{
4141
this.runtime = runtime;
4242
this.page = page;

0 commit comments

Comments
 (0)