From 1f2836af59363b132843b71d3d6fbc05cb3c27fa Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 17 Mar 2023 21:15:37 +0400 Subject: [PATCH] Beta version 4.6.12. - Fix several possible crashes. - Deprecate macOS 10.12, Ubuntu 18.04 and CentOS 7 in July. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/changelogs.cpp | 6 ++++++ Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/build/version | 8 ++++---- changelog.txt | 5 +++++ 7 files changed, 26 insertions(+), 15 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index a2b92aa83..4de14028d 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -10,7 +10,7 @@ + Version="4.6.12.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index a681b9644..684e9e5a7 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,6,11,0 - PRODUCTVERSION 4,6,11,0 + FILEVERSION 4,6,12,0 + PRODUCTVERSION 4,6,12,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "4.6.11.0" + VALUE "FileVersion", "4.6.12.0" VALUE "LegalCopyright", "Copyright (C) 2014-2023" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.6.11.0" + VALUE "ProductVersion", "4.6.12.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index bb5244b1c..604ce2892 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,6,11,0 - PRODUCTVERSION 4,6,11,0 + FILEVERSION 4,6,12,0 + PRODUCTVERSION 4,6,12,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -53,10 +53,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "4.6.11.0" + VALUE "FileVersion", "4.6.12.0" VALUE "LegalCopyright", "Copyright (C) 2014-2023" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.6.11.0" + VALUE "ProductVersion", "4.6.12.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index cf6336033..6316cb521 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -119,6 +119,12 @@ std::map BetaLogs() { "- Fix a crash in connection type box.\n" "- Fix possible crash on quit.\n" + }, + { + 4006011, + "- Fix several possible crashes.\n" + + "- Deprecate macOS 10.12, Ubuntu 18.04 and CentOS 7 in July.\n" } }; }; diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 3b3bf3a7f..1d9d409d1 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs; constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs; constexpr auto AppName = "Telegram Desktop"_cs; constexpr auto AppFile = "Telegram"_cs; -constexpr auto AppVersion = 4006011; -constexpr auto AppVersionStr = "4.6.11"; +constexpr auto AppVersion = 4006012; +constexpr auto AppVersionStr = "4.6.12"; constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 73812f539..837dabf92 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 4006011 +AppVersion 4006012 AppVersionStrMajor 4.6 -AppVersionStrSmall 4.6.11 -AppVersionStr 4.6.11 +AppVersionStrSmall 4.6.12 +AppVersionStr 4.6.12 BetaChannel 1 AlphaVersion 0 -AppVersionOriginal 4.6.11.beta +AppVersionOriginal 4.6.12.beta diff --git a/changelog.txt b/changelog.txt index 86c54f13f..92e977f10 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +4.6.12 beta (17.03.23) + +- Fix several possible crashes. +- Deprecate macOS 10.12, Ubuntu 18.04 and CentOS 7 in July. + 4.6.11 beta (15.03.23) - Allow larger interface scale values on high-dpi screens.