Merge branch 'trunk' into rb_use_env_var_for_driver_location

Author: aguspe

dotnet/src/webdriver/BUILD.bazel

@@ -67,6 +67,9 @@ csharp_library(
         "**/*.cs",
     ]) + devtools_version_targets(),
     out = "WebDriver",
+    defines = [
+        "NET8_0_OR_GREATER",
+    ],
     internals_visible_to = [
         "WebDriver.Common.Tests",
     ],
@@ -128,6 +131,9 @@ csharp_library(
         "**/*.cs",
     ]) + devtools_version_targets(),
     out = "WebDriver.StrongNamed",
+    defines = [
+        "NET8_0_OR_GREATER",
+    ],
     keyfile = "//dotnet:WebDriver.snk",
     langversion = "12.0",
     resources = [

dotnet/src/webdriver/BiDi/BiDi.cs

@@ -60,12 +60,12 @@ public static async Task<BiDi> ConnectAsync(string url)
         return bidi;
     }
 
-    public Task<Modules.BrowsingContext.BrowsingContext> CreateBrowsingContextAsync(Modules.BrowsingContext.BrowsingContextType type, Modules.BrowsingContext.CreateOptions? options = null)
+    public Task<Modules.BrowsingContext.BrowsingContext> CreateContextAsync(Modules.BrowsingContext.ContextType type, Modules.BrowsingContext.CreateOptions? options = null)
     {
         return BrowsingContextModule.CreateAsync(type, options);
     }
 
-    public Task<IReadOnlyList<Modules.BrowsingContext.BrowsingContextInfo>> GetBrowsingContextTreeAsync(Modules.BrowsingContext.GetTreeOptions? options = null)
+    public Task<IReadOnlyList<Modules.BrowsingContext.BrowsingContextInfo>> GetTreeAsync(Modules.BrowsingContext.GetTreeOptions? options = null)
     {
         return BrowsingContextModule.GetTreeAsync(options);
     }
@@ -82,22 +82,22 @@ public async ValueTask DisposeAsync()
         _transport?.Dispose();
     }
 
-    public Task<Subscription> OnBrowsingContextCreatedAsync(Func<Modules.BrowsingContext.BrowsingContextInfo, Task> handler, BrowsingContextsSubscriptionOptions? options = null)
+    public Task<Subscription> OnContextCreatedAsync(Func<Modules.BrowsingContext.BrowsingContextInfo, Task> handler, BrowsingContextsSubscriptionOptions? options = null)
     {
         return BrowsingContextModule.OnContextCreatedAsync(handler, options);
     }
 
-    public Task<Subscription> OnBrowsingContextCreatedAsync(Action<Modules.BrowsingContext.BrowsingContextInfo> handler, BrowsingContextsSubscriptionOptions? options = null)
+    public Task<Subscription> OnContextCreatedAsync(Action<Modules.BrowsingContext.BrowsingContextInfo> handler, BrowsingContextsSubscriptionOptions? options = null)
     {
         return BrowsingContextModule.OnContextCreatedAsync(handler, options);
     }
 
-    public Task<Subscription> OnBrowsingContextDestroyedAsync(Func<Modules.BrowsingContext.BrowsingContextInfo, Task> handler, BrowsingContextsSubscriptionOptions? options = null)
+    public Task<Subscription> OnContextDestroyedAsync(Func<Modules.BrowsingContext.BrowsingContextInfo, Task> handler, BrowsingContextsSubscriptionOptions? options = null)
     {
         return BrowsingContextModule.OnContextDestroyedAsync(handler, options);
     }
 
-    public Task<Subscription> OnBrowsingContextDestroyedAsync(Action<Modules.BrowsingContext.BrowsingContextInfo> handler, BrowsingContextsSubscriptionOptions? options = null)
+    public Task<Subscription> OnContextDestroyedAsync(Action<Modules.BrowsingContext.BrowsingContextInfo> handler, BrowsingContextsSubscriptionOptions? options = null)
     {
         return BrowsingContextModule.OnContextDestroyedAsync(handler, options);
     }

dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextModule.cs

@@ -7,7 +7,7 @@ namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 public class BrowsingContextModule(Broker broker) : Module(broker)
 {
-    public async Task<BrowsingContext> CreateAsync(BrowsingContextType type, CreateOptions? options = null)
+    public async Task<BrowsingContext> CreateAsync(ContextType type, CreateOptions? options = null)
     {
         var @params = new CreateCommandParameters(type);
 

dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CaptureScreenshotCommand.cs

@@ -45,8 +45,5 @@ public record ElementClipRectangle(Script.SharedReference Element) : ClipRectang
 
 public record CaptureScreenshotResult(string Data)
 {
-    public byte[] AsBytes()
-    {
-        return System.Convert.FromBase64String(Data);
-    }
+    public byte[] ToByteArray() => System.Convert.FromBase64String(Data);
 }

dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CreateCommand.cs

@@ -4,7 +4,7 @@ namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 internal class CreateCommand(CreateCommandParameters @params) : Command<CreateCommandParameters>(@params);
 
-internal record CreateCommandParameters(BrowsingContextType Type) : CommandParameters
+internal record CreateCommandParameters(ContextType Type) : CommandParameters
 {
     public BrowsingContext? ReferenceContext { get; set; }
 
@@ -22,7 +22,7 @@ public record CreateOptions : CommandOptions
     public Browser.UserContext? UserContext { get; set; }
 }
 
-public enum BrowsingContextType
+public enum ContextType
 {
     Tab,
     Window