@@ -16,6 +16,9 @@ public class CodeQLInstallation
16
16
{
17
17
public string CLIVersion { get ; set ; }
18
18
public string StandardLibraryVersion { get ; set ; }
19
+
20
+ public string CodeQLConfiguration { get ; set ; }
21
+
19
22
public string CLIBundle { get ; set ; }
20
23
public string StandardLibraryIdent { get ; set ; }
21
24
public bool EnableCustomCodeQLBundles { get ; set ; }
@@ -45,7 +48,8 @@ public static CodeQLInstallation LoadFromConfig(QLTConfig c)
45
48
StandardLibraryIdent = config . CodeQLStandardLibraryIdent ,
46
49
StandardLibraryVersion = config . CodeQLStandardLibrary ,
47
50
CustomizationPacks = config . CustomizationPacks ,
48
- Base = config . Base
51
+ Base = config . Base ,
52
+ CodeQLConfiguration = config . CodeQLConfiguration
49
53
} ;
50
54
51
55
@@ -292,7 +296,17 @@ private void CustomBundleInstall()
292
296
if ( QuickBundle )
293
297
{
294
298
Log < CodeQLInstallation > . G ( ) . LogInformation ( $ "Note: Quick Bundles enabled and pre-compilation will be disabled...") ;
295
- bundleArgs = $ "--log DEBUG -nc -b { customBundleSource } -o { CustomBundleOutputDirectory } -w { workingDirectory } { packs } ";
299
+ bundleArgs = $ "-nc { bundleArgs } ";
300
+ }
301
+
302
+ if ( CodeQLConfiguration != null && CodeQLConfiguration . Length > 0 )
303
+ {
304
+ Log < CodeQLInstallation > . G ( ) . LogInformation ( $ "Note: Attempting to include default code scanning configuration ...") ;
305
+
306
+ if ( File . Exists ( Path . Combine ( Base , CodeQLConfiguration ) ) )
307
+ {
308
+ bundleArgs = $ "-c \" { Path . Combine ( Base , CodeQLConfiguration ) } \" { bundleArgs } ";
309
+ }
296
310
}
297
311
298
312
Log < CodeQLInstallation > . G ( ) . LogInformation ( $ "Executing Bundle Tool with Working Directory: `{ workingDirectory } `") ;
0 commit comments