Skip to content

Commit 0aa9ba6

Browse files
navin772navin772
authored
Merge branch 'trunk' into py-bidi-emulation
2 parents 9a2dcfb + fdbf024 commit 0aa9ba6

Some content is hidden

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

42 files changed

+92
-194
lines changed

‎Rakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ namespace :all do
11051105

11061106
['common/devtools/',
11071107
'dotnet/src/webdriver/DevTools/',
1108-
'dotnet/src/webdriver/WebDriver.csproj',
1108+
'dotnet/src/webdriver/Selenium.WebDriver.csproj',
11091109
'dotnet/test/common/DevTools/',
11101110
'dotnet/test/common/CustomDriverConfigs/',
11111111
'dotnet/selenium-dotnet-version.bzl',

‎common/repositories.bzl‎

Lines changed: 8 additions & 8 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/140.0b4/linux-x86_64/en-US/firefox-140.0b4.tar.xz",
54-
sha256 = "40820674c78e05b1413458c2844e874c8521670780fdb4489e62379a42fba704",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b5/linux-x86_64/en-US/firefox-140.0b5.tar.xz",
54+
sha256 = "c3a9510169f3c4dae1595cd5da18332ef333ec99f309d2450b4f5718b68c321a",
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/140.0b4/mac/en-US/Firefox%20140.0b4.dmg",
76-
sha256 = "dce036c33d4749910cc2d87ce4c6786f7538a83dfe22f1ae1f9bfd17d4a23523",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b5/mac/en-US/Firefox%20140.0b5.dmg",
76+
sha256 = "795fdcf2076aef760b0276620ad8c0a3357737574e8a5a99bc0c44fdd3c5c90a",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
165165

166166
http_archive(
167167
name = "linux_edgedriver",
168-
url = "https://msedgedriver.azureedge.net/137.0.3296.58/edgedriver_linux64.zip",
169-
sha256 = "5e6872dcd8736b4fd208bfe18ae29d87dbda1f293932e0ae523c0f9449b98c18",
168+
url = "https://msedgedriver.azureedge.net/137.0.3296.62/edgedriver_linux64.zip",
169+
sha256 = "9857afcbc78f94cd68ddae1f12f2a77687a4216fbcac78571580ef8a8f09f924",
170170
build_file_content = """
171171
load("@aspect_rules_js//js:defs.bzl", "js_library")
172172
package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
182182

183183
http_archive(
184184
name = "mac_edgedriver",
185-
url = "https://msedgedriver.azureedge.net/137.0.3296.58/edgedriver_mac64.zip",
186-
sha256 = "4dcc5e8537c49746ed1f35bf105946f25a2f0daf7eda68018b0360ae4ec33071",
185+
url = "https://msedgedriver.azureedge.net/137.0.3296.62/edgedriver_mac64.zip",
186+
sha256 = "eb26a678e9fd90142fe23b528b9f2a2bb821c8005bbd95e686c26b525ce0b6bc",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])

‎dotnet/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ load("@rules_pkg//pkg:zip.bzl", "pkg_zip")
22

33
exports_files([
44
"AssemblyInfo.cs.template",
5-
"WebDriver.snk",
5+
"Selenium.snk",
66
])
77

88
pkg_zip(

‎dotnet/WebDriver.NET.sln‎ renamed to ‎dotnet/Selenium.sln‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.27130.2026
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver", "src\webdriver\WebDriver.csproj", "{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver", "src\webdriver\Selenium.WebDriver.csproj", "{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Support", "src\support\WebDriver.Support.csproj", "{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Support", "src\support\Selenium.WebDriver.Support.csproj", "{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Common.Tests", "test\common\WebDriver.Common.Tests.csproj", "{1869A2D9-3782-41E4-84DD-EB1A5E971C93}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Common.Tests", "test\common\Selenium.WebDriver.Common.Tests.csproj", "{1869A2D9-3782-41E4-84DD-EB1A5E971C93}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Chrome.Tests", "test\chrome\WebDriver.Chrome.Tests.csproj", "{F5751636-2F68-4BE3-B383-D4F4937A1946}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Chrome.Tests", "test\chrome\Selenium.WebDriver.Chrome.Tests.csproj", "{F5751636-2F68-4BE3-B383-D4F4937A1946}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Edge.Tests", "test\edge\WebDriver.Edge.Tests.csproj", "{EF99FB04-94C3-4AA0-8809-B514B253DF51}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Edge.Tests", "test\edge\Selenium.WebDriver.Edge.Tests.csproj", "{EF99FB04-94C3-4AA0-8809-B514B253DF51}"
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.IE.Tests", "test\ie\WebDriver.IE.Tests.csproj", "{E54A6F7B-3939-4DE5-85CC-28158615A967}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.IE.Tests", "test\ie\Selenium.WebDriver.IE.Tests.csproj", "{E54A6F7B-3939-4DE5-85CC-28158615A967}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Firefox.Tests", "test\firefox\WebDriver.Firefox.Tests.csproj", "{F912F647-04A0-4081-91B4-985EE0E9097C}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Firefox.Tests", "test\firefox\Selenium.WebDriver.Firefox.Tests.csproj", "{F912F647-04A0-4081-91B4-985EE0E9097C}"
1919
EndProject
20-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Remote.Tests", "test\remote\WebDriver.Remote.Tests.csproj", "{B9C6B276-445A-400F-BE74-1E068F50A54D}"
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Remote.Tests", "test\remote\Selenium.WebDriver.Remote.Tests.csproj", "{B9C6B276-445A-400F-BE74-1E068F50A54D}"
2121
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Safari.Tests", "test\safari\WebDriver.Safari.Tests.csproj", "{BB08F673-1553-4A56-882A-A2A115AC06C2}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Safari.Tests", "test\safari\Selenium.WebDriver.Safari.Tests.csproj", "{BB08F673-1553-4A56-882A-A2A115AC06C2}"
2323
EndProject
24-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Support.Tests", "test\support\WebDriver.Support.Tests.csproj", "{2136C695-2526-45E0-AE1D-68FBBC6A9DE2}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Support.Tests", "test\support\Selenium.WebDriver.Support.Tests.csproj", "{2136C695-2526-45E0-AE1D-68FBBC6A9DE2}"
2525
EndProject
2626
Global
2727
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎dotnet/WebDriver.snk‎ renamed to ‎dotnet/Selenium.snk‎

File renamed without changes.

‎dotnet/src/support/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ nuget_pack(
5656
libs = {
5757
":support": "WebDriver.Support",
5858
},
59-
nuspec_template = "WebDriver.Support.nuspec",
59+
nuspec_template = "Selenium.WebDriver.Support.nuspec",
6060
tags = [
6161
"block-network",
6262
],
@@ -73,7 +73,7 @@ csharp_library(
7373
"UI/*.cs",
7474
]) + [":assembly-info"],
7575
out = "WebDriver.Support.StrongNamed",
76-
keyfile = "//dotnet:WebDriver.snk",
76+
keyfile = "//dotnet:Selenium.snk",
7777
langversion = "12.0",
7878
nullable = "enable",
7979
target_frameworks = [
@@ -96,7 +96,7 @@ nuget_pack(
9696
libs = {
9797
":support-strongnamed": "WebDriver.Support.StrongNamed",
9898
},
99-
nuspec_template = "WebDriver.Support.StrongNamed.nuspec",
99+
nuspec_template = "Selenium.WebDriver.Support.StrongNamed.nuspec",
100100
tags = [
101101
"block-network",
102102
],

‎dotnet/src/support/WebDriver.Support.StrongNamed.nuspec‎ renamed to ‎dotnet/src/support/Selenium.WebDriver.Support.StrongNamed.nuspec‎

File renamed without changes.

‎dotnet/src/support/WebDriver.Support.csproj‎ renamed to ‎dotnet/src/support/Selenium.WebDriver.Support.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</PropertyGroup>
3838

3939
<ItemGroup>
40-
<ProjectReference Include="$(CsprojIncludePath)\WebDriver.csproj" />
40+
<ProjectReference Include="$(CsprojIncludePath)\Selenium.WebDriver.csproj" />
4141
</ItemGroup>
4242

4343
</Project>

‎dotnet/src/support/WebDriver.Support.nuspec‎ renamed to ‎dotnet/src/support/Selenium.WebDriver.Support.nuspec‎

File renamed without changes.

‎dotnet/src/webdriver/BUILD.bazel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ csharp_library(
103103
"**/*.cs",
104104
]) + devtools_version_targets(),
105105
out = "WebDriver.StrongNamed",
106-
keyfile = "//dotnet:WebDriver.snk",
106+
keyfile = "//dotnet:Selenium.snk",
107107
langversion = "12.0",
108108
nullable = "enable",
109109
resources = [
@@ -141,7 +141,7 @@ csharp_library(
141141
defines = [
142142
"NET8_0_OR_GREATER",
143143
],
144-
keyfile = "//dotnet:WebDriver.snk",
144+
keyfile = "//dotnet:Selenium.snk",
145145
langversion = "12.0",
146146
nullable = "enable",
147147
resources = [
@@ -216,7 +216,7 @@ nuget_pack(
216216
":webdriver-net8.0": "WebDriver",
217217
":webdriver-netstandard2.0": "WebDriver",
218218
},
219-
nuspec_template = "WebDriver.nuspec",
219+
nuspec_template = "Selenium.WebDriver.nuspec",
220220
tags = [
221221
"block-network",
222222
],
@@ -242,7 +242,7 @@ nuget_pack(
242242
":webdriver-net8.0-strongnamed": "WebDriver.StrongNamed",
243243
":webdriver-netstandard2.0-strongnamed": "WebDriver.StrongNamed",
244244
},
245-
nuspec_template = "WebDriver.StrongNamed.nuspec",
245+
nuspec_template = "Selenium.WebDriver.StrongNamed.nuspec",
246246
property_group_vars = {
247247
"BaseImagePath": "images",
248248
"BaseSeleniumManagerPath": "manager",

0 commit comments

Comments
 (0)