From faae0674bffee41216719660f6fd0f7aa4e7f640 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sat, 14 Feb 2026 18:22:12 +0100 Subject: [PATCH] MUI - Migration of the MS VS2022 compiler to MS VS2026 --- .github/copilot-instructions.md | 2 +- Build/Build_x64_AVX2.cmd | 2 +- Build/Changes.txt | 7 ++++--- scintilla/np3_patches/upstream_558/README.md | 2 +- src/Version.h | 6 +++++- test/test_logmod/run_log_creator.cmd | 4 ++-- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 45c2567ad..92097ddea 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -2,7 +2,7 @@ ## Build -Notepad3 is a Windows-only C/C++ application built with Visual Studio 2022 (toolset v145) and MSBuild. The solution file is `Notepad3.sln`. +Notepad3 is a Windows-only C/C++ application built with Visual Studio 2026 (toolset v145) and MSBuild. The solution file is `Notepad3.sln`. ### Build commands diff --git a/Build/Build_x64_AVX2.cmd b/Build/Build_x64_AVX2.cmd index 4657a97f2..aeed5c621 100644 --- a/Build/Build_x64_AVX2.cmd +++ b/Build/Build_x64_AVX2.cmd @@ -1,7 +1,7 @@ @echo off REM Build x64 with AVX2 Optimizations REM Usage: Build_x64_AVX2.cmd [Release|Debug] -REM Note: Output goes to Bin\Release_x64_AVX2_v143\ +REM Note: Output goes to Bin\Release_x64_AVX2_v145\ setlocal set CONFIG=%1 diff --git a/Build/Changes.txt b/Build/Changes.txt index bf02dc7ac..f2286f260 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -53,7 +53,7 @@ NEW: CHANGES: -------------------------------------------------------- [.xxx.x]- -[.130.1]- Update to Scintilla 5.5.8 and Lexilla 5.4.6 (SCI/LEX). +[.µµµ.µ]- Update to Scintilla 5.5.8 and Lexilla 5.4.6 (SCI/LEX). [.130.1]- Moved installer scripts to Build\Installer folder with local language files (SUP). [.101.1]- Rizonesoft Copyright © 2008-2025 to year "2008-2026". [1114.1]- Remove the "Opera Promotion" page in Notepad3 "INNO Setup Installer" (SUP). @@ -65,6 +65,7 @@ CHANGES: FIXES: -------------------------------------------------------- [.xxx.x]- +[.µµµ.µ]- Strip trailing blanks when saving option (issue 5444). [.130.1]- New files created in correct working directory. [.130.1]- Allow saving unmodified files when strip blanks is enabled. [.130.1]- Black line in Language menu submenu. @@ -87,8 +88,8 @@ REMOVED: -------------------------------------------------------- CHANGES Versions in Tools or Libraries: -------------------------------------------------------- -[.130.1]- Update Lexilla Library (LEX) version 5.4.6 (2025-11-10). -[.130.1]- Update Scintilla Library (SCI) version 5.5.8 (2025-11-10). +[.µµµ.µ]- Update Lexilla Library (LEX) version 5.4.6 (2025-11-10). +[.µµµ.µ]- Update Scintilla Library (SCI) version 5.5.8 (2025-11-10). [.711.1]- Update Oniguruma Regex (ONI) engine version 6.9.10 (2025/04/24). [.101.1]- Update grepWinNP3 (GRE) version 2.1.15.48 (2024-01-10). [1213.1]- Update MiniPath (MIN) version 1.0.2.191 (2022-12-13). diff --git a/scintilla/np3_patches/upstream_558/README.md b/scintilla/np3_patches/upstream_558/README.md index 75c661846..8da505ece 100644 --- a/scintilla/np3_patches/upstream_558/README.md +++ b/scintilla/np3_patches/upstream_558/README.md @@ -40,6 +40,6 @@ These files have NP3 patches and retain their customizations: Build completed successfully with exit code 0: ``` -Notepad3.vcxproj -> R:\GitHub\Notepad3\Bin\Release_x64_v143\Notepad3.exe +Notepad3.vcxproj -> R:\GitHub\Notepad3\Bin\Release_x64_v145\Notepad3.exe ``` diff --git a/src/Version.h b/src/Version.h index 425201e08..6bdc119d0 100644 --- a/src/Version.h +++ b/src/Version.h @@ -161,7 +161,11 @@ inline LPCWSTR _Win10BuildToReleaseId(const DWORD build) #undef VER_CPL #if defined(_MSC_VER) - #if (_MSC_VER == 1944) + #if (_MSC_VER == 1950) + #if (_MSC_FULL_VER >= 195035724) + #define VER_CPL MS Visual C++ 2026 v18.3.0 + #endif + #elif (_MSC_VER == 1944) #if (_MSC_FULL_VER >= 194435222) #define VER_CPL MS Visual C++ 2022 v17.14.(22-26) #elif (_MSC_FULL_VER >= 194435221) diff --git a/test/test_logmod/run_log_creator.cmd b/test/test_logmod/run_log_creator.cmd index 389632117..4519645fb 100644 --- a/test/test_logmod/run_log_creator.cmd +++ b/test/test_logmod/run_log_creator.cmd @@ -6,8 +6,8 @@ setlocal EnableExtensions EnableDelayedExpansion set _SCRIPTDIR_=%~dp0 pushd %_SCRIPTDIR_% -call :RESOLVE_PATH _EXE_PATH_ "..\..\Bin\Debug_x64_v143\Notepad3.exe" -::call :RESOLVE_PATH _EXE_PATH_ "..\..\Bin\Release_x64_v143\Notepad3.exe" +call :RESOLVE_PATH _EXE_PATH_ "..\..\Bin\Debug_x64_v145\Notepad3.exe" +::call :RESOLVE_PATH _EXE_PATH_ "..\..\Bin\Release_x64_v145\Notepad3.exe" call :RESOLVE_PATH _LOG_FILE_ ".\log.txt"