@@ -6,13 +6,13 @@ load("//:defs.bzl", "codeql_platform")
6
6
TARGET_FRAMEWORK = "net8.0"
7
7
8
8
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 )
12
12
13
13
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 ])
16
16
17
17
srcs = kwargs .pop ("srcs" , []) + [
18
18
"//csharp/extractor/Testrunner:Testrunner.cs" ,
@@ -29,25 +29,24 @@ def codeql_xunit_test(name, **kwargs):
29
29
name = name ,
30
30
deps = deps ,
31
31
srcs = srcs ,
32
- nullable = nullable ,
33
- target_frameworks = target_frameworks ,
34
32
tags = tags ,
35
33
** kwargs
36
34
)
37
35
38
36
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
+
40
40
visibility = kwargs .pop ("visibility" , ["//visibility:public" ])
41
41
resources = kwargs .pop ("resources" , [])
42
42
srcs = kwargs .pop ("srcs" , [])
43
43
44
44
# always add the assembly info file that sets the AssemblyInformationalVersion attribute to the extractor version
45
45
srcs .append ("//csharp/scripts:assembly-info-src" )
46
46
47
- target_frameworks = kwargs .pop ("target_frameworks" , [TARGET_FRAMEWORK ])
48
47
csharp_binary_target = "bin/" + name
49
48
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 )
51
50
publish_binary (
52
51
name = publish_binary_target ,
53
52
binary = csharp_binary_target ,
0 commit comments