From e8a8d03a5bec35b8f76622ac10646a4b9de317cf Mon Sep 17 00:00:00 2001 From: NateD-MSFT <34494373+NateD-MSFT@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:20:26 -0800 Subject: [PATCH 1/5] Test script adjustments for new CodeQL version --- .github/workflows/build-codeql.yaml | 2 +- src/drivers/test/build_create_analyze_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-codeql.yaml b/.github/workflows/build-codeql.yaml index c6d11f1e..f1f62dcd 100644 --- a/.github/workflows/build-codeql.yaml +++ b/.github/workflows/build-codeql.yaml @@ -14,7 +14,7 @@ on: workflow_dispatch: env: - CODEQL_VERSION: 2.21.2 + CODEQL_VERSION: 2.23.3 jobs: build: diff --git a/src/drivers/test/build_create_analyze_test.py b/src/drivers/test/build_create_analyze_test.py index 28c89278..2a3115f1 100644 --- a/src/drivers/test/build_create_analyze_test.py +++ b/src/drivers/test/build_create_analyze_test.py @@ -400,7 +400,7 @@ def create_codeql_test_database(ql_test): source_dir=os.path.join(g_test_dir, "working\\"+ql_test.get_ql_name()+"\\") db_loc = os.path.join(test_db_dir, ql_test.get_ql_name()+"\\") - codeql_command = [codeql_path, "database", "create", "-l", "cpp", "-s", source_dir, "--threads=0", "-c", "msbuild /p:Platform=x64;UseNTIFS="+ql_test.get_use_ntifs()+ + codeql_command = [codeql_path, "database", "create", "-l", "cpp", "-s", source_dir, "--threads=0", "-c", "msbuild /p:Platform=x64 /p:UseNTIFS="+ql_test.get_use_ntifs()+ " /t:rebuild " + source_dir + ql_test.get_template().split("\\")[-1] + ".sln", db_loc] print_conditionally(" - Database location: " + db_loc) print_conditionally(" - Source directory: " + source_dir) From b5b77ae8c61d71f45eb4c48820a7ae1cefd53a54 Mon Sep 17 00:00:00 2001 From: NateD-MSFT <34494373+NateD-MSFT@users.noreply.github.com> Date: Wed, 3 Dec 2025 15:05:46 -0800 Subject: [PATCH 2/5] Update test dependencies --- .github/workflows/build-codeql.yaml | 4 ++++ src/drivers/test/packages.config | 8 ++++++++ src/drivers/test/requirements.txt | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/drivers/test/packages.config diff --git a/.github/workflows/build-codeql.yaml b/.github/workflows/build-codeql.yaml index f1f62dcd..05c1d2b2 100644 --- a/.github/workflows/build-codeql.yaml +++ b/.github/workflows/build-codeql.yaml @@ -96,6 +96,8 @@ jobs: pushd .\src ..\codeql-cli\codeql.cmd pack install popd + - name: Install Nuget Packages + run: nuget restore .\src\drivers\test\packages.config -PackagesDirectory .\packages\ - name: codeql version test run: .\codeql-cli\codeql.exe version - name: Setup Python @@ -177,6 +179,8 @@ jobs: pushd .\src ..\codeql-cli\codeql.cmd pack install popd + - name: Install Nuget Packages + run: nuget restore .\src\drivers\test\packages.config -PackagesDirectory .\packages\ - name: codeql version test run: .\codeql-cli\codeql.exe version - name: Setup Python diff --git a/src/drivers/test/packages.config b/src/drivers/test/packages.config new file mode 100644 index 00000000..2d05ff0b --- /dev/null +++ b/src/drivers/test/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/drivers/test/requirements.txt b/src/drivers/test/requirements.txt index 80faed4a..0daf01b5 100644 --- a/src/drivers/test/requirements.txt +++ b/src/drivers/test/requirements.txt @@ -1,5 +1,5 @@ sarif-tools==1.0.0 -pandas==2.1.4 +pandas==2.3.3 openpyxl==3.1.2 azure-common==1.1.28 azure-core==1.29.7 From 68a0cb9cb01b2ad0b048e7c108163685d7e247a7 Mon Sep 17 00:00:00 2001 From: NateD-MSFT <34494373+NateD-MSFT@users.noreply.github.com> Date: Wed, 3 Dec 2025 16:00:50 -0800 Subject: [PATCH 3/5] Bump QLPack version --- src/qlpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qlpack.yml b/src/qlpack.yml index 38debf75..e2af1602 100644 --- a/src/qlpack.yml +++ b/src/qlpack.yml @@ -2,7 +2,7 @@ # Licensed under the MIT license. name: microsoft/windows-drivers -version: 1.8.0 +version: 1.8.1 dependencies: codeql/cpp-all: ^4.2.0 microsoft/cpp-queries: ^0.0.4 From 13b3e1a8c923240c18a57c3a9ca9bad165ce2f10 Mon Sep 17 00:00:00 2001 From: NateD-MSFT <34494373+NateD-MSFT@users.noreply.github.com> Date: Wed, 3 Dec 2025 16:10:24 -0800 Subject: [PATCH 4/5] Update README. --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index d88c2936..e95cb24c 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,14 @@ This repository contains open-source components for supplemental use in developi #### Validated CodeQL Versions For Use with WHCP | CodeQL CLI Version | |--------------------------| +| 2.23.3 | | 2.21.4 | | 2.21.2 | | 2.20.1 | | 2.15.4 | +When using the precompiled pack, please use the most recent CodeQL CLI version listed above. + *See appendix for more information ### For Testing the Latest in Development From bd025fa5838d6a00752e3e1d49c92b1339db64e1 Mon Sep 17 00:00:00 2001 From: NateD-MSFT <34494373+NateD-MSFT@users.noreply.github.com> Date: Wed, 3 Dec 2025 20:27:20 -0800 Subject: [PATCH 5/5] Add missing NuGet call Signed-off-by: NateD-MSFT <34494373+NateD-MSFT@users.noreply.github.com> --- .github/workflows/build-codeql.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-codeql.yaml b/.github/workflows/build-codeql.yaml index 05c1d2b2..09cb5d8f 100644 --- a/.github/workflows/build-codeql.yaml +++ b/.github/workflows/build-codeql.yaml @@ -96,10 +96,10 @@ jobs: pushd .\src ..\codeql-cli\codeql.cmd pack install popd - - name: Install Nuget Packages - run: nuget restore .\src\drivers\test\packages.config -PackagesDirectory .\packages\ - name: codeql version test run: .\codeql-cli\codeql.exe version + - name: Install Nuget Packages + run: nuget restore .\src\drivers\test\packages.config -PackagesDirectory .\packages\ - name: Setup Python uses: actions/setup-python@v5 with: @@ -179,10 +179,10 @@ jobs: pushd .\src ..\codeql-cli\codeql.cmd pack install popd - - name: Install Nuget Packages - run: nuget restore .\src\drivers\test\packages.config -PackagesDirectory .\packages\ - name: codeql version test run: .\codeql-cli\codeql.exe version + - name: Install Nuget Packages + run: nuget restore .\src\drivers\test\packages.config -PackagesDirectory .\packages\ - name: Setup Python uses: actions/setup-python@v5 with: @@ -301,6 +301,9 @@ jobs: popd - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 + + - name: Install Nuget Packages + run: nuget restore .\src\drivers\test\packages.config -PackagesDirectory .\packages\ - name: Test DVL run: src\drivers\test\dvl_tests\dvl_tests.ps1