Skip to content

Commit ff4f51e

Browse files
aguspeaguspe
authored
Merge branch 'trunk' into rb_make_bidi_timeout_configurable
2 parents 6d363dd + 0c9f59f commit ff4f51e

File tree

25 files changed

+745
-531
lines changed

25 files changed

+745
-531
lines changed

‎common/repositories.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ js_library(
165165

166166
http_archive(
167167
name = "linux_edgedriver",
168-
url = "https://msedgedriver.azureedge.net/138.0.3351.83/edgedriver_linux64.zip",
168+
url = "https://msedgedriver.microsoft.com/138.0.3351.83/edgedriver_linux64.zip",
169169
sha256 = "ed7d3651a5087bf7cdd383c244de29fa9e6a347473ff53c0172583380c5f7256",
170170
build_file_content = """
171171
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -182,7 +182,7 @@ js_library(
182182

183183
http_archive(
184184
name = "mac_edgedriver",
185-
url = "https://msedgedriver.azureedge.net/138.0.3351.83/edgedriver_mac64.zip",
185+
url = "https://msedgedriver.microsoft.com/138.0.3351.83/edgedriver_mac64.zip",
186186
sha256 = "a9e267a880300ed8dc77fc4ff12d4a66b49e3443d23c1091af277f332b2fc041",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")

‎common/selenium_manager.bzl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ def selenium_manager():
66
http_file(
77
name = "download_sm_linux",
88
executable = True,
9-
sha256 = "50099355b0e74b8bb231a5b152fc3de498dcde1cdebcefb1e501713e9b124b9d",
10-
url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-0ab9b6d/selenium-manager-linux",
9+
sha256 = "f615ae2eea714a54e322f8945c7abb19e03e0f5d651b464bd5cd9e9ecf9e7c90",
10+
url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-9d09338/selenium-manager-linux",
1111
)
1212

1313
http_file(
1414
name = "download_sm_macos",
1515
executable = True,
16-
sha256 = "eb98ce344acfaee3a7d58038331a8b49985ac724d2a9ec02258008c076979846",
17-
url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-0ab9b6d/selenium-manager-macos",
16+
sha256 = "88fede46d14991930aab3176f6938ddb7549ab244f6d75a9745050d625274852",
17+
url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-9d09338/selenium-manager-macos",
1818
)
1919

2020
http_file(
2121
name = "download_sm_windows",
2222
executable = True,
23-
sha256 = "7090d5737aebabb9daad49022b070d3456b8e43ae7f3ac5bcb780af67c371b3f",
24-
url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-0ab9b6d/selenium-manager-windows.exe",
23+
sha256 = "a7e8a7e0f561e7d8238f8aa884ef2dd6235884d3b0e97f25061747dbf4ec5037",
24+
url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-9d09338/selenium-manager-windows.exe",
2525
)
2626

2727
def _selenium_manager_artifacts_impl(_ctx):

‎dotnet/src/webdriver/BUILD.bazel‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -162,21 +162,21 @@ csharp_library(
162162
)
163163

164164
copy_file(
165-
name = "readme",
166-
src = "//dotnet/src/webdriver/assets:README.md",
165+
name = "assets-nuget-readme",
166+
src = "//dotnet/src/webdriver/assets:nuget/README.md",
167167
out = "README.md",
168168
)
169169

170170
copy_file(
171-
name = "props",
172-
src = "//dotnet/src/webdriver/assets:Selenium.WebDriver.targets",
171+
name = "assets-nuget-build-netstandard20-targets",
172+
src = "//dotnet/src/webdriver/assets:nuget/build/netstandard2.0/Selenium.WebDriver.targets",
173173
out = "Selenium.WebDriver.targets",
174174
)
175175

176176
copy_file(
177-
name = "transitive-props",
178-
src = "//dotnet/src/webdriver/assets:Selenium.WebDriver.targets",
179-
out = "transitive.Selenium.WebDriver.targets",
177+
name = "assets-nuget-buildtransitive-netstandard20-targets",
178+
src = "//dotnet/src/webdriver/assets:nuget/buildTransitive/netstandard2.0/Selenium.WebDriver.targets",
179+
out = "transitiveSelenium.WebDriver.targets",
180180
)
181181

182182
copy_file(
@@ -207,9 +207,9 @@ nuget_pack(
207207
"//common/manager:selenium-manager-linux": "manager/linux/selenium-manager",
208208
"//common/manager:selenium-manager-macos": "manager/macos/selenium-manager",
209209
"//common/manager:selenium-manager-windows": "manager/windows/selenium-manager.exe",
210-
":readme": "README.md",
211-
":props": "build/Selenium.WebDriver.targets",
212-
":transitive-props": "buildTransitive/Selenium.WebDriver.targets",
210+
":assets-nuget-readme": "README.md",
211+
":assets-nuget-build-netstandard20-targets": "build/netstandard2.0/Selenium.WebDriver.targets",
212+
":assets-nuget-buildtransitive-netstandard20-targets": "buildTransitive/netstandard2.0/Selenium.WebDriver.targets",
213213
},
214214
id = "Selenium.WebDriver",
215215
libs = {
@@ -233,9 +233,9 @@ nuget_pack(
233233
"//common/manager:selenium-manager-linux": "manager/linux/selenium-manager",
234234
"//common/manager:selenium-manager-macos": "manager/macos/selenium-manager",
235235
"//common/manager:selenium-manager-windows": "manager/windows/selenium-manager.exe",
236-
":readme": "README.md",
237-
":props": "build/Selenium.WebDriver.StrongNamed.targets",
238-
":transitive-props": "buildTransitive/Selenium.WebDriver.StrongNamed.targets",
236+
":assets-nuget-readme": "README.md",
237+
":assets-nuget-build-netstandard20-targets": "build/netstandard2.0/Selenium.WebDriver.StrongNamed.targets",
238+
":assets-nuget-buildtransitive-netstandard20-targets": "buildTransitive/netstandard2.0/Selenium.WebDriver.StrongNamed.targets",
239239
},
240240
id = "Selenium.WebDriver.StrongNamed",
241241
libs = {

‎dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContext.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,6 @@ public Task TraverseHistoryAsync(int delta, TraverseHistoryOptions? options = nu
9191
return BiDi.BrowsingContext.TraverseHistoryAsync(this, delta, options);
9292
}
9393

94-
public Task NavigateBackAsync(TraverseHistoryOptions? options = null)
95-
{
96-
return TraverseHistoryAsync(-1, options);
97-
}
98-
99-
public Task NavigateForwardAsync(TraverseHistoryOptions? options = null)
100-
{
101-
return TraverseHistoryAsync(1, options);
102-
}
103-
10494
public Task SetViewportAsync(SetViewportOptions? options = null)
10595
{
10696
return BiDi.BrowsingContext.SetViewportAsync(this, options);

‎dotnet/src/webdriver/Internal/PortUtilities.cs‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,10 @@ public static class PortUtilities
3333
/// <returns>A random, free port to be listened on.</returns>
3434
public static int FindFreePort()
3535
{
36-
// Locate a free port on the local machine by binding a socket to
37-
// an IPEndPoint using IPAddress.Any and port 0. The socket will
38-
// select a free port.
39-
int listeningPort = 0;
40-
Socket portSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
41-
try
42-
{
43-
IPEndPoint socketEndPoint = new IPEndPoint(IPAddress.Any, 0);
44-
portSocket.Bind(socketEndPoint);
45-
socketEndPoint = (IPEndPoint)portSocket.LocalEndPoint!;
46-
listeningPort = socketEndPoint.Port;
47-
}
48-
finally
49-
{
50-
portSocket.Close();
51-
}
36+
using var socket = new Socket(AddressFamily.InterNetworkV6, SocketType.Stream, ProtocolType.Tcp);
37+
socket.DualMode = true;
38+
socket.Bind(new IPEndPoint(IPAddress.IPv6Loopback, 0));
39+
return (socket.LocalEndPoint as IPEndPoint)!.Port;
5240

53-
return listeningPort;
5441
}
5542
}

‎dotnet/src/webdriver/Selenium.WebDriver.StrongNamed.nuspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343
<file src="lib/net8.0/WebDriver.StrongNamed.pdb" target="lib/net8.0/WebDriver.StrongNamed.pdb" />
4444
<file src="lib/net8.0/WebDriver.StrongNamed.xml" target="lib/net8.0/WebDriver.StrongNamed.xml" />
4545

46-
<file src="build/Selenium.WebDriver.StrongNamed.targets" target="build/Selenium.WebDriver.StrongNamed.targets"/>
47-
<file src="buildTransitive/Selenium.WebDriver.StrongNamed.targets" target="buildTransitive/Selenium.WebDriver.StrongNamed.targets"/>
46+
<file src="build/netstandard2.0/Selenium.WebDriver.StrongNamed.targets" target="build/netstandard2.0/Selenium.WebDriver.StrongNamed.targets"/>
47+
<file src="buildTransitive/netstandard2.0/Selenium.WebDriver.StrongNamed.targets" target="buildTransitive/netstandard2.0/Selenium.WebDriver.StrongNamed.targets"/>
4848

49-
<file src="manager/linux/selenium-manager" target="manager/linux/selenium-manager" />
50-
<file src="manager/macos/selenium-manager" target="manager/macos/selenium-manager" />
51-
<file src="manager/windows/selenium-manager.exe" target="manager/windows/selenium-manager.exe" />
49+
<file src="manager/linux/selenium-manager" target="runtimes/linux/native/selenium-manager" />
50+
<file src="manager/macos/selenium-manager" target="runtimes/osx/native/selenium-manager" />
51+
<file src="manager/windows/selenium-manager.exe" target="runtimes/win/native/selenium-manager.exe" />
5252

5353
<file src="icon.png" />
5454
<file src="README.md" />

‎dotnet/src/webdriver/Selenium.WebDriver.csproj‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
<GenerateDocumentationFile>true</GenerateDocumentationFile>
4444
</PropertyGroup>
4545

46+
<PropertyGroup>
47+
<BaseSeleniumManagerPath>$(MSBuildThisFileDirectory)..\..\..\bazel-bin\dotnet\src\webdriver\manager</BaseSeleniumManagerPath>
48+
</PropertyGroup>
49+
4650
<!--TODO when AOT is ready https://github.com/SeleniumHQ/selenium/issues/14480-->
4751
<!--<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
4852
<IsAotCompatible>true</IsAotCompatible>
@@ -56,29 +60,25 @@
5660
<PackageReference Include="System.Text.Json" Version="8.0.5" />
5761
</ItemGroup>
5862

59-
<PropertyGroup>
60-
<BaseImagePath>..\..\..\bazel-bin\dotnet\src\webdriver\images</BaseImagePath>
61-
</PropertyGroup>
62-
6363
<ItemGroup>
64-
<None Include="assets\Selenium.WebDriver.targets" Pack="true" PackagePath="build\" />
65-
<None Include="assets\Selenium.WebDriver.targets" Pack="true" PackagePath="buildTransitive\" />
66-
67-
<None Include="$(BaseImagePath)\selenium_logo_small.png" Pack="true" PackagePath="logo.png" Visible="false" />
68-
69-
<None Include="$(BaseSeleniumManagerPath)\linux\selenium-manager" Pack="true" PackagePath="manager\linux" Visible="false" />
70-
<None Include="$(BaseSeleniumManagerPath)\macos\selenium-manager" Pack="true" PackagePath="manager\macos" Visible="false" />
71-
<None Include="$(BaseSeleniumManagerPath)\windows\selenium-manager.exe" Pack="true" PackagePath="manager\windows" Visible="false" />
64+
<None Include="assets\nuget\build\netstandard2.0\Selenium.WebDriver.targets" Pack="true" PackagePath="build\netstandard2.0\" />
65+
<None Include="assets\nuget\buildTransitive\netstandard2.0\Selenium.WebDriver.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\" />
7266
</ItemGroup>
7367

7468
<Target Name="GenerateSeleniumManagerBinaries" BeforeTargets="BeforeBuild">
7569
<Exec Command="bazel build //dotnet/src/webdriver:manager-linux //dotnet/src/webdriver:manager-windows //dotnet/src/webdriver:manager-macos" WorkingDirectory="../../.." />
76-
77-
<PropertyGroup>
78-
<BaseSeleniumManagerPath>..\..\..\bazel-bin\dotnet\src\webdriver\manager</BaseSeleniumManagerPath>
79-
</PropertyGroup>
8070
</Target>
8171

72+
<ItemGroup>
73+
<None Include="$(BaseSeleniumManagerPath)\linux\selenium-manager" Pack="true" PackagePath="runtimes\linux\native\" Visible="false" CopyToOutputDirectory="PreserveNewest" Link="runtimes\linux\native\selenium-manager" />
74+
<None Include="$(BaseSeleniumManagerPath)\macos\selenium-manager" Pack="true" PackagePath="runtimes\osx\native\" Visible="false" CopyToOutputDirectory="PreserveNewest" Link="runtimes\osx\native\selenium-manager" />
75+
<None Include="$(BaseSeleniumManagerPath)\windows\selenium-manager.exe" Pack="true" PackagePath="runtimes\win\native\" Visible="false" CopyToOutputDirectory="PreserveNewest" Link="runtimes\win\native\selenium-manager.exe" />
76+
</ItemGroup>
77+
78+
<ItemGroup>
79+
<None Include="..\..\..\common\images\selenium_logo_small.png" Pack="true" PackagePath="logo.png" Visible="false" />
80+
</ItemGroup>
81+
8282
<Target Name="GenerateAtoms" BeforeTargets="BeforeBuild">
8383
<Exec Command="bazel build //javascript/webdriver/atoms:get-attribute.js //javascript/atoms/fragments:is-displayed.js //javascript/atoms/fragments:find-elements.js" WorkingDirectory="../../.." />
8484

@@ -114,4 +114,4 @@
114114
</ItemGroup>
115115
</Target>
116116

117-
</Project>
117+
</Project>

‎dotnet/src/webdriver/Selenium.WebDriver.nuspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343
<file src="lib/net8.0/WebDriver.pdb" target="lib/net8.0/WebDriver.pdb" />
4444
<file src="lib/net8.0/WebDriver.xml" target="lib/net8.0/WebDriver.xml" />
4545

46-
<file src="build/Selenium.WebDriver.targets" target="build/Selenium.WebDriver.targets"/>
47-
<file src="buildTransitive/Selenium.WebDriver.targets" target="buildTransitive/Selenium.WebDriver.targets"/>
46+
<file src="build/netstandard2.0/Selenium.WebDriver.targets" target="build/netstandard2.0/Selenium.WebDriver.targets"/>
47+
<file src="buildTransitive/netstandard2.0/Selenium.WebDriver.targets" target="buildTransitive/netstandard2.0/Selenium.WebDriver.targets"/>
4848

49-
<file src="manager/linux/selenium-manager" target="manager/linux/selenium-manager" />
50-
<file src="manager/macos/selenium-manager" target="manager/macos/selenium-manager" />
51-
<file src="manager/windows/selenium-manager.exe" target="manager/windows/selenium-manager.exe" />
49+
<file src="manager/linux/selenium-manager" target="runtimes/linux/native/selenium-manager" />
50+
<file src="manager/macos/selenium-manager" target="runtimes/osx/native/selenium-manager" />
51+
<file src="manager/windows/selenium-manager.exe" target="runtimes/win/native/selenium-manager.exe" />
5252

5353
<file src="icon.png" />
5454
<file src="README.md" />

0 commit comments

Comments
 (0)