Move to slnx

.github/workflows/ci_build.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       # Step 1: Check out the code from the repo
-      - name: Checkout repo
+      - name: Checkout repository
         uses: actions/checkout@v6
         with:
           submodules: recursive
@@ -34,7 +34,7 @@ jobs:
       # Step 3: Build projects and unit test
       - name: Build code
         working-directory: src
-        run: msbuild NppJSONViewer.sln /m /p:configuration="${{matrix.build_configuration}}" /p:platform="${{matrix.build_platform}}" /p:PlatformToolset=${{env.MSBUILD_TOOLSET}}
+        run: msbuild NppJSONViewer.slnx /m /p:configuration="${{matrix.build_configuration}}" /p:platform="${{matrix.build_platform}}" /p:PlatformToolset=${{env.MSBUILD_TOOLSET}}
 
       # Step 4: Upload build binary artifacts for deployment
       - name: Archive binaries artifacts

.github/workflows/codeql.yml

@@ -1,63 +1,75 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "Code Scanning"
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-  schedule:
-    - cron: '34 11 * * 1'
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: windows-latest
-    timeout-minutes: 20
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'c-cpp' ]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v6
-      with:
-          submodules: recursive
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
-      with:
-        languages: ${{ matrix.language }}
-
-    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v4
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
-
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "Code Scanning"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: '34 11 * * 1'
+
+permissions:
+  contents: read
+
+env:
+  MSBUILD_TOOLSET: v143
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: windows-latest
+    timeout-minutes: 20
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'c-cpp' ]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v4
+        with:
+          languages: ${{ matrix.language }}
+
+      # Ensure MSBuild is available
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+
+      # Build explicitly as Autobuild is not working with .slnx
+      # This makes sure include paths from submodules (external/*) are found.
+      - name: Build solution for CodeQL analysis
+        working-directory: src
+        run: |
+          msbuild NppJSONViewer.slnx /m /p:configuration=Debug /p:platform=Win32 /p:PlatformToolset=${{ env.MSBUILD_TOOLSET }}
+
+      # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      # - name: Autobuild
+      #  uses: github/codeql-action/autobuild@v4
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v4

src/NPPJSONViewer.slnx

@@ -0,0 +1,15 @@
+<Solution>
+  <Configurations>
+    <Platform Name="ARM64" />
+    <Platform Name="Win32" />
+    <Platform Name="x64" />
+  </Configurations>
+  <Folder Name="/.github/" />
+  <Folder Name="/.github/workflows/">
+    <File Path="../.github/workflows/ci_build.yml" />
+    <File Path="../.github/workflows/codeql.yml" />
+  </Folder>
+  <Project Path="../tests/UnitTest/UnitTest.vcxproj" />
+  <Project Path="NppJsonViewer/NPPJSONViewer.vcxproj" />
+  <Project Path="UtilityLib/UtilityLib.vcxproj" />
+</Solution>