Skip to content

Commit 1310bb6

Browse files
committed
Format files with ./scripts/format.sh (no logical changes)
1 parent 591f849 commit 1310bb6

File tree

8 files changed

+34
-35
lines changed

8 files changed

+34
-35
lines changed

dotnet/private/nuget_pack.bzl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@rules_dotnet//dotnet/private:common.bzl", "is_debug")
2-
load("@rules_dotnet//dotnet/private:providers.bzl", "DotnetAssemblyRuntimeInfo", "DotnetAssemblyCompileInfo", "NuGetInfo")
2+
load("@rules_dotnet//dotnet/private:providers.bzl", "DotnetAssemblyRuntimeInfo")
33
load(":dotnet_utils.bzl", "dotnet_preamble")
44

55
def _guess_dotnet_version(label, assembly_info):
@@ -98,7 +98,7 @@ def nuget_pack_impl(ctx):
9898
packages_cmd = "mkdir -p %s " % packages.path
9999

100100
transitive_libs = depset(transitive = [l[DotnetAssemblyRuntimeInfo].deps for l in ctx.attr.libs]).to_list()
101-
package_files = depset([lib.nuget_info.nupkg for lib in transitive_libs if lib.nuget_info ]).to_list()
101+
package_files = depset([lib.nuget_info.nupkg for lib in transitive_libs if lib.nuget_info]).to_list()
102102

103103
if len(package_files):
104104
packages_cmd += "&& cp " + " ".join([f.path for f in package_files]) + " " + packages.path
@@ -143,7 +143,6 @@ def nuget_pack_impl(ctx):
143143
mnemonic = "CreateNupkg",
144144
)
145145

