Skip to content

Commit c3e6bb5

Browse files
authored
Merge branch 'master' into vs_2026
2 parents 6d220e4 + aa55d33 commit c3e6bb5

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/ci_build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
# Step 1: Check out the code from the repo
2525
- name: Checkout repo
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727
with:
2828
submodules: recursive
2929

@@ -38,14 +38,14 @@ jobs:
3838

3939
# Step 4: Upload build binary artifacts for deployment
4040
- name: Archive binaries artifacts
41-
uses: actions/upload-artifact@v4
41+
uses: actions/upload-artifact@v5
4242
with:
4343
name: ${{env.ARTIFACT_PREFIX}}${{matrix.build_platform}}_${{matrix.build_configuration}}
4444
path: ${{env.BUILD_DIR }}\${{matrix.build_configuration}}\${{matrix.build_platform}}\NPPJSONViewer.dll
4545

4646
# Step 5: Upload build pdb artifacts
4747
- name: Archive symbols artifacts
48-
uses: actions/upload-artifact@v4
48+
uses: actions/upload-artifact@v5
4949
with:
5050
name: ${{env.ARTIFACT_PREFIX}}${{matrix.build_platform}}_${{matrix.build_configuration}}_pdb
5151
path: ${{env.BUILD_DIR }}\${{matrix.build_configuration}}\${{matrix.build_platform}}\NPPJSONViewer.pdb
@@ -67,14 +67,14 @@ jobs:
6767
steps:
6868
# Step 7: Download all artifacts from the build job
6969
- name: Download all artifacts
70-
uses: actions/download-artifact@v4
70+
uses: actions/download-artifact@v6
7171
with:
7272
pattern: ${{env.ARTIFACT_PREFIX}}*
7373
path: all_artifacts\
7474

7575
# Step 8: Upload consolidated artifacts as a single artifact
7676
- name: Upload full artifact
77-
uses: actions/upload-artifact@v4
77+
uses: actions/upload-artifact@v5
7878
with:
7979
name: ${{env.ARTIFACT_PREFIX}}ALL
8080
path: all_artifacts\**

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
run: |
6464
msbuild NppJSONViewer.slnx /m /p:configuration=Debug /p:platform=Win32 /p:PlatformToolset=${{ env.MSBUILD_TOOLSET }}
6565
66-
# (Optional) keep autobuild removed or keep it after manual build — not needed here
66+
# (Optional) keep autobuild removed or keep it after manual build — not needed here
6767
# - name: Autobuild
6868
# uses: github/codeql-action/autobuild@v3
6969

src/NppJsonViewer/NPPJSONViewer.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
<ClInclude Include="ShortcutCommand.h" />
225225
<ClInclude Include="SliderCtrl.h" />
226226
<ClInclude Include="StopWatch.h" />
227-
<ClCompile Include="TreeHandler.h" />
227+
<ClInclude Include="TreeHandler.h" />
228228
<ClInclude Include="TrackingStream.h" />
229229
<ClInclude Include="TreeViewCtrl.h" />
230230
</ItemGroup>

src/NppJsonViewer/NPPJSONViewer.vcxproj.filters

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@
5757
<ClCompile Include="..\..\external\npp\StaticDialog.cpp">
5858
<Filter>ThirdParty\npp</Filter>
5959
</ClCompile>
60-
<ClCompile Include="TreeHandler.h">
61-
<Filter>Header Files</Filter>
62-
</ClCompile>
6360
<ClCompile Include="SliderCtrl.cpp">
6461
<Filter>Source Files</Filter>
6562
</ClCompile>
@@ -83,6 +80,9 @@
8380
<ClInclude Include="ScintillaEditor.h">
8481
<Filter>Header Files</Filter>
8582
</ClInclude>
83+
<ClInclude Include="TreeHandler.h">
84+
<Filter>Header Files</Filter>
85+
</ClInclude>
8686
<ClInclude Include="TreeViewCtrl.h">
8787
<Filter>Header Files</Filter>
8888
</ClInclude>

0 commit comments

Comments
 (0)