Bazel: Remove some kwargs.pop invocations.

This commit is contained in:
Cornelius Riemenschneider 2024-05-22 12:08:16 +02:00
Родитель 09f60e3e45
Коммит 24a14badbb
1 изменённых файлов: 9 добавлений и 10 удалений

Просмотреть файл

@ -6,13 +6,13 @@ load("//:defs.bzl", "codeql_platform")
TARGET_FRAMEWORK = "net8.0" TARGET_FRAMEWORK = "net8.0"
def codeql_csharp_library(name, **kwargs): def codeql_csharp_library(name, **kwargs):
nullable = kwargs.pop("nullable", "enable") kwargs.setdefault("nullable", "enable")
target_frameworks = kwargs.pop("target_frameworks", [TARGET_FRAMEWORK]) kwargs.setdefault("target_frameworks", [TARGET_FRAMEWORK])
csharp_library(name = name, nullable = nullable, target_frameworks = target_frameworks, **kwargs) csharp_library(name = name, **kwargs)
def codeql_xunit_test(name, **kwargs): def codeql_xunit_test(name, **kwargs):
nullable = kwargs.pop("nullable", "enable") kwargs.setdefault("nullable", "enable")
target_frameworks = kwargs.pop("target_frameworks", [TARGET_FRAMEWORK]) kwargs.setdefault("target_frameworks", [TARGET_FRAMEWORK])
srcs = kwargs.pop("srcs", []) + [ srcs = kwargs.pop("srcs", []) + [
"//csharp/extractor/Testrunner:Testrunner.cs", "//csharp/extractor/Testrunner:Testrunner.cs",
@ -29,14 +29,14 @@ def codeql_xunit_test(name, **kwargs):
name = name, name = name,
deps = deps, deps = deps,
srcs = srcs, srcs = srcs,
nullable = nullable,
target_frameworks = target_frameworks,
tags = tags, tags = tags,
**kwargs **kwargs
) )
def codeql_csharp_binary(name, **kwargs): def codeql_csharp_binary(name, **kwargs):
nullable = kwargs.pop("nullable", "enable") kwargs.setdefault("nullable", "enable")
kwargs.setdefault("target_frameworks", [TARGET_FRAMEWORK])
visibility = kwargs.pop("visibility", ["//visibility:public"]) visibility = kwargs.pop("visibility", ["//visibility:public"])
resources = kwargs.pop("resources", []) resources = kwargs.pop("resources", [])
srcs = kwargs.pop("srcs", []) srcs = kwargs.pop("srcs", [])
@ -44,10 +44,9 @@ def codeql_csharp_binary(name, **kwargs):
# always add the assembly info file that sets the AssemblyInformationalVersion attribute to the extractor version # always add the assembly info file that sets the AssemblyInformationalVersion attribute to the extractor version
srcs.append("//csharp/scripts:assembly-info-src") srcs.append("//csharp/scripts:assembly-info-src")
target_frameworks = kwargs.pop("target_frameworks", [TARGET_FRAMEWORK])
csharp_binary_target = "bin/" + name csharp_binary_target = "bin/" + name
publish_binary_target = "publish/" + name publish_binary_target = "publish/" + name
csharp_binary(name = csharp_binary_target, srcs = srcs, nullable = nullable, target_frameworks = target_frameworks, resources = resources, visibility = visibility, **kwargs) csharp_binary(name = csharp_binary_target, srcs = srcs, resources = resources, visibility = visibility, **kwargs)
publish_binary( publish_binary(
name = publish_binary_target, name = publish_binary_target,
binary = csharp_binary_target, binary = csharp_binary_target,