146-
147146
return [
148147
DefaultInfo(
149148
files = depset([pkg, symbols_pkg]),

dotnet/src/support/BUILD.bazel

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ csharp_library(
3636
"UI/*.cs",
3737
]) + [":assembly-info"],
3838
out = "WebDriver.Support",
39-
targeting_packs = [
40-
framework("nuget", "NETStandard.Library"),
41-
],
4239
target_frameworks = [
4340
"netstandard2.0",
4441
],
45-
deps = [
46-
"//dotnet/src/webdriver",
42+
targeting_packs = [
4743
framework("nuget", "NETStandard.Library"),
4844
],
4945
visibility = [
5046
"//dotnet:__subpackages__",
5147
],
48+
deps = [
49+
"//dotnet/src/webdriver",
50+
framework("nuget", "NETStandard.Library"),
51+
],
5252
)
5353

5454
nuget_pack(
@@ -79,19 +79,19 @@ csharp_library(
7979
]) + [":assembly-info"],
8080
out = "WebDriver.Support.StrongNamed",
8181
keyfile = "//dotnet:WebDriver.snk",
82-
targeting_packs = [
83-
framework("nuget", "NETStandard.Library"),
84-
],
8582
target_frameworks = [
8683
"netstandard2.0",
8784
],
88-
deps = [
89-
"//dotnet/src/webdriver:webdriver-strongnamed",
85+
targeting_packs = [
9086
framework("nuget", "NETStandard.Library"),
9187
],
9288
visibility = [
9389
"//dotnet:__subpackages__",
9490
],
91+
deps = [
92+
"//dotnet/src/webdriver:webdriver-strongnamed",
93+
framework("nuget", "NETStandard.Library"),
94+
],
9595
)
9696

9797
nuget_pack(

dotnet/src/webdriver/BUILD.bazel

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ csharp_library(
3333
"**/*.cs",
3434
]) + devtools_version_targets(),
3535
out = "WebDriver",
36-
targeting_packs = [
37-
framework("nuget", "NETStandard.Library"),
38-
],
3936
resources = [
4037
"//javascript/atoms/fragments:find-elements.js",
4138
"//javascript/atoms/fragments:is-displayed.js",
@@ -46,14 +43,17 @@ csharp_library(
4643
target_frameworks = [
4744
"netstandard2.0",
4845
],
49-
deps = [
46+
targeting_packs = [
5047
framework("nuget", "NETStandard.Library"),
51-
framework("nuget", "Newtonsoft.Json"),
52-
framework("nuget", "System.Drawing.Common"),
5348
],
5449
visibility = [
5550
"//dotnet:__subpackages__",
5651
],
52+
deps = [
53+
framework("nuget", "NETStandard.Library"),
54+
framework("nuget", "Newtonsoft.Json"),
55+
framework("nuget", "System.Drawing.Common"),
56+
],
5757
)
5858

5959
csharp_library(
@@ -65,9 +65,6 @@ csharp_library(
6565
]) + devtools_version_targets(),
6666
out = "WebDriver.StrongNamed",
6767
keyfile = "//dotnet:WebDriver.snk",
68-
targeting_packs = [
69-
framework("nuget", "NETStandard.Library"),
70-
],
7168
resources = [
7269
"//javascript/atoms/fragments:find-elements.js",
7370
"//javascript/atoms/fragments:is-displayed.js",
@@ -78,14 +75,17 @@ csharp_library(
7875
target_frameworks = [
7976
"netstandard2.0",
8077
],
81-
deps = [
78+
targeting_packs = [
8279
framework("nuget", "NETStandard.Library"),
83-
framework("nuget", "Newtonsoft.Json"),
84-
framework("nuget", "System.Drawing.Common"),
8580
],
8681
visibility = [
8782
"//dotnet:__subpackages__",
8883
],
84+
deps = [
85+
framework("nuget", "NETStandard.Library"),
86+
framework("nuget", "Newtonsoft.Json"),
87+
framework("nuget", "System.Drawing.Common"),
88+
],
8989
)
9090

9191
copy_file(

dotnet/test/common/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ csharp_library(
3939
"**/*Tests.cs",
4040
],
4141
),
42+
target_frameworks = ["netstandard2.0"],
4243
targeting_packs = [
4344
framework("nuget", "NETStandard.Library"),
4445
],
45-
target_frameworks = ["netstandard2.0"],
4646
visibility = [
4747
"//dotnet/test:__subpackages__",
4848
],
@@ -75,10 +75,10 @@ dotnet_nunit_test_suite(
7575
data = [
7676
":test-data",
7777
],
78+
target_frameworks = ["net7.0"],
7879
targeting_packs = [
7980
framework("nuget", "NETStandard.Library"),
8081
],
81-
target_frameworks = ["net7.0"],
8282
deps = [
8383
":fixtures",
8484
"//dotnet/src/webdriver",

dotnet/test/support/Events/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ dotnet_nunit_test_suite(
88
name = "SmallTests",
99
size = "small",
1010
srcs = SMALL_TESTS,
11+
target_frameworks = ["net7.0"],
1112
targeting_packs = [
1213
framework("nuget", "NETStandard.Library"),
1314
],
14-
target_frameworks = ["net7.0"],
1515
deps = [
1616
"//dotnet/src/support",
1717
"//dotnet/src/webdriver",
@@ -39,10 +39,10 @@ dotnet_nunit_test_suite(
3939
data = [
4040
"//dotnet/test/common:test-data",
4141
],
42+
target_frameworks = ["net7.0"],
4243
targeting_packs = [
4344
framework("nuget", "NETStandard.Library"),
4445
],
45-
target_frameworks = ["net7.0"],
4646
deps = [
4747
"//dotnet/src/support",
4848
"//dotnet/src/webdriver",

dotnet/test/support/Extensions/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ dotnet_nunit_test_suite(
44
name = "SmallTests",
55
size = "small",
66
srcs = glob(["*.cs"]),
7+
target_frameworks = ["net7.0"],
78
targeting_packs = [
89
framework("nuget", "NETStandard.Library"),
910
],
10-
target_frameworks = ["net7.0"],
1111
deps = [
1212
"//dotnet/src/support",
1313
"//dotnet/src/webdriver",

dotnet/test/support/UI/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ dotnet_nunit_test_suite(
1313
name = "SmallTests",
1414
size = "small",
1515
srcs = SMALL_TESTS,
16+
target_frameworks = ["net7.0"],
1617
targeting_packs = [
1718
framework("nuget", "NETStandard.Library"),
1819
],
19-
target_frameworks = ["net7.0"],
2020
deps = [
2121
"//dotnet/src/support",
2222
"//dotnet/src/webdriver",
@@ -44,10 +44,10 @@ dotnet_nunit_test_suite(
4444
data = [
4545
"//dotnet/test/common:test-data",
4646
],
47+
target_frameworks = ["net7.0"],
4748
targeting_packs = [
4849
framework("nuget", "NETStandard.Library"),
4950
],
50-
target_frameworks = ["net7.0"],
5151
deps = [
5252
"//dotnet/src/support",
5353
"//dotnet/src/webdriver",

third_party/dotnet/devtools/src/generator/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ csharp_binary(
55
srcs = glob(["**/*.cs"]),
66
# Used as a tool in our build, so just target one framework
77
target_frameworks = ["net6.0"],
8-
visibility = [
9-
"//dotnet:__subpackages__",
10-
],
118
targeting_packs = [
129
framework("nuget", "Microsoft.NETCore.App.Ref"),
1310
],
11+
visibility = [
12+
"//dotnet:__subpackages__",
13+
],
1414
deps = [
1515
framework("nuget", "CommandLineParser"),
1616
framework("nuget", "Handlebars.Net"),

0 commit comments

Comments
 (0)