diff --git a/Build/Changes.txt b/Build/Changes.txt index f2aa230a7..2ea8922a2 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -33,7 +33,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ======================================================== -Current BETA/RC Version 5.21.527.(build_#) (2021-05-27) +Current BETA/RC Version 5.21.529.(build_#) (2021-05-29) ======================================================== -------------------------------------------------------- @@ -72,6 +72,7 @@ NEW: CHANGES: -------------------------------------------------------- [.###.#]- . +[.529.1]- Improved Julia Lexer (LEX). [.526.1]- Batch-Lexer + patching Markdown-Lexer (eolfilled header lines) (LEX). [.526.1]- Scheme-Dlg: dynamic (alloc) Style-Backup handling. [.525.1]- Update Lexilla Lib (bug fixes for Lexer: Markdown, Cmd/Batch) (LEX). diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +1 diff --git a/Versions/day.txt b/Versions/day.txt index 678dee3e1..e83802d73 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -527 +529 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index bf80e9dbc..92d9df8b4 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,8 +3,8 @@ - Notepad3 alpha + Notepad3 beta diff --git a/src/DarkMode/DarkMode.cpp b/src/DarkMode/DarkMode.cpp index a7fec6a5e..0059f45dd 100644 --- a/src/DarkMode/DarkMode.cpp +++ b/src/DarkMode/DarkMode.cpp @@ -71,9 +71,9 @@ constexpr bool CheckBuildNumber(DWORD buildNumber) case 18363: // Win10 v1909 case 19041: // Win10 v2004 case 19042: // Win10 v20H2 - case 19043: // Win10 v21H1 Insider Beta and Release Preview Channels [2021-04-28] + case 19043: // Win10 v21H1 // unknown, if working with these version(s) :-O - case 21390: // Win10 v21H2 Insider Dev Channel [2021-05-21] + case 21390: // Win10 v21H2 Insider Dev and Preview Channels [2021-05-21] return true; default: // not supported diff --git a/src/Helpers.c b/src/Helpers.c index 3524158bb..7230d5bd8 100644 --- a/src/Helpers.c +++ b/src/Helpers.c @@ -213,11 +213,15 @@ static void _GetTrueWindowsVersion() #endif // ---------------------------------------------------------------------------- -// https://docs.microsoft.com/en-us/windows/release-information/ +// https://docs.microsoft.com/en-us/windows/release-health/release-information // ---------------------------------------------------------------------------- static DWORD _Win10BuildToReleaseId(DWORD build) { - if (build >= 19042) { + if (build >= 21390) { + return 2109; + } else if (build >= 19043) { + return 2104; + } else if (build >= 19042) { return 2009; } else if (build >= 19041) { return 2004; diff --git a/src/VersionEx.h b/src/VersionEx.h index cff671976..8176d6ee8 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,13 +8,13 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 21 -#define VERSION_REV 527 -#define VERSION_BUILD 2 +#define VERSION_REV 529 +#define VERSION_BUILD 1 #define SCINTILLA_VER 502 #define LEXILLA_VER 502 #define ONIGURUMA_REGEX_VER 7.0.0 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 -#define VERSION_PATCH alpha -#define VERSION_COMMIT_ID nebukadn +#define VERSION_PATCH beta +#define VERSION_COMMIT_ID dkt1-amr