Merge branch 'master' into user/AntonDevil/MoveDependenciesToGitModules

Author: AntonDevil

.github/workflows/ci_build.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       # Step 1: Check out the code from the repo
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
@@ -67,7 +67,7 @@ jobs:
     steps:
       # Step 7: Download all artifacts from the build job
       - name: Download all artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           pattern: ${{env.ARTIFACT_PREFIX}}*
           path: all_artifacts\

.github/workflows/codeql.yml

@@ -43,21 +43,21 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
           submodules: recursive
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      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@v3
+      uses: github/codeql-action/autobuild@v4
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
 

src/NppJsonViewer/NPPJSONViewer.vcxproj

@@ -197,7 +197,6 @@
     <ClCompile Include="SettingsDlg.cpp" />
     <ClCompile Include="ShortcutCommand.cpp" />
     <ClCompile Include="SliderCtrl.cpp" />
-    <ClCompile Include="TreeHandler.h" />
     <ClCompile Include="TreeViewCtrl.cpp" />
     <ClCompile Include="plugintemplate\DockingFeature\StaticDialog.cpp" />
   </ItemGroup>
@@ -217,6 +216,7 @@
     <ClInclude Include="SliderCtrl.h" />
     <ClInclude Include="StopWatch.h" />
     <ClInclude Include="TrackingStream.h" />
+    <ClInclude Include="TreeHandler.h" />
     <ClInclude Include="TreeViewCtrl.h" />
     <ClInclude Include="plugintemplate\DockingFeature\Docking.h" />
     <ClInclude Include="plugintemplate\DockingFeature\DockingDlgInterface.h" />

src/NppJsonViewer/NPPJSONViewer.vcxproj.filters

@@ -57,9 +57,6 @@
     <ClCompile Include="SliderCtrl.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="TreeHandler.h">
-      <Filter>Header Files</Filter>
-    </ClCompile>
     <ClCompile Include="TreeViewCtrl.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -113,6 +110,9 @@
     <ClInclude Include="TrackingStream.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="TreeHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="TreeViewCtrl.h">
       <Filter>Header Files</Filter>
     </ClInclude>