Format files with ./scripts/format.sh (no logical changes)

SeleniumHQ · Nov 9, 2023 · 1310bb6 · 1310bb6
1 parent 591f849
commit 1310bb6
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 35 deletions.
diff --git a/dotnet/private/nuget_pack.bzl b/dotnet/private/nuget_pack.bzl
@@ -1,5 +1,5 @@
 load("@rules_dotnet//dotnet/private:common.bzl", "is_debug")
-load("@rules_dotnet//dotnet/private:providers.bzl", "DotnetAssemblyRuntimeInfo", "DotnetAssemblyCompileInfo", "NuGetInfo")
+load("@rules_dotnet//dotnet/private:providers.bzl", "DotnetAssemblyRuntimeInfo")
 load(":dotnet_utils.bzl", "dotnet_preamble")
 
 def _guess_dotnet_version(label, assembly_info):
@@ -98,7 +98,7 @@ def nuget_pack_impl(ctx):
     packages_cmd = "mkdir -p %s " % packages.path
 
     transitive_libs = depset(transitive = [l[DotnetAssemblyRuntimeInfo].deps for l in ctx.attr.libs]).to_list()
-    package_files = depset([lib.nuget_info.nupkg for lib in transitive_libs if lib.nuget_info ]).to_list()
+    package_files = depset([lib.nuget_info.nupkg for lib in transitive_libs if lib.nuget_info]).to_list()
 
     if len(package_files):
         packages_cmd += "&& cp " + " ".join([f.path for f in package_files]) + " " + packages.path
@@ -143,7 +143,6 @@ def nuget_pack_impl(ctx):
         mnemonic = "CreateNupkg",
     )
 
-
     return [
         DefaultInfo(
             files = depset([pkg, symbols_pkg]),

diff --git a/dotnet/src/support/BUILD.bazel b/dotnet/src/support/BUILD.bazel
@@ -36,19 +36,19 @@ csharp_library(
         "UI/*.cs",
     ]) + [":assembly-info"],
     out = "WebDriver.Support",
-    targeting_packs = [
-        framework("nuget", "NETStandard.Library"),
-    ],
     target_frameworks = [
         "netstandard2.0",
     ],
-    deps = [
-        "//dotnet/src/webdriver",
+    targeting_packs = [
         framework("nuget", "NETStandard.Library"),
     ],
     visibility = [
         "//dotnet:__subpackages__",
     ],
+    deps = [
+        "//dotnet/src/webdriver",
+        framework("nuget", "NETStandard.Library"),
+    ],
 )
 
 nuget_pack(
@@ -79,19 +79,19 @@ csharp_library(
     ]) + [":assembly-info"],
     out = "WebDriver.Support.StrongNamed",
     keyfile = "//dotnet:WebDriver.snk",
-    targeting_packs = [
-        framework("nuget", "NETStandard.Library"),
-    ],
     target_frameworks = [
         "netstandard2.0",
     ],
-    deps = [
-        "//dotnet/src/webdriver:webdriver-strongnamed",
+    targeting_packs = [
         framework("nuget", "NETStandard.Library"),
     ],
     visibility = [
         "//dotnet:__subpackages__",
     ],
+    deps = [
+        "//dotnet/src/webdriver:webdriver-strongnamed",
+        framework("nuget", "NETStandard.Library"),
+    ],
 )
 
 nuget_pack(

diff --git a/dotnet/src/webdriver/BUILD.bazel b/dotnet/src/webdriver/BUILD.bazel
@@ -33,9 +33,6 @@ csharp_library(
         "**/*.cs",
     ]) + devtools_version_targets(),
     out = "WebDriver",
-    targeting_packs = [
-        framework("nuget", "NETStandard.Library"),
-    ],
     resources = [
         "//javascript/atoms/fragments:find-elements.js",
         "//javascript/atoms/fragments:is-displayed.js",
@@ -46,14 +43,17 @@ csharp_library(
     target_frameworks = [
         "netstandard2.0",
     ],
-    deps = [
+    targeting_packs = [
         framework("nuget", "NETStandard.Library"),
-        framework("nuget", "Newtonsoft.Json"),
-        framework("nuget", "System.Drawing.Common"),
     ],
     visibility = [
         "//dotnet:__subpackages__",
     ],
+    deps = [
+        framework("nuget", "NETStandard.Library"),
+        framework("nuget", "Newtonsoft.Json"),
+        framework("nuget", "System.Drawing.Common"),
+    ],
 )
 
 csharp_library(
@@ -65,9 +65,6 @@ csharp_library(
     ]) + devtools_version_targets(),
     out = "WebDriver.StrongNamed",
     keyfile = "//dotnet:WebDriver.snk",
-    targeting_packs = [
-        framework("nuget", "NETStandard.Library"),
-    ],
     resources = [
         "//javascript/atoms/fragments:find-elements.js",
         "//javascript/atoms/fragments:is-displayed.js",
@@ -78,14 +75,17 @@ csharp_library(
     target_frameworks = [
         "netstandard2.0",
     ],
-    deps = [
+    targeting_packs = [
         framework("nuget", "NETStandard.Library"),
-        framework("nuget", "Newtonsoft.Json"),
-        framework("nuget", "System.Drawing.Common"),
     ],
     visibility = [
         "//dotnet:__subpackages__",
     ],
+    deps = [
+        framework("nuget", "NETStandard.Library"),
+        framework("nuget", "Newtonsoft.Json"),
+        framework("nuget", "System.Drawing.Common"),
+    ],
 )
 
 copy_file(

diff --git a/dotnet/test/common/BUILD.bazel b/dotnet/test/common/BUILD.bazel
@@ -39,10 +39,10 @@ csharp_library(
             "**/*Tests.cs",
         ],
     ),
+    target_frameworks = ["netstandard2.0"],
     targeting_packs = [
         framework("nuget", "NETStandard.Library"),
     ],
-    target_frameworks = ["netstandard2.0"],
     visibility = [
         "//dotnet/test:__subpackages__",
     ],
@@ -75,10 +75,10 @@ dotnet_nunit_test_suite(
     data = [
         ":test-data",
     ],
+    target_frameworks = ["net7.0"],
     targeting_packs = [
         framework("nuget", "NETStandard.Library"),
     ],
-    target_frameworks = ["net7.0"],
     deps = [
         ":fixtures",
         "//dotnet/src/webdriver",

diff --git a/dotnet/test/support/Events/BUILD.bazel b/dotnet/test/support/Events/BUILD.bazel
@@ -8,10 +8,10 @@ dotnet_nunit_test_suite(
     name = "SmallTests",
     size = "small",
     srcs = SMALL_TESTS,
+    target_frameworks = ["net7.0"],
     targeting_packs = [
         framework("nuget", "NETStandard.Library"),
     ],
-    target_frameworks = ["net7.0"],
     deps = [
         "//dotnet/src/support",
         "//dotnet/src/webdriver",
@@ -39,10 +39,10 @@ dotnet_nunit_test_suite(
     data = [
         "//dotnet/test/common:test-data",
     ],
+    target_frameworks = ["net7.0"],
     targeting_packs = [
         framework("nuget", "NETStandard.Library"),
     ],
-    target_frameworks = ["net7.0"],
     deps = [
         "//dotnet/src/support",
         "//dotnet/src/webdriver",

diff --git a/dotnet/test/support/Extensions/BUILD.bazel b/dotnet/test/support/Extensions/BUILD.bazel
@@ -4,10 +4,10 @@ dotnet_nunit_test_suite(
     name = "SmallTests",
     size = "small",
     srcs = glob(["*.cs"]),
+    target_frameworks = ["net7.0"],
     targeting_packs = [
         framework("nuget", "NETStandard.Library"),
     ],
-    target_frameworks = ["net7.0"],
     deps = [
         "//dotnet/src/support",
         "//dotnet/src/webdriver",

diff --git a/dotnet/test/support/UI/BUILD.bazel b/dotnet/test/support/UI/BUILD.bazel
@@ -13,10 +13,10 @@ dotnet_nunit_test_suite(
     name = "SmallTests",
     size = "small",
     srcs = SMALL_TESTS,
+    target_frameworks = ["net7.0"],
     targeting_packs = [
         framework("nuget", "NETStandard.Library"),
     ],
-    target_frameworks = ["net7.0"],
     deps = [
         "//dotnet/src/support",
         "//dotnet/src/webdriver",
@@ -44,10 +44,10 @@ dotnet_nunit_test_suite(
     data = [
         "//dotnet/test/common:test-data",
     ],
+    target_frameworks = ["net7.0"],
     targeting_packs = [
         framework("nuget", "NETStandard.Library"),
     ],
-    target_frameworks = ["net7.0"],
     deps = [
         "//dotnet/src/support",
         "//dotnet/src/webdriver",

diff --git a/third_party/dotnet/devtools/src/generator/BUILD.bazel b/third_party/dotnet/devtools/src/generator/BUILD.bazel
@@ -5,12 +5,12 @@ csharp_binary(
     srcs = glob(["**/*.cs"]),
     # Used as a tool in our build, so just target one framework
     target_frameworks = ["net6.0"],
-    visibility = [
-        "//dotnet:__subpackages__",
-    ],
     targeting_packs = [
         framework("nuget", "Microsoft.NETCore.App.Ref"),
     ],
+    visibility = [
+        "//dotnet:__subpackages__",
+    ],
     deps = [
         framework("nuget", "CommandLineParser"),
         framework("nuget", "Handlebars.Net"),