Skip to content

Commit c060872

Browse files
authored
Merge branch 'trunk' into replace-string-equals
2 parents 47add76 + 9b1e83c commit c060872

File tree

458 files changed

+392
-1064
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

458 files changed

+392
-1064
lines changed

MODULE.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ maven.install(
200200
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
201201
"io.opentelemetry:opentelemetry-sdk-testing",
202202
"io.opentelemetry:opentelemetry-sdk-trace",
203-
"io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha",
204203
"it.ozimov:embedded-redis:0.7.3",
205204
"net.bytebuddy:byte-buddy:1.15.11",
206205
"org.htmlunit:htmlunit-core-js:4.7.0",

WORKSPACE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
66

77
http_archive(
88
name = "io_bazel_rules_closure",
9+
integrity = "sha256-lJjlc2jvuCuYXbHtQmp2fL8boDmP167WMvw5CGVOGx4=",
910
strip_prefix = "rules_closure-0.12.0",
1011
url = "https://github.com/bazelbuild/rules_closure/archive/refs/tags/0.12.0.tar.gz",
1112
)

common/repositories.bzl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ js_library(
5050

5151
http_archive(
5252
name = "linux_beta_firefox",
53-
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b1/linux-x86_64/en-US/firefox-137.0b1.tar.xz",
54-
sha256 = "98848e14e857a3562c4a2cf6fbbf7966e4f256cf6e127df0b367ac23c6638676",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b2/linux-x86_64/en-US/firefox-137.0b2.tar.xz",
54+
sha256 = "cfacafd480c40e6e9756cd4e5128e82c690bc53aca9d9dbf7bcfc6f2cf437fd6",
5555
build_file_content = """
5656
load("@aspect_rules_js//js:defs.bzl", "js_library")
5757
package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
7272

7373
dmg_archive(
7474
name = "mac_beta_firefox",
75-
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b1/mac/en-US/Firefox%20137.0b1.dmg",
76-
sha256 = "b6ff3f376bc25e8890ed34278fe5c0719349839a45c5ac340118ff983f3741a5",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b2/mac/en-US/Firefox%20137.0b2.dmg",
76+
sha256 = "2038c5a761974ee521943986f82fee551de32d2e8839c1102c4bca70c5953bbb",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
package(default_visibility = ["//visibility:public"])
@@ -123,10 +123,10 @@ js_library(
123123

124124
pkg_archive(
125125
name = "mac_edge",
126-
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/b52c4eaa-a0a4-4e86-9643-ef8f23ab8ec9/MicrosoftEdge-133.0.3065.92.pkg",
127-
sha256 = "bfa719621205421945eca8891c7ef1901af753994f4522c3eb9354d6c18c23ed",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/bd7a7bb2-a585-4892-8cb1-74c91c53c943/MicrosoftEdge-134.0.3124.51.pkg",
127+
sha256 = "5aa1d2fd4e35a177e98cddaee8b3edeedf6e765aef5a09d3872de96d5760778c",
128128
move = {
129-
"MicrosoftEdge-133.0.3065.92.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-134.0.3124.51.pkg/Payload/Microsoft Edge.app": "Edge.app",
130130
},
131131
build_file_content = """
132132
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
143143

144144
deb_archive(
145145
name = "linux_edge",
146-
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_133.0.3065.92-1_amd64.deb",
147-
sha256 = "3d8fd372bae2aa8b99791790a778700d81e33fbffe93e5bc40e18c08befdf62f",
146+
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_134.0.3124.51-1_amd64.deb",
147+
sha256 = "8bb0ba438b820599c8c9dd8b03e2b0b39fd6c4765aa33fd4c6037d02d642b6ea",
148148
build_file_content = """
149149
load("@aspect_rules_js//js:defs.bzl", "js_library")
150150
package(default_visibility = ["//visibility:public"])

dotnet/private/executable_assembly.bzl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ def create_executable_assembly(ctx, extra_srcs, extra_deps):
7575
internals_visible_to = None,
7676
internals_visible_to_cs = None,
7777
langversion = ctx.attr.langversion,
78+
nullable = ctx.attr.nullable,
7879
resources = ctx.files.resources,
7980
srcs = ctx.files.srcs + extra_srcs,
8081
out = ctx.attr.out,
@@ -143,6 +144,9 @@ csharp_executable = rule(
143144
"langversion": attr.string(
144145
doc = "The version string for the C# language.",
145146
),
147+
"nullable": attr.string(
148+
doc = "Enable nullable context, or nullable warnings.",
149+
),
146150
"resources": attr.label_list(
147151
doc = "A list of files to embed in the DLL as resources.",
148152
allow_files = True,

dotnet/src/webdriver/Alert.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
using System;
2121
using System.Collections.Generic;
2222

23-
#nullable enable
24-
2523
namespace OpenQA.Selenium
2624
{
2725
/// <summary>

dotnet/src/webdriver/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ csharp_library(
3737
"WebDriver.Common.Tests",
3838
],
3939
langversion = "12.0",
40+
nullable = "enable",
4041
resources = [
4142
"//javascript/atoms/fragments:find-elements.js",
4243
"//javascript/atoms/fragments:is-displayed.js",
@@ -76,6 +77,7 @@ csharp_library(
7677
"WebDriver.Common.Tests",
7778
],
7879
langversion = "12.0",
80+
nullable = "enable",
7981
resources = [
8082
"//javascript/atoms/fragments:find-elements.js",
8183
"//javascript/atoms/fragments:is-displayed.js",
@@ -103,6 +105,7 @@ csharp_library(
103105
out = "WebDriver.StrongNamed",
104106
keyfile = "//dotnet:WebDriver.snk",
105107
langversion = "12.0",
108+
nullable = "enable",
106109
resources = [
107110
"//javascript/atoms/fragments:find-elements.js",
108111
"//javascript/atoms/fragments:is-displayed.js",
@@ -140,6 +143,7 @@ csharp_library(
140143
],
141144
keyfile = "//dotnet:WebDriver.snk",
142145
langversion = "12.0",
146+
nullable = "enable",
143147
resources = [
144148
"//javascript/atoms/fragments:find-elements.js",
145149
"//javascript/atoms/fragments:is-displayed.js",

dotnet/src/webdriver/BiDi/BiDi.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
using OpenQA.Selenium.BiDi.Communication;
2323
using OpenQA.Selenium.BiDi.Communication.Transport;
2424

25-
#nullable enable
26-
2725
namespace OpenQA.Selenium.BiDi;
2826

2927
public class BiDi : IAsyncDisposable

dotnet/src/webdriver/BiDi/BiDiException.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
using System;
2121

22-
#nullable enable
23-
2422
namespace OpenQA.Selenium.BiDi;
2523

2624
public class BiDiException : Exception

dotnet/src/webdriver/BiDi/Communication/Broker.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
using System.Threading;
3131
using System.Threading.Tasks;
3232

33-
#nullable enable
34-
3533
namespace OpenQA.Selenium.BiDi.Communication;
3634

3735
public class Broker : IAsyncDisposable

dotnet/src/webdriver/BiDi/Communication/Command.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// under the License.
1818
// </copyright>
1919

20-
#nullable enable
20+
using System.Text.Json.Serialization;
2121

2222
namespace OpenQA.Selenium.BiDi.Communication;
2323

@@ -28,14 +28,17 @@ protected Command(string method)
2828
Method = method;
2929
}
3030

31+
[JsonPropertyOrder(1)]
3132
public string Method { get; }
3233

34+
[JsonPropertyOrder(0)]
3335
public int Id { get; internal set; }
3436
}
3537

3638
internal abstract class Command<TCommandParameters>(TCommandParameters @params, string method) : Command(method)
3739
where TCommandParameters : CommandParameters
3840
{
41+
[JsonPropertyOrder(2)]
3942
public TCommandParameters Params { get; } = @params;
4043
}
4144

0 commit comments

Comments
 (0)