From fea13ba7bec9221d7f179a4f71404ef16c009d85 Mon Sep 17 00:00:00 2001 From: Nikolay Borisenko <22616990+nvborisenko@users.noreply.github.com> Date: Mon, 2 Jun 2025 02:01:23 +0300 Subject: [PATCH 1/5] Obvious --- ...bDriver.NET.sln => Selenium.WebDriver.sln} | 20 ++++----- .../{WebDriver.snk => Selenium.WebDriver.snk} | Bin ...nium.WebDriver.Support.StrongNamed.nuspec} | 0 ...proj => Selenium.WebDriver.Support.csproj} | 2 +- ...spec => Selenium.WebDriver.Support.nuspec} | 0 ... => Selenium.WebDriver.StrongNamed.nuspec} | 0 ...river.csproj => Selenium.WebDriver.csproj} | 0 ...river.nuspec => Selenium.WebDriver.nuspec} | 0 .../Selenium.WebDriver.Chrome.Tests.csproj | 18 +++++++++ ... => Selenium.WebDriver.Chrome.Tests.nunit} | 0 .../test/chrome/WebDriver.Chrome.Tests.csproj | 38 ------------------ ...=> Selenium.WebDriver.Common.Tests.csproj} | 2 +- ...j => Selenium.WebDriver.Edge.Tests.csproj} | 23 +---------- ...it => Selenium.WebDriver.Edge.Tests.nunit} | 0 ...> Selenium.WebDriver.Firefox.Tests.csproj} | 22 +--------- ...=> Selenium.WebDriver.Firefox.Tests.nunit} | 0 ...roj => Selenium.WebDriver.IE.Tests.csproj} | 19 +-------- ...unit => Selenium.WebDriver.IE.Tests.nunit} | 0 ...=> Selenium.WebDriver.Remote.Tests.csproj} | 19 +-------- ... => Selenium.WebDriver.Remote.Tests.nunit} | 0 ...=> Selenium.WebDriver.Safari.Tests.csproj} | 14 +------ ... => Selenium.WebDriver.Safari.Tests.nunit} | 0 ...> Selenium.WebDriver.Support.Tests.csproj} | 22 ++-------- ...=> Selenium.WebDriver.Support.Tests.nunit} | 0 24 files changed, 44 insertions(+), 155 deletions(-) rename dotnet/{WebDriver.NET.sln => Selenium.WebDriver.sln} (81%) rename dotnet/{WebDriver.snk => Selenium.WebDriver.snk} (100%) rename dotnet/src/support/{WebDriver.Support.StrongNamed.nuspec => Selenium.WebDriver.Support.StrongNamed.nuspec} (100%) rename dotnet/src/support/{WebDriver.Support.csproj => Selenium.WebDriver.Support.csproj} (95%) rename dotnet/src/support/{WebDriver.Support.nuspec => Selenium.WebDriver.Support.nuspec} (100%) rename dotnet/src/webdriver/{WebDriver.StrongNamed.nuspec => Selenium.WebDriver.StrongNamed.nuspec} (100%) rename dotnet/src/webdriver/{WebDriver.csproj => Selenium.WebDriver.csproj} (100%) rename dotnet/src/webdriver/{WebDriver.nuspec => Selenium.WebDriver.nuspec} (100%) create mode 100644 dotnet/test/chrome/Selenium.WebDriver.Chrome.Tests.csproj rename dotnet/test/chrome/{WebDriver.Chrome.Tests.nunit => Selenium.WebDriver.Chrome.Tests.nunit} (100%) delete mode 100644 dotnet/test/chrome/WebDriver.Chrome.Tests.csproj rename dotnet/test/common/{WebDriver.Common.Tests.csproj => Selenium.WebDriver.Common.Tests.csproj} (95%) rename dotnet/test/edge/{WebDriver.Edge.Tests.csproj => Selenium.WebDriver.Edge.Tests.csproj} (53%) rename dotnet/test/edge/{WebDriver.Edge.Tests.nunit => Selenium.WebDriver.Edge.Tests.nunit} (100%) rename dotnet/test/firefox/{WebDriver.Firefox.Tests.csproj => Selenium.WebDriver.Firefox.Tests.csproj} (53%) rename dotnet/test/firefox/{WebDriver.Firefox.Tests.nunit => Selenium.WebDriver.Firefox.Tests.nunit} (100%) rename dotnet/test/ie/{WebDriver.IE.Tests.csproj => Selenium.WebDriver.IE.Tests.csproj} (57%) rename dotnet/test/ie/{WebDriver.IE.Tests.nunit => Selenium.WebDriver.IE.Tests.nunit} (100%) rename dotnet/test/remote/{WebDriver.Remote.Tests.csproj => Selenium.WebDriver.Remote.Tests.csproj} (57%) rename dotnet/test/remote/{WebDriver.Remote.Tests.nunit => Selenium.WebDriver.Remote.Tests.nunit} (100%) rename dotnet/test/safari/{WebDriver.Safari.Tests.csproj => Selenium.WebDriver.Safari.Tests.csproj} (63%) rename dotnet/test/safari/{WebDriver.Safari.Tests.nunit => Selenium.WebDriver.Safari.Tests.nunit} (100%) rename dotnet/test/support/{WebDriver.Support.Tests.csproj => Selenium.WebDriver.Support.Tests.csproj} (52%) rename dotnet/test/support/{WebDriver.Support.Tests.nunit => Selenium.WebDriver.Support.Tests.nunit} (100%) diff --git a/dotnet/WebDriver.NET.sln b/dotnet/Selenium.WebDriver.sln similarity index 81% rename from dotnet/WebDriver.NET.sln rename to dotnet/Selenium.WebDriver.sln index 945f8ecb8b3b9..12d2260f0c6b1 100644 --- a/dotnet/WebDriver.NET.sln +++ b/dotnet/Selenium.WebDriver.sln @@ -3,25 +3,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2026 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver", "src\webdriver\WebDriver.csproj", "{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver", "src\webdriver\Selenium.WebDriver.csproj", "{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Support", "src\support\WebDriver.Support.csproj", "{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Support", "src\support\Selenium.WebDriver.Support.csproj", "{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Common.Tests", "test\common\WebDriver.Common.Tests.csproj", "{1869A2D9-3782-41E4-84DD-EB1A5E971C93}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Common.Tests", "test\common\Selenium.WebDriver.Common.Tests.csproj", "{1869A2D9-3782-41E4-84DD-EB1A5E971C93}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Chrome.Tests", "test\chrome\WebDriver.Chrome.Tests.csproj", "{F5751636-2F68-4BE3-B383-D4F4937A1946}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Chrome.Tests", "test\chrome\Selenium.WebDriver.Chrome.Tests.csproj", "{F5751636-2F68-4BE3-B383-D4F4937A1946}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Edge.Tests", "test\edge\WebDriver.Edge.Tests.csproj", "{EF99FB04-94C3-4AA0-8809-B514B253DF51}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Edge.Tests", "test\edge\Selenium.WebDriver.Edge.Tests.csproj", "{EF99FB04-94C3-4AA0-8809-B514B253DF51}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.IE.Tests", "test\ie\WebDriver.IE.Tests.csproj", "{E54A6F7B-3939-4DE5-85CC-28158615A967}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.IE.Tests", "test\ie\Selenium.WebDriver.IE.Tests.csproj", "{E54A6F7B-3939-4DE5-85CC-28158615A967}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Firefox.Tests", "test\firefox\WebDriver.Firefox.Tests.csproj", "{F912F647-04A0-4081-91B4-985EE0E9097C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Firefox.Tests", "test\firefox\Selenium.WebDriver.Firefox.Tests.csproj", "{F912F647-04A0-4081-91B4-985EE0E9097C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Remote.Tests", "test\remote\WebDriver.Remote.Tests.csproj", "{B9C6B276-445A-400F-BE74-1E068F50A54D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Remote.Tests", "test\remote\Selenium.WebDriver.Remote.Tests.csproj", "{B9C6B276-445A-400F-BE74-1E068F50A54D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Safari.Tests", "test\safari\WebDriver.Safari.Tests.csproj", "{BB08F673-1553-4A56-882A-A2A115AC06C2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Safari.Tests", "test\safari\Selenium.WebDriver.Safari.Tests.csproj", "{BB08F673-1553-4A56-882A-A2A115AC06C2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Support.Tests", "test\support\WebDriver.Support.Tests.csproj", "{2136C695-2526-45E0-AE1D-68FBBC6A9DE2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Support.Tests", "test\support\Selenium.WebDriver.Support.Tests.csproj", "{2136C695-2526-45E0-AE1D-68FBBC6A9DE2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/dotnet/WebDriver.snk b/dotnet/Selenium.WebDriver.snk similarity index 100% rename from dotnet/WebDriver.snk rename to dotnet/Selenium.WebDriver.snk diff --git a/dotnet/src/support/WebDriver.Support.StrongNamed.nuspec b/dotnet/src/support/Selenium.WebDriver.Support.StrongNamed.nuspec similarity index 100% rename from dotnet/src/support/WebDriver.Support.StrongNamed.nuspec rename to dotnet/src/support/Selenium.WebDriver.Support.StrongNamed.nuspec diff --git a/dotnet/src/support/WebDriver.Support.csproj b/dotnet/src/support/Selenium.WebDriver.Support.csproj similarity index 95% rename from dotnet/src/support/WebDriver.Support.csproj rename to dotnet/src/support/Selenium.WebDriver.Support.csproj index 6a3affff178be..1ddf670d553c8 100644 --- a/dotnet/src/support/WebDriver.Support.csproj +++ b/dotnet/src/support/Selenium.WebDriver.Support.csproj @@ -37,7 +37,7 @@ - + diff --git a/dotnet/src/support/WebDriver.Support.nuspec b/dotnet/src/support/Selenium.WebDriver.Support.nuspec similarity index 100% rename from dotnet/src/support/WebDriver.Support.nuspec rename to dotnet/src/support/Selenium.WebDriver.Support.nuspec diff --git a/dotnet/src/webdriver/WebDriver.StrongNamed.nuspec b/dotnet/src/webdriver/Selenium.WebDriver.StrongNamed.nuspec similarity index 100% rename from dotnet/src/webdriver/WebDriver.StrongNamed.nuspec rename to dotnet/src/webdriver/Selenium.WebDriver.StrongNamed.nuspec diff --git a/dotnet/src/webdriver/WebDriver.csproj b/dotnet/src/webdriver/Selenium.WebDriver.csproj similarity index 100% rename from dotnet/src/webdriver/WebDriver.csproj rename to dotnet/src/webdriver/Selenium.WebDriver.csproj diff --git a/dotnet/src/webdriver/WebDriver.nuspec b/dotnet/src/webdriver/Selenium.WebDriver.nuspec similarity index 100% rename from dotnet/src/webdriver/WebDriver.nuspec rename to dotnet/src/webdriver/Selenium.WebDriver.nuspec diff --git a/dotnet/test/chrome/Selenium.WebDriver.Chrome.Tests.csproj b/dotnet/test/chrome/Selenium.WebDriver.Chrome.Tests.csproj new file mode 100644 index 0000000000000..3028596c5c874 --- /dev/null +++ b/dotnet/test/chrome/Selenium.WebDriver.Chrome.Tests.csproj @@ -0,0 +1,18 @@ + + + + net8.0 + WebDriver.Chrome.Tests + + + + + + + + + + + + + diff --git a/dotnet/test/chrome/WebDriver.Chrome.Tests.nunit b/dotnet/test/chrome/Selenium.WebDriver.Chrome.Tests.nunit similarity index 100% rename from dotnet/test/chrome/WebDriver.Chrome.Tests.nunit rename to dotnet/test/chrome/Selenium.WebDriver.Chrome.Tests.nunit diff --git a/dotnet/test/chrome/WebDriver.Chrome.Tests.csproj b/dotnet/test/chrome/WebDriver.Chrome.Tests.csproj deleted file mode 100644 index e1e27b5cca5a2..0000000000000 --- a/dotnet/test/chrome/WebDriver.Chrome.Tests.csproj +++ /dev/null @@ -1,38 +0,0 @@ - - - - net8.0 - WebDriver.Chrome.Tests - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - - - - - - diff --git a/dotnet/test/common/WebDriver.Common.Tests.csproj b/dotnet/test/common/Selenium.WebDriver.Common.Tests.csproj similarity index 95% rename from dotnet/test/common/WebDriver.Common.Tests.csproj rename to dotnet/test/common/Selenium.WebDriver.Common.Tests.csproj index 270c832cb6785..2451c0556f8af 100644 --- a/dotnet/test/common/WebDriver.Common.Tests.csproj +++ b/dotnet/test/common/Selenium.WebDriver.Common.Tests.csproj @@ -20,7 +20,7 @@ - + diff --git a/dotnet/test/edge/WebDriver.Edge.Tests.csproj b/dotnet/test/edge/Selenium.WebDriver.Edge.Tests.csproj similarity index 53% rename from dotnet/test/edge/WebDriver.Edge.Tests.csproj rename to dotnet/test/edge/Selenium.WebDriver.Edge.Tests.csproj index 9d17837b8c25a..c73fc9621988d 100644 --- a/dotnet/test/edge/WebDriver.Edge.Tests.csproj +++ b/dotnet/test/edge/Selenium.WebDriver.Edge.Tests.csproj @@ -1,29 +1,10 @@ - + net8.0 WebDriver.Edge.Tests - - - - - - - - - - - - - - - - - - - @@ -31,7 +12,7 @@ - + diff --git a/dotnet/test/edge/WebDriver.Edge.Tests.nunit b/dotnet/test/edge/Selenium.WebDriver.Edge.Tests.nunit similarity index 100% rename from dotnet/test/edge/WebDriver.Edge.Tests.nunit rename to dotnet/test/edge/Selenium.WebDriver.Edge.Tests.nunit diff --git a/dotnet/test/firefox/WebDriver.Firefox.Tests.csproj b/dotnet/test/firefox/Selenium.WebDriver.Firefox.Tests.csproj similarity index 53% rename from dotnet/test/firefox/WebDriver.Firefox.Tests.csproj rename to dotnet/test/firefox/Selenium.WebDriver.Firefox.Tests.csproj index 7a4f0af3e456a..4b1d268dad4d9 100644 --- a/dotnet/test/firefox/WebDriver.Firefox.Tests.csproj +++ b/dotnet/test/firefox/Selenium.WebDriver.Firefox.Tests.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -6,17 +6,7 @@ - - - - - - - - - - - + @@ -25,18 +15,10 @@ - - - - - - - - diff --git a/dotnet/test/firefox/WebDriver.Firefox.Tests.nunit b/dotnet/test/firefox/Selenium.WebDriver.Firefox.Tests.nunit similarity index 100% rename from dotnet/test/firefox/WebDriver.Firefox.Tests.nunit rename to dotnet/test/firefox/Selenium.WebDriver.Firefox.Tests.nunit diff --git a/dotnet/test/ie/WebDriver.IE.Tests.csproj b/dotnet/test/ie/Selenium.WebDriver.IE.Tests.csproj similarity index 57% rename from dotnet/test/ie/WebDriver.IE.Tests.csproj rename to dotnet/test/ie/Selenium.WebDriver.IE.Tests.csproj index 528c57cb645ad..840fdf00a89d5 100644 --- a/dotnet/test/ie/WebDriver.IE.Tests.csproj +++ b/dotnet/test/ie/Selenium.WebDriver.IE.Tests.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -6,17 +6,6 @@ OpenQA.Selenium.IE - - - - - - - - - - - @@ -24,7 +13,7 @@ - + @@ -33,8 +22,4 @@ - - - - diff --git a/dotnet/test/ie/WebDriver.IE.Tests.nunit b/dotnet/test/ie/Selenium.WebDriver.IE.Tests.nunit similarity index 100% rename from dotnet/test/ie/WebDriver.IE.Tests.nunit rename to dotnet/test/ie/Selenium.WebDriver.IE.Tests.nunit diff --git a/dotnet/test/remote/WebDriver.Remote.Tests.csproj b/dotnet/test/remote/Selenium.WebDriver.Remote.Tests.csproj similarity index 57% rename from dotnet/test/remote/WebDriver.Remote.Tests.csproj rename to dotnet/test/remote/Selenium.WebDriver.Remote.Tests.csproj index cff5b5b73e4e2..40c7d5fdb6252 100644 --- a/dotnet/test/remote/WebDriver.Remote.Tests.csproj +++ b/dotnet/test/remote/Selenium.WebDriver.Remote.Tests.csproj @@ -1,21 +1,10 @@ - + net8.0 WebDriver.Remote.Tests - - - - - - - - - - - @@ -23,7 +12,7 @@ - + @@ -32,8 +21,4 @@ - - - - diff --git a/dotnet/test/remote/WebDriver.Remote.Tests.nunit b/dotnet/test/remote/Selenium.WebDriver.Remote.Tests.nunit similarity index 100% rename from dotnet/test/remote/WebDriver.Remote.Tests.nunit rename to dotnet/test/remote/Selenium.WebDriver.Remote.Tests.nunit diff --git a/dotnet/test/safari/WebDriver.Safari.Tests.csproj b/dotnet/test/safari/Selenium.WebDriver.Safari.Tests.csproj similarity index 63% rename from dotnet/test/safari/WebDriver.Safari.Tests.csproj rename to dotnet/test/safari/Selenium.WebDriver.Safari.Tests.csproj index 719e80ac28402..fdd5bfdfbe9b5 100644 --- a/dotnet/test/safari/WebDriver.Safari.Tests.csproj +++ b/dotnet/test/safari/Selenium.WebDriver.Safari.Tests.csproj @@ -1,20 +1,10 @@ - + net8.0 WebDriver.Safari.Tests - - - - - - - - - - @@ -22,7 +12,7 @@ - + diff --git a/dotnet/test/safari/WebDriver.Safari.Tests.nunit b/dotnet/test/safari/Selenium.WebDriver.Safari.Tests.nunit similarity index 100% rename from dotnet/test/safari/WebDriver.Safari.Tests.nunit rename to dotnet/test/safari/Selenium.WebDriver.Safari.Tests.nunit diff --git a/dotnet/test/support/WebDriver.Support.Tests.csproj b/dotnet/test/support/Selenium.WebDriver.Support.Tests.csproj similarity index 52% rename from dotnet/test/support/WebDriver.Support.Tests.csproj rename to dotnet/test/support/Selenium.WebDriver.Support.Tests.csproj index 12a5a877fefb8..be6aaef57a009 100644 --- a/dotnet/test/support/WebDriver.Support.Tests.csproj +++ b/dotnet/test/support/Selenium.WebDriver.Support.Tests.csproj @@ -1,20 +1,10 @@ - + net8.0 WebDriver.Support.Tests - - - - - - - - - - @@ -23,9 +13,9 @@ - - - + + + @@ -34,8 +24,4 @@ - - - - diff --git a/dotnet/test/support/WebDriver.Support.Tests.nunit b/dotnet/test/support/Selenium.WebDriver.Support.Tests.nunit similarity index 100% rename from dotnet/test/support/WebDriver.Support.Tests.nunit rename to dotnet/test/support/Selenium.WebDriver.Support.Tests.nunit From 22cdc827ca9f949d6c6d8d014785e4be407e76b4 Mon Sep 17 00:00:00 2001 From: Nikolay Borisenko <22616990+nvborisenko@users.noreply.github.com> Date: Mon, 2 Jun 2025 22:49:56 +0300 Subject: [PATCH 2/5] In bazel --- dotnet/BUILD.bazel | 2 +- dotnet/src/support/BUILD.bazel | 6 +++--- dotnet/src/webdriver/BUILD.bazel | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dotnet/BUILD.bazel b/dotnet/BUILD.bazel index 5315ea13867f8..bc1a19bef75ec 100644 --- a/dotnet/BUILD.bazel +++ b/dotnet/BUILD.bazel @@ -2,7 +2,7 @@ load("@rules_pkg//pkg:zip.bzl", "pkg_zip") exports_files([ "AssemblyInfo.cs.template", - "WebDriver.snk", + "Selenium.WebDriver.snk", ]) pkg_zip( diff --git a/dotnet/src/support/BUILD.bazel b/dotnet/src/support/BUILD.bazel index 85cc060bcc324..f855c3b1dcbd0 100644 --- a/dotnet/src/support/BUILD.bazel +++ b/dotnet/src/support/BUILD.bazel @@ -56,7 +56,7 @@ nuget_pack( libs = { ":support": "WebDriver.Support", }, - nuspec_template = "WebDriver.Support.nuspec", + nuspec_template = "Selenium.WebDriver.Support.nuspec", tags = [ "block-network", ], @@ -73,7 +73,7 @@ csharp_library( "UI/*.cs", ]) + [":assembly-info"], out = "WebDriver.Support.StrongNamed", - keyfile = "//dotnet:WebDriver.snk", + keyfile = "//dotnet:Selenium.WebDriver.snk", langversion = "12.0", nullable = "enable", target_frameworks = [ @@ -96,7 +96,7 @@ nuget_pack( libs = { ":support-strongnamed": "WebDriver.Support.StrongNamed", }, - nuspec_template = "WebDriver.Support.StrongNamed.nuspec", + nuspec_template = "Selenium.WebDriver.Support.StrongNamed.nuspec", tags = [ "block-network", ], diff --git a/dotnet/src/webdriver/BUILD.bazel b/dotnet/src/webdriver/BUILD.bazel index 831a8eb05734a..f3751d2e8fa57 100644 --- a/dotnet/src/webdriver/BUILD.bazel +++ b/dotnet/src/webdriver/BUILD.bazel @@ -103,7 +103,7 @@ csharp_library( "**/*.cs", ]) + devtools_version_targets(), out = "WebDriver.StrongNamed", - keyfile = "//dotnet:WebDriver.snk", + keyfile = "//dotnet:Selenium.WebDriver.snk", langversion = "12.0", nullable = "enable", resources = [ @@ -141,7 +141,7 @@ csharp_library( defines = [ "NET8_0_OR_GREATER", ], - keyfile = "//dotnet:WebDriver.snk", + keyfile = "//dotnet:Selenium.WebDriver.snk", langversion = "12.0", nullable = "enable", resources = [ @@ -216,7 +216,7 @@ nuget_pack( ":webdriver-net8.0": "WebDriver", ":webdriver-netstandard2.0": "WebDriver", }, - nuspec_template = "WebDriver.nuspec", + nuspec_template = "Selenium.WebDriver.nuspec", tags = [ "block-network", ], @@ -242,7 +242,7 @@ nuget_pack( ":webdriver-net8.0-strongnamed": "WebDriver.StrongNamed", ":webdriver-netstandard2.0-strongnamed": "WebDriver.StrongNamed", }, - nuspec_template = "WebDriver.StrongNamed.nuspec", + nuspec_template = "Selenium.WebDriver.StrongNamed.nuspec", property_group_vars = { "BaseImagePath": "images", "BaseSeleniumManagerPath": "manager", From 8cc6360f7de394c90cd09b7e21f355f6bdc4c7ea Mon Sep 17 00:00:00 2001 From: Nikolay Borisenko <22616990+nvborisenko@users.noreply.github.com> Date: Mon, 2 Jun 2025 23:24:17 +0300 Subject: [PATCH 3/5] Update Rakefile --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 0746b9f06b583..294f7544dc7fa 100644 --- a/Rakefile +++ b/Rakefile @@ -1105,7 +1105,7 @@ namespace :all do ['common/devtools/', 'dotnet/src/webdriver/DevTools/', - 'dotnet/src/webdriver/WebDriver.csproj', + 'dotnet/src/webdriver/Selenium.WebDriver.csproj', 'dotnet/test/common/DevTools/', 'dotnet/test/common/CustomDriverConfigs/', 'dotnet/selenium-dotnet-version.bzl', From 1bf154930150a504b8d23693b86a7ed167fe4ec6 Mon Sep 17 00:00:00 2001 From: Nikolay Borisenko <22616990+nvborisenko@users.noreply.github.com> Date: Mon, 2 Jun 2025 23:30:01 +0300 Subject: [PATCH 4/5] Update Selenium.WebDriver.sln --- dotnet/Selenium.WebDriver.sln | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dotnet/Selenium.WebDriver.sln b/dotnet/Selenium.WebDriver.sln index 12d2260f0c6b1..59907c6346ca5 100644 --- a/dotnet/Selenium.WebDriver.sln +++ b/dotnet/Selenium.WebDriver.sln @@ -3,25 +3,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2026 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver", "src\webdriver\Selenium.WebDriver.csproj", "{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver", "src\webdriver\Selenium.WebDriver.csproj", "{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Support", "src\support\Selenium.WebDriver.Support.csproj", "{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Support", "src\support\Selenium.WebDriver.Support.csproj", "{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Common.Tests", "test\common\Selenium.WebDriver.Common.Tests.csproj", "{1869A2D9-3782-41E4-84DD-EB1A5E971C93}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Common.Tests", "test\common\Selenium.WebDriver.Common.Tests.csproj", "{1869A2D9-3782-41E4-84DD-EB1A5E971C93}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Chrome.Tests", "test\chrome\Selenium.WebDriver.Chrome.Tests.csproj", "{F5751636-2F68-4BE3-B383-D4F4937A1946}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Chrome.Tests", "test\chrome\Selenium.WebDriver.Chrome.Tests.csproj", "{F5751636-2F68-4BE3-B383-D4F4937A1946}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Edge.Tests", "test\edge\Selenium.WebDriver.Edge.Tests.csproj", "{EF99FB04-94C3-4AA0-8809-B514B253DF51}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Edge.Tests", "test\edge\Selenium.WebDriver.Edge.Tests.csproj", "{EF99FB04-94C3-4AA0-8809-B514B253DF51}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.IE.Tests", "test\ie\Selenium.WebDriver.IE.Tests.csproj", "{E54A6F7B-3939-4DE5-85CC-28158615A967}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.IE.Tests", "test\ie\Selenium.WebDriver.IE.Tests.csproj", "{E54A6F7B-3939-4DE5-85CC-28158615A967}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Firefox.Tests", "test\firefox\Selenium.WebDriver.Firefox.Tests.csproj", "{F912F647-04A0-4081-91B4-985EE0E9097C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Firefox.Tests", "test\firefox\Selenium.WebDriver.Firefox.Tests.csproj", "{F912F647-04A0-4081-91B4-985EE0E9097C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Remote.Tests", "test\remote\Selenium.WebDriver.Remote.Tests.csproj", "{B9C6B276-445A-400F-BE74-1E068F50A54D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Remote.Tests", "test\remote\Selenium.WebDriver.Remote.Tests.csproj", "{B9C6B276-445A-400F-BE74-1E068F50A54D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Safari.Tests", "test\safari\Selenium.WebDriver.Safari.Tests.csproj", "{BB08F673-1553-4A56-882A-A2A115AC06C2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Safari.Tests", "test\safari\Selenium.WebDriver.Safari.Tests.csproj", "{BB08F673-1553-4A56-882A-A2A115AC06C2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Support.Tests", "test\support\Selenium.WebDriver.Support.Tests.csproj", "{2136C695-2526-45E0-AE1D-68FBBC6A9DE2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Support.Tests", "test\support\Selenium.WebDriver.Support.Tests.csproj", "{2136C695-2526-45E0-AE1D-68FBBC6A9DE2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution From 51991f11580172222f78b636c4e29f0577f77060 Mon Sep 17 00:00:00 2001 From: Nikolay Borisenko <22616990+nvborisenko@users.noreply.github.com> Date: Mon, 2 Jun 2025 23:43:10 +0300 Subject: [PATCH 5/5] Rename snk --- dotnet/BUILD.bazel | 2 +- dotnet/{Selenium.WebDriver.sln => Selenium.sln} | 0 dotnet/{Selenium.WebDriver.snk => Selenium.snk} | Bin dotnet/src/support/BUILD.bazel | 2 +- dotnet/src/webdriver/BUILD.bazel | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) rename dotnet/{Selenium.WebDriver.sln => Selenium.sln} (100%) rename dotnet/{Selenium.WebDriver.snk => Selenium.snk} (100%) diff --git a/dotnet/BUILD.bazel b/dotnet/BUILD.bazel index bc1a19bef75ec..44ded9c69201b 100644 --- a/dotnet/BUILD.bazel +++ b/dotnet/BUILD.bazel @@ -2,7 +2,7 @@ load("@rules_pkg//pkg:zip.bzl", "pkg_zip") exports_files([ "AssemblyInfo.cs.template", - "Selenium.WebDriver.snk", + "Selenium.snk", ]) pkg_zip( diff --git a/dotnet/Selenium.WebDriver.sln b/dotnet/Selenium.sln similarity index 100% rename from dotnet/Selenium.WebDriver.sln rename to dotnet/Selenium.sln diff --git a/dotnet/Selenium.WebDriver.snk b/dotnet/Selenium.snk similarity index 100% rename from dotnet/Selenium.WebDriver.snk rename to dotnet/Selenium.snk diff --git a/dotnet/src/support/BUILD.bazel b/dotnet/src/support/BUILD.bazel index f855c3b1dcbd0..930e842870ee8 100644 --- a/dotnet/src/support/BUILD.bazel +++ b/dotnet/src/support/BUILD.bazel @@ -73,7 +73,7 @@ csharp_library( "UI/*.cs", ]) + [":assembly-info"], out = "WebDriver.Support.StrongNamed", - keyfile = "//dotnet:Selenium.WebDriver.snk", + keyfile = "//dotnet:Selenium.snk", langversion = "12.0", nullable = "enable", target_frameworks = [ diff --git a/dotnet/src/webdriver/BUILD.bazel b/dotnet/src/webdriver/BUILD.bazel index f3751d2e8fa57..c18f618d9fc3f 100644 --- a/dotnet/src/webdriver/BUILD.bazel +++ b/dotnet/src/webdriver/BUILD.bazel @@ -103,7 +103,7 @@ csharp_library( "**/*.cs", ]) + devtools_version_targets(), out = "WebDriver.StrongNamed", - keyfile = "//dotnet:Selenium.WebDriver.snk", + keyfile = "//dotnet:Selenium.snk", langversion = "12.0", nullable = "enable", resources = [ @@ -141,7 +141,7 @@ csharp_library( defines = [ "NET8_0_OR_GREATER", ], - keyfile = "//dotnet:Selenium.WebDriver.snk", + keyfile = "//dotnet:Selenium.snk", langversion = "12.0", nullable = "enable", resources = [