Merge pull request #3464 from hpwamr/mui

+ Upd: Version files and Changes.txt
This commit is contained in:
Pairi Daiza 2021-05-29 11:52:36 +02:00 committed by GitHub
commit 24a9924538
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 13 deletions

View File

@ -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).

View File

@ -1 +1 @@
2
1

View File

@ -1 +1 @@
527
529

View File

@ -3,8 +3,8 @@
<assemblyIdentity
name="Rizonesoft.Notepad3"
processorArchitecture="*"
version="5.21.527.2"
version="5.21.529.1"
type="win32"
/>
<description>Notepad3 alpha</description>
<description>Notepad3 beta</description>
</assembly>

View File

@ -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

View File

@ -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;

View File

@ -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