Fix CodeQL github workflow

nirbar · Nov 30, 2023 · 6c8ef79 · 6c8ef79
1 parent 84db7e1
commit 6c8ef79
Showing 1 changed file with 5 additions and 21 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -42,38 +42,22 @@ jobs:
 
     - name: Build 3rd-party code without scan
       run: |
-        choco install windows-adk
+        choco install windows-adk-all --version=10.1.22621.1
         nuget restore
-        cmake.exe -G "Visual Studio 16 2019" -T v142,host=x86 -A Win32 .\protobuf\cmake -Dprotobuf_BUILD_TESTS=OFF -B build\protobuf
+        cmake.exe -G "Visual Studio 16 2019" -T v141_xp,host=x86 -A Win32 .\protobuf\cmake -Dprotobuf_BUILD_TESTS=OFF -B build\protobuf
         cmake.exe --build build\protobuf --config Release
-        cmake.exe -G "Visual Studio 16 2019" -T v142,host=x86 -A Win32 .\poco -DPOCO_STATIC=ON -DPOCO_MT=ON -B build\poco
+        cmake.exe -G "Visual Studio 16 2019" -T v141_xp,host=x86 -A Win32 .\poco -DPOCO_STATIC=ON -DPOCO_MT=ON -B build\poco
         cmake.exe --build build\poco --config Release
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    # - name: Autobuild
-    #   uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
 
     - name: Build & scan
-      run: |
-        msbuild PanelSwWixExtension.sln -p:Configuration=Release -p:Platform=x86 -p:PlatformToolset=v142 -p:DisableNuget=true -p:NugetDir=""
+      run: msbuild PanelSwWixExtension.sln -p:Configuration=Release -p:Platform=x86 -p:DisableNuget=true -p:NugetDir=""
+
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2