[dotnet] Simplify nuget package reference in Bazel

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:framework.bzl", _framework = "framework")
 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
-framework = _framework
 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

dotnet/private/nuget_package.bzl

@@ -0,0 +1,2 @@
+def nuget_package(nuget_package):
+    return "@paket.nuget//%s" % (nuget_package.lower())

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
     )

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", "generated_assembly_info", "generated_resource_utilities", "nuget_pack", "nuget_package")
 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"),
     ],
 )
 

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"),
     ],
 )

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"),
     ],
 )

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"),
     ],
 )

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"),
     ],
 )

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"),
     ],
 )

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"),
     ],
 )