From eb19180c6d7d8018afba47b10eb526732cafe441 Mon Sep 17 00:00:00 2001 From: Michael Render Date: Sun, 23 Nov 2025 14:14:38 -0500 Subject: [PATCH 1/3] [dotnet] Simplify nuget package reference in Bazel --- dotnet/defs.bzl | 4 +-- dotnet/private/framework.bzl | 2 -- dotnet/private/nuget_package.bzl | 2 ++ dotnet/private/nunit_test.bzl | 4 +-- dotnet/src/webdriver/BUILD.bazel | 30 +++++++++---------- dotnet/test/common/BUILD.bazel | 16 +++++----- dotnet/test/firefox/BUILD.bazel | 4 +-- dotnet/test/support/Events/BUILD.bazel | 8 ++--- dotnet/test/support/Extensions/BUILD.bazel | 6 ++-- dotnet/test/support/UI/BUILD.bazel | 8 ++--- .../dotnet/devtools/src/generator/BUILD.bazel | 12 ++++---- 11 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 dotnet/private/framework.bzl create mode 100644 dotnet/private/nuget_package.bzl diff --git a/dotnet/defs.bzl b/dotnet/defs.bzl index 14305f2b280a5..678e48fbec324 100644 --- a/dotnet/defs.bzl +++ b/dotnet/defs.bzl @@ -1,7 +1,7 @@ load("@rules_dotnet//dotnet:defs.bzl", _csharp_binary = "csharp_binary", _csharp_library = "csharp_library", _csharp_test = "csharp_test") load("//dotnet:selenium-dotnet-version.bzl", "SUPPORTED_DEVTOOLS_VERSIONS") load("//dotnet/private:dotnet_nunit_test_suite.bzl", _dotnet_nunit_test_suite = "dotnet_nunit_test_suite") -load("//dotnet/private:framework.bzl", _framework = "framework") +load("//dotnet/private:nuget_package.bzl", _nuget_package = "nuget_package") load("//dotnet/private:generate_devtools.bzl", _generate_devtools = "generate_devtools") load("//dotnet/private:generate_resources.bzl", _generated_resource_utilities = "generated_resource_utilities") load("//dotnet/private:generated_assembly_info.bzl", _generated_assembly_info = "generated_assembly_info") @@ -18,7 +18,7 @@ csharp_binary = _csharp_binary csharp_library = _csharp_library csharp_test = _csharp_test dotnet_nunit_test_suite = _dotnet_nunit_test_suite -framework = _framework +nuget_package = _nuget_package generate_devtools = _generate_devtools generated_resource_utilities = _generated_resource_utilities generated_assembly_info = _generated_assembly_info diff --git a/dotnet/private/framework.bzl b/dotnet/private/framework.bzl deleted file mode 100644 index 3d59e382399ac..0000000000000 --- a/dotnet/private/framework.bzl +++ /dev/null @@ -1,2 +0,0 @@ -def framework(framework_moniker, name): - return "@paket.%s//%s" % (framework_moniker, name.lower()) diff --git a/dotnet/private/nuget_package.bzl b/dotnet/private/nuget_package.bzl new file mode 100644 index 0000000000000..64a8f99187b52 --- /dev/null +++ b/dotnet/private/nuget_package.bzl @@ -0,0 +1,2 @@ +def nuget_package(nuget_package): + return "@paket.nuget//%s" % (nuget_package.lower()) diff --git a/dotnet/private/nunit_test.bzl b/dotnet/private/nunit_test.bzl index 20308286d440e..fa109c0520a92 100644 --- a/dotnet/private/nunit_test.bzl +++ b/dotnet/private/nunit_test.bzl @@ -1,12 +1,12 @@ load("@rules_dotnet//dotnet:defs.bzl", "csharp_test") -load("//dotnet/private:framework.bzl", "framework") +load("//dotnet/private:nuget_package.bzl", "nuget_package") def nunit_test(name, srcs = [], deps = [], **kwargs): csharp_test( name = name, srcs = srcs + ["@rules_dotnet//dotnet/private/rules/common/nunit:shim.cs"], deps = deps + [ - framework("nuget", "NUnitLite"), + nuget_package("NUnitLite"), ], **kwargs ) diff --git a/dotnet/src/webdriver/BUILD.bazel b/dotnet/src/webdriver/BUILD.bazel index 2d6a8735d4e77..355aed14efd0a 100644 --- a/dotnet/src/webdriver/BUILD.bazel +++ b/dotnet/src/webdriver/BUILD.bazel @@ -1,5 +1,5 @@ load("//common:defs.bzl", "copy_file") -load("//dotnet:defs.bzl", "csharp_library", "devtools_version_targets", "framework", "generated_assembly_info", "generated_resource_utilities", "nuget_pack") +load("//dotnet:defs.bzl", "csharp_library", "devtools_version_targets", "nuget_package", "generated_assembly_info", "generated_resource_utilities", "nuget_pack") load( "//dotnet:selenium-dotnet-version.bzl", "ASSEMBLY_COMPANY", @@ -61,13 +61,13 @@ csharp_library( "//dotnet:__subpackages__", ], deps = [ - framework("nuget", "NETStandard.Library"), - framework("nuget", "Microsoft.Bcl.AsyncInterfaces"), - framework("nuget", "System.Threading.Tasks.Extensions"), - framework("nuget", "System.Memory"), - framework("nuget", "System.Runtime.CompilerServices.Unsafe"), - framework("nuget", "System.Text.Encodings.Web"), - framework("nuget", "System.Text.Json"), + nuget_package("NETStandard.Library"), + nuget_package("Microsoft.Bcl.AsyncInterfaces"), + nuget_package("System.Threading.Tasks.Extensions"), + nuget_package("System.Memory"), + nuget_package("System.Runtime.CompilerServices.Unsafe"), + nuget_package("System.Text.Encodings.Web"), + nuget_package("System.Text.Json"), ], ) @@ -119,13 +119,13 @@ csharp_library( "//dotnet:__subpackages__", ], deps = [ - framework("nuget", "NETStandard.Library"), - framework("nuget", "Microsoft.Bcl.AsyncInterfaces"), - framework("nuget", "System.Threading.Tasks.Extensions"), - framework("nuget", "System.Memory"), - framework("nuget", "System.Runtime.CompilerServices.Unsafe"), - framework("nuget", "System.Text.Encodings.Web"), - framework("nuget", "System.Text.Json"), + nuget_package("NETStandard.Library"), + nuget_package("Microsoft.Bcl.AsyncInterfaces"), + nuget_package("System.Threading.Tasks.Extensions"), + nuget_package("System.Memory"), + nuget_package("System.Runtime.CompilerServices.Unsafe"), + nuget_package("System.Text.Encodings.Web"), + nuget_package("System.Text.Json"), ], ) diff --git a/dotnet/test/common/BUILD.bazel b/dotnet/test/common/BUILD.bazel index 7c210e2b8ea6c..8f75f7858ea46 100644 --- a/dotnet/test/common/BUILD.bazel +++ b/dotnet/test/common/BUILD.bazel @@ -1,4 +1,4 @@ -load("//dotnet:defs.bzl", "csharp_library", "dotnet_nunit_test_suite", "framework") +load("//dotnet:defs.bzl", "csharp_library", "dotnet_nunit_test_suite", "nuget_package") filegroup( name = "assembly-fixtures", @@ -52,9 +52,9 @@ csharp_library( ], deps = [ "//dotnet/src/webdriver:webdriver-net8.0", - framework("nuget", "Newtonsoft.Json"), - framework("nuget", "NUnit"), - framework("nuget", "Runfiles"), + nuget_package("Newtonsoft.Json"), + nuget_package("NUnit"), + nuget_package("Runfiles"), ], ) @@ -90,9 +90,9 @@ dotnet_nunit_test_suite( deps = [ ":fixtures", "//dotnet/src/webdriver:webdriver-net8.0", - framework("nuget", "BenderProxy"), - framework("nuget", "Newtonsoft.Json"), - framework("nuget", "NUnit"), - framework("nuget", "Runfiles"), + nuget_package("BenderProxy"), + nuget_package("Newtonsoft.Json"), + nuget_package("NUnit"), + nuget_package("Runfiles"), ], ) diff --git a/dotnet/test/firefox/BUILD.bazel b/dotnet/test/firefox/BUILD.bazel index 398b528554122..a5ac213d8ca10 100644 --- a/dotnet/test/firefox/BUILD.bazel +++ b/dotnet/test/firefox/BUILD.bazel @@ -1,4 +1,4 @@ -load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "framework") +load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "nuget_package") dotnet_nunit_test_suite( name = "LargeTests", @@ -22,6 +22,6 @@ dotnet_nunit_test_suite( "//dotnet/src/support", "//dotnet/src/webdriver:webdriver-net8.0", "//dotnet/test/common:fixtures", - framework("nuget", "NUnit"), + nuget_package("NUnit"), ], ) diff --git a/dotnet/test/support/Events/BUILD.bazel b/dotnet/test/support/Events/BUILD.bazel index 7c3d1841832e2..bf7d93618f5b3 100644 --- a/dotnet/test/support/Events/BUILD.bazel +++ b/dotnet/test/support/Events/BUILD.bazel @@ -1,4 +1,4 @@ -load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "framework") +load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "nuget_package") SMALL_TESTS = [ "EventFiringWebDriverTest.cs", @@ -13,8 +13,8 @@ dotnet_nunit_test_suite( "//dotnet/src/support", "//dotnet/src/webdriver:webdriver-net8.0", "//dotnet/test/common:fixtures", - framework("nuget", "NUnit"), - framework("nuget", "Moq"), + nuget_package("NUnit"), + nuget_package("Moq"), ], ) @@ -38,6 +38,6 @@ dotnet_nunit_test_suite( "//dotnet/src/support", "//dotnet/src/webdriver:webdriver-net8.0", "//dotnet/test/common:fixtures", - framework("nuget", "NUnit"), + nuget_package("NUnit"), ], ) diff --git a/dotnet/test/support/Extensions/BUILD.bazel b/dotnet/test/support/Extensions/BUILD.bazel index b2468e129118d..7f58afb2b1063 100644 --- a/dotnet/test/support/Extensions/BUILD.bazel +++ b/dotnet/test/support/Extensions/BUILD.bazel @@ -1,4 +1,4 @@ -load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "framework") +load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "nuget_package") dotnet_nunit_test_suite( name = "SmallTests", @@ -9,7 +9,7 @@ dotnet_nunit_test_suite( "//dotnet/src/support", "//dotnet/src/webdriver:webdriver-net8.0", "//dotnet/test/common:fixtures", - framework("nuget", "Moq"), - framework("nuget", "NUnit"), + nuget_package("Moq"), + nuget_package("NUnit"), ], ) diff --git a/dotnet/test/support/UI/BUILD.bazel b/dotnet/test/support/UI/BUILD.bazel index 0d155ae0a066e..0187e035d25d9 100644 --- a/dotnet/test/support/UI/BUILD.bazel +++ b/dotnet/test/support/UI/BUILD.bazel @@ -1,4 +1,4 @@ -load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "framework") +load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "nuget_package") SMALL_TESTS = [ "DefaultWaitTest.cs", @@ -18,8 +18,8 @@ dotnet_nunit_test_suite( "//dotnet/src/support", "//dotnet/src/webdriver:webdriver-net8.0", "//dotnet/test/common:fixtures", - framework("nuget", "NUnit"), - framework("nuget", "Moq"), + nuget_package("NUnit"), + nuget_package("Moq"), ], ) @@ -46,6 +46,6 @@ dotnet_nunit_test_suite( "//dotnet/src/support", "//dotnet/src/webdriver:webdriver-net8.0", "//dotnet/test/common:fixtures", - framework("nuget", "NUnit"), + nuget_package("NUnit"), ], ) diff --git a/third_party/dotnet/devtools/src/generator/BUILD.bazel b/third_party/dotnet/devtools/src/generator/BUILD.bazel index 7d466358b4772..5c8e7834ee3e9 100644 --- a/third_party/dotnet/devtools/src/generator/BUILD.bazel +++ b/third_party/dotnet/devtools/src/generator/BUILD.bazel @@ -1,4 +1,4 @@ -load("//dotnet:defs.bzl", "csharp_binary", "framework") +load("//dotnet:defs.bzl", "csharp_binary", "nuget_package") csharp_binary( name = "generator", @@ -10,10 +10,10 @@ csharp_binary( "//dotnet:__subpackages__", ], deps = [ - framework("nuget", "CommandLineParser"), - framework("nuget", "Handlebars.Net"), - framework("nuget", "Humanizer.Core"), - framework("nuget", "Microsoft.Extensions.DependencyInjection"), - framework("nuget", "Microsoft.Extensions.DependencyInjection.Abstractions"), + nuget_package("CommandLineParser"), + nuget_package("Handlebars.Net"), + nuget_package("Humanizer.Core"), + nuget_package("Microsoft.Extensions.DependencyInjection"), + nuget_package("Microsoft.Extensions.DependencyInjection.Abstractions"), ], ) From 20c83396fa69e39b89690acad2ba504287fe949e Mon Sep 17 00:00:00 2001 From: Michael Render Date: Sun, 23 Nov 2025 14:31:05 -0500 Subject: [PATCH 2/3] Fix lint issue --- dotnet/defs.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dotnet/defs.bzl b/dotnet/defs.bzl index 678e48fbec324..2fa28fcfede64 100644 --- a/dotnet/defs.bzl +++ b/dotnet/defs.bzl @@ -1,11 +1,11 @@ load("@rules_dotnet//dotnet:defs.bzl", _csharp_binary = "csharp_binary", _csharp_library = "csharp_library", _csharp_test = "csharp_test") load("//dotnet:selenium-dotnet-version.bzl", "SUPPORTED_DEVTOOLS_VERSIONS") load("//dotnet/private:dotnet_nunit_test_suite.bzl", _dotnet_nunit_test_suite = "dotnet_nunit_test_suite") -load("//dotnet/private:nuget_package.bzl", _nuget_package = "nuget_package") load("//dotnet/private:generate_devtools.bzl", _generate_devtools = "generate_devtools") load("//dotnet/private:generate_resources.bzl", _generated_resource_utilities = "generated_resource_utilities") load("//dotnet/private:generated_assembly_info.bzl", _generated_assembly_info = "generated_assembly_info") load("//dotnet/private:nuget_pack.bzl", _nuget_pack = "nuget_pack") +load("//dotnet/private:nuget_package.bzl", _nuget_package = "nuget_package") load("//dotnet/private:nunit_test.bzl", _nunit_test = "nunit_test") def devtools_version_targets(): @@ -18,9 +18,9 @@ csharp_binary = _csharp_binary csharp_library = _csharp_library csharp_test = _csharp_test dotnet_nunit_test_suite = _dotnet_nunit_test_suite -nuget_package = _nuget_package generate_devtools = _generate_devtools generated_resource_utilities = _generated_resource_utilities generated_assembly_info = _generated_assembly_info nuget_pack = _nuget_pack +nuget_package = _nuget_package nunit_test = _nunit_test From 83ab52010e037491eced4f8725f2912782bfea87 Mon Sep 17 00:00:00 2001 From: Michael Render Date: Sun, 23 Nov 2025 15:13:40 -0500 Subject: [PATCH 3/3] Satisfy linter --- dotnet/src/webdriver/BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet/src/webdriver/BUILD.bazel b/dotnet/src/webdriver/BUILD.bazel index 355aed14efd0a..864e526104470 100644 --- a/dotnet/src/webdriver/BUILD.bazel +++ b/dotnet/src/webdriver/BUILD.bazel @@ -1,5 +1,5 @@ load("//common:defs.bzl", "copy_file") -load("//dotnet:defs.bzl", "csharp_library", "devtools_version_targets", "nuget_package", "generated_assembly_info", "generated_resource_utilities", "nuget_pack") +load("//dotnet:defs.bzl", "csharp_library", "devtools_version_targets", "generated_assembly_info", "generated_resource_utilities", "nuget_pack", "nuget_package") load( "//dotnet:selenium-dotnet-version.bzl", "ASSEMBLY_COMPANY",