Merge remote-tracking branch 'upstream/master' into Dev_Master

.github/workflows/build.yml

@@ -7,6 +7,9 @@ on:
     branches: [master]
   workflow_dispatch:
 
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
 jobs:
   build:
     name: ${{ matrix.platform }} ${{ matrix.configuration }}
@@ -20,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -115,7 +118,7 @@ jobs:
           call TestAhkNotepad3.cmd
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: Notepad3-${{ matrix.platform }}-${{ matrix.configuration }}
           path: |

test/TestFileVersion.cmd

@@ -19,7 +19,7 @@ if [%LZ%]==[0] set "MM=%MM:~1,1%"
 set BUILD=0
 call :GETBUILD "%~1"
 
-set VERSHOULD=6.%YY%.%MM%%DD%.%BUILD%
+set VERSHOULD=7.%YY%.%MM%%DD%.%BUILD%
 
 :: --------------------------------------------------------------------------------------------------------------------