Skip to content

Commit 24a14ba

Browse files
committed
Bazel: Remove some kwargs.pop invocations.
1 parent 09f60e3 commit 24a14ba

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

misc/bazel/csharp.bzl

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ load("//:defs.bzl", "codeql_platform")
66
TARGET_FRAMEWORK = "net8.0"
77

88
def codeql_csharp_library(name, **kwargs):
9-
nullable = kwargs.pop("nullable", "enable")
10-
target_frameworks = kwargs.pop("target_frameworks", [TARGET_FRAMEWORK])
11-
csharp_library(name = name, nullable = nullable, target_frameworks = target_frameworks, **kwargs)
9+
kwargs.setdefault("nullable", "enable")
10+
kwargs.setdefault("target_frameworks", [TARGET_FRAMEWORK])
11+
csharp_library(name = name, **kwargs)
1212

1313
def codeql_xunit_test(name, **kwargs):
14-
nullable = kwargs.pop("nullable", "enable")
15-
target_frameworks = kwargs.pop("target_frameworks", [TARGET_FRAMEWORK])
14+
kwargs.setdefault("nullable", "enable")
15+
kwargs.setdefault("target_frameworks", [TARGET_FRAMEWORK])
1616

1717
srcs = kwargs.pop("srcs", []) + [
1818
"//csharp/extractor/Testrunner:Testrunner.cs",
@@ -29,25 +29,24 @@ def codeql_xunit_test(name, **kwargs):
2929
name = name,
3030
deps = deps,
3131
srcs = srcs,
32-
nullable = nullable,
33-
target_frameworks = target_frameworks,
3432
tags = tags,
3533
**kwargs
3634
)
3735

3836
def codeql_csharp_binary(name, **kwargs):
39-
nullable = kwargs.pop("nullable", "enable")
37+
kwargs.setdefault("nullable", "enable")
38+
kwargs.setdefault("target_frameworks", [TARGET_FRAMEWORK])
39+
4040
visibility = kwargs.pop("visibility", ["//visibility:public"])
4141
resources = kwargs.pop("resources", [])
4242
srcs = kwargs.pop("srcs", [])
4343

4444
# always add the assembly info file that sets the AssemblyInformationalVersion attribute to the extractor version
4545
srcs.append("//csharp/scripts:assembly-info-src")
4646

47-
target_frameworks = kwargs.pop("target_frameworks", [TARGET_FRAMEWORK])
4847
csharp_binary_target = "bin/" + name
4948
publish_binary_target = "publish/" + name
50-
csharp_binary(name = csharp_binary_target, srcs = srcs, nullable = nullable, target_frameworks = target_frameworks, resources = resources, visibility = visibility, **kwargs)
49+
csharp_binary(name = csharp_binary_target, srcs = srcs, resources = resources, visibility = visibility, **kwargs)
5150
publish_binary(
5251
name = publish_binary_target,
5352
binary = csharp_binary_target,

0 commit comments

Comments
 (0)