Attempt fix codeql init running (#669)

microsoft · Nov 4, 2022 · 9dddb7f · 9dddb7f
1 parent fffdc53
commit 9dddb7f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/Lib/Objects/FileSystemObject.cs b/Lib/Objects/FileSystemObject.cs
@@ -65,6 +65,9 @@ public override string Identity
         /// </summary>
         public bool? IsExecutable { get; set; }
 
+        /// <summary>
+        /// The type of the executable if it is one
+        /// </summary>
         public EXECUTABLE_TYPE ExecutableType { get; set; } = EXECUTABLE_TYPE.UNKNOWN;
 
         /// <summary>

diff --git a/Pipelines/core-pipeline.yml b/Pipelines/core-pipeline.yml
@@ -45,7 +45,6 @@ stages:
   - template: templates/sdl-job.yml
     parameters:
       serviceTreeID: 'ac84de32-6898-4dad-ace3-78e8098175dc'
-
 - stage: Build
   dependsOn: Test
   jobs:

diff --git a/Pipelines/templates/nuget-build-job.yml b/Pipelines/templates/nuget-build-job.yml
@@ -37,6 +37,7 @@ jobs:
   pool:
     vmImage: 'windows-latest'
   steps:
+  - task: CodeQL3000Init@0
   - task: UseDotNet@2
     displayName: Install Dotnet SDK
     inputs:
@@ -91,4 +92,5 @@ jobs:
     inputs:
       PathtoPublish: 'Archives'
       ArtifactName: '${{ parameters.artifactName }}'
-      publishLocation: 'Container'
+      publishLocation: 'Container'
+  - task: CodeQL3000Finalize@0
diff --git a/analyses.json b/analyses.json
@@ -48,13 +48,8 @@
         "MODIFIED"
       ],
       "ResultType": "FILE",
-      "Expression": "(is_exe AND windows_exe AND NOT valid_windows_signature) OR (is_exe AND mac_binary AND null_mac_signature)",
+      "Expression": "(windows_exe AND NOT valid_windows_signature) OR (mac_binary AND null_mac_signature)",
       "Clauses": [
-        {
-          "Label": "is_exe",
-          "Field": "IsExecutable",
-          "Operation": "IsTrue"
-        },
         {
           "Label": "windows_exe",
           "Field": "ExecutableType",
@@ -88,13 +83,8 @@
         "MODIFIED"
       ],
       "ResultType": "FILEMONITOR",
-      "Expression": "(is_exe AND windows_exe AND NOT valid_windows_signature) OR (is_exe AND mac_binary AND null_mac_signature)",
+      "Expression": "(windows_exe AND NOT valid_windows_signature) OR (mac_binary AND null_mac_signature)",
       "Clauses": [
-        {
-          "Label": "is_exe",
-          "Field": "FileSystemObject.IsExecutable",
-          "Operation": "IsTrue"
-        },
         {
           "Label": "windows_exe",
           "Field": "FileSystemObject.ExecutableType",