Skip to content

Commit 292327f

Browse files
RenderMichaelRenderMichael
authored
[dotnet] Simplify nuget package reference in Bazel (#16630)
* [dotnet] Simplify nuget package reference in Bazel * Fix lint issue * Satisfy linter
1 parent 001a885 commit 292327f

File tree

11 files changed

+48
-48
lines changed

11 files changed

+48
-48
lines changed

‎dotnet/defs.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
load("@rules_dotnet//dotnet:defs.bzl", _csharp_binary = "csharp_binary", _csharp_library = "csharp_library", _csharp_test = "csharp_test")
22
load("//dotnet:selenium-dotnet-version.bzl", "SUPPORTED_DEVTOOLS_VERSIONS")
33
load("//dotnet/private:dotnet_nunit_test_suite.bzl", _dotnet_nunit_test_suite = "dotnet_nunit_test_suite")
4-
load("//dotnet/private:framework.bzl", _framework = "framework")
54
load("//dotnet/private:generate_devtools.bzl", _generate_devtools = "generate_devtools")
65
load("//dotnet/private:generate_resources.bzl", _generated_resource_utilities = "generated_resource_utilities")
76
load("//dotnet/private:generated_assembly_info.bzl", _generated_assembly_info = "generated_assembly_info")
87
load("//dotnet/private:nuget_pack.bzl", _nuget_pack = "nuget_pack")
8+
load("//dotnet/private:nuget_package.bzl", _nuget_package = "nuget_package")
99
load("//dotnet/private:nunit_test.bzl", _nunit_test = "nunit_test")
1010

1111
def devtools_version_targets():
@@ -18,9 +18,9 @@ csharp_binary = _csharp_binary
1818
csharp_library = _csharp_library
1919
csharp_test = _csharp_test
2020
dotnet_nunit_test_suite = _dotnet_nunit_test_suite
21-
framework = _framework
2221
generate_devtools = _generate_devtools
2322
generated_resource_utilities = _generated_resource_utilities
2423
generated_assembly_info = _generated_assembly_info
2524
nuget_pack = _nuget_pack
25+
nuget_package = _nuget_package
2626
nunit_test = _nunit_test

‎dotnet/private/framework.bzl‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎dotnet/private/nuget_package.bzl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
def nuget_package(nuget_package):
2+
return "@paket.nuget//%s" % (nuget_package.lower())

‎dotnet/private/nunit_test.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
load("@rules_dotnet//dotnet:defs.bzl", "csharp_test")
2-
load("//dotnet/private:framework.bzl", "framework")
2+
load("//dotnet/private:nuget_package.bzl", "nuget_package")
33

44
def nunit_test(name, srcs = [], deps = [], **kwargs):
55
csharp_test(
66
name = name,
77
srcs = srcs + ["@rules_dotnet//dotnet/private/rules/common/nunit:shim.cs"],
88
deps = deps + [
9-
framework("nuget", "NUnitLite"),
9+
nuget_package("NUnitLite"),
1010
],
1111
**kwargs
1212
)

‎dotnet/src/webdriver/BUILD.bazel‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//common:defs.bzl", "copy_file")
2-
load("//dotnet:defs.bzl", "csharp_library", "devtools_version_targets", "framework", "generated_assembly_info", "generated_resource_utilities", "nuget_pack")
2+
load("//dotnet:defs.bzl", "csharp_library", "devtools_version_targets", "generated_assembly_info", "generated_resource_utilities", "nuget_pack", "nuget_package")
33
load(
44
"//dotnet:selenium-dotnet-version.bzl",
55
"ASSEMBLY_COMPANY",
@@ -61,13 +61,13 @@ csharp_library(
6161
"//dotnet:__subpackages__",
6262
],
6363
deps = [
64-
framework("nuget", "NETStandard.Library"),
65-
framework("nuget", "Microsoft.Bcl.AsyncInterfaces"),
66-
framework("nuget", "System.Threading.Tasks.Extensions"),
67-
framework("nuget", "System.Memory"),
68-
framework("nuget", "System.Runtime.CompilerServices.Unsafe"),
69-
framework("nuget", "System.Text.Encodings.Web"),
70-
framework("nuget", "System.Text.Json"),
64+
nuget_package("NETStandard.Library"),
65+
nuget_package("Microsoft.Bcl.AsyncInterfaces"),
66+
nuget_package("System.Threading.Tasks.Extensions"),
67+
nuget_package("System.Memory"),
68+
nuget_package("System.Runtime.CompilerServices.Unsafe"),
69+
nuget_package("System.Text.Encodings.Web"),
70+
nuget_package("System.Text.Json"),
7171
],
7272
)
7373

@@ -119,13 +119,13 @@ csharp_library(
119119
"//dotnet:__subpackages__",
120120
],
121121
deps = [
122-
framework("nuget", "NETStandard.Library"),
123-
framework("nuget", "Microsoft.Bcl.AsyncInterfaces"),
124-
framework("nuget", "System.Threading.Tasks.Extensions"),
125-
framework("nuget", "System.Memory"),
126-
framework("nuget", "System.Runtime.CompilerServices.Unsafe"),
127-
framework("nuget", "System.Text.Encodings.Web"),
128-
framework("nuget", "System.Text.Json"),
122+
nuget_package("NETStandard.Library"),
123+
nuget_package("Microsoft.Bcl.AsyncInterfaces"),
124+
nuget_package("System.Threading.Tasks.Extensions"),
125+
nuget_package("System.Memory"),
126+
nuget_package("System.Runtime.CompilerServices.Unsafe"),
127+
nuget_package("System.Text.Encodings.Web"),
128+
nuget_package("System.Text.Json"),
129129
],
130130
)
131131

‎dotnet/test/common/BUILD.bazel‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//dotnet:defs.bzl", "csharp_library", "dotnet_nunit_test_suite", "framework")
1+
load("//dotnet:defs.bzl", "csharp_library", "dotnet_nunit_test_suite", "nuget_package")
22

33
filegroup(
44
name = "assembly-fixtures",
@@ -52,9 +52,9 @@ csharp_library(
5252
],
5353
deps = [
5454
"//dotnet/src/webdriver:webdriver-net8.0",
55-
framework("nuget", "Newtonsoft.Json"),
56-
framework("nuget", "NUnit"),
57-
framework("nuget", "Runfiles"),
55+
nuget_package("Newtonsoft.Json"),
56+
nuget_package("NUnit"),
57+
nuget_package("Runfiles"),
5858
],
5959
)
6060

@@ -90,9 +90,9 @@ dotnet_nunit_test_suite(
9090
deps = [
9191
":fixtures",
9292
"//dotnet/src/webdriver:webdriver-net8.0",
93-
framework("nuget", "BenderProxy"),
94-
framework("nuget", "Newtonsoft.Json"),
95-
framework("nuget", "NUnit"),
96-
framework("nuget", "Runfiles"),
93+
nuget_package("BenderProxy"),
94+
nuget_package("Newtonsoft.Json"),
95+
nuget_package("NUnit"),
96+
nuget_package("Runfiles"),
9797
],
9898
)

‎dotnet/test/firefox/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "framework")
1+
load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "nuget_package")
22

33
dotnet_nunit_test_suite(
44
name = "LargeTests",
@@ -22,6 +22,6 @@ dotnet_nunit_test_suite(
2222
"//dotnet/src/support",
2323
"//dotnet/src/webdriver:webdriver-net8.0",
2424
"//dotnet/test/common:fixtures",
25-
framework("nuget", "NUnit"),
25+
nuget_package("NUnit"),
2626
],
2727
)

‎dotnet/test/support/Events/BUILD.bazel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "framework")
1+
load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "nuget_package")
22

33
SMALL_TESTS = [
44
"EventFiringWebDriverTest.cs",
@@ -13,8 +13,8 @@ dotnet_nunit_test_suite(
1313
"//dotnet/src/support",
1414
"//dotnet/src/webdriver:webdriver-net8.0",
1515
"//dotnet/test/common:fixtures",
16-
framework("nuget", "NUnit"),
17-
framework("nuget", "Moq"),
16+
nuget_package("NUnit"),
17+
nuget_package("Moq"),
1818
],
1919
)
2020

@@ -38,6 +38,6 @@ dotnet_nunit_test_suite(
3838
"//dotnet/src/support",
3939
"//dotnet/src/webdriver:webdriver-net8.0",
4040
"//dotnet/test/common:fixtures",
41-
framework("nuget", "NUnit"),
41+
nuget_package("NUnit"),
4242
],
4343
)

‎dotnet/test/support/Extensions/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "framework")
1+
load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "nuget_package")
22

33
dotnet_nunit_test_suite(
44
name = "SmallTests",
@@ -9,7 +9,7 @@ dotnet_nunit_test_suite(
99
"//dotnet/src/support",
1010
"//dotnet/src/webdriver:webdriver-net8.0",
1111
"//dotnet/test/common:fixtures",
12-
framework("nuget", "Moq"),
13-
framework("nuget", "NUnit"),
12+
nuget_package("Moq"),
13+
nuget_package("NUnit"),
1414
],
1515
)

‎dotnet/test/support/UI/BUILD.bazel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "framework")
1+
load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "nuget_package")
22

33
SMALL_TESTS = [
44
"DefaultWaitTest.cs",
@@ -18,8 +18,8 @@ dotnet_nunit_test_suite(
1818
"//dotnet/src/support",
1919
"//dotnet/src/webdriver:webdriver-net8.0",
2020
"//dotnet/test/common:fixtures",
21-
framework("nuget", "NUnit"),
22-
framework("nuget", "Moq"),
21+
nuget_package("NUnit"),
22+
nuget_package("Moq"),
2323
],
2424
)
2525

@@ -46,6 +46,6 @@ dotnet_nunit_test_suite(
4646
"//dotnet/src/support",
4747
"//dotnet/src/webdriver:webdriver-net8.0",
4848
"//dotnet/test/common:fixtures",
49-
framework("nuget", "NUnit"),
49+
nuget_package("NUnit"),
5050
],
5151
)

0 commit comments

Comments
 (0)