From 31f15a2f095fd0ffd42a7298d10157688c12788e Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 29 Oct 2021 15:58:50 +0400 Subject: [PATCH] Beta version 3.1.10. - Native support for M1 on macOS. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 8 ++++---- Telegram/build/build.sh | 2 +- Telegram/build/version | 12 ++++++------ changelog.txt | 4 ++++ 7 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 617a708985..cf8bb22a99 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="3.1.10.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 8a2f92e423..7c65952ecb 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 3,1,9,5 - PRODUCTVERSION 3,1,9,5 + FILEVERSION 3,1,10,0 + PRODUCTVERSION 3,1,10,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "3.1.9.5" + VALUE "FileVersion", "3.1.10.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "3.1.9.5" + VALUE "ProductVersion", "3.1.10.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 9db2154d99..461a085b34 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 3,1,9,5 - PRODUCTVERSION 3,1,9,5 + FILEVERSION 3,1,10,0 + PRODUCTVERSION 3,1,10,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", "3.1.9.5" + VALUE "FileVersion", "3.1.10.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "3.1.9.5" + VALUE "ProductVersion", "3.1.10.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 0e42a840bd..9aa0cb7ae8 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/const_string.h" -#define TDESKTOP_REQUESTED_ALPHA_VERSION (3001009005ULL) +#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL) #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION @@ -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 = 3001009; -constexpr auto AppVersionStr = "3.1.9"; -constexpr auto AppBetaVersion = false; +constexpr auto AppVersion = 3001010; +constexpr auto AppVersionStr = "3.1.10"; +constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh index f3417f39f8..c9747156b2 100755 --- a/Telegram/build/build.sh +++ b/Telegram/build/build.sh @@ -345,7 +345,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "macstore" ]; then cp -R "./$BinaryName.app" "$TempDiskPath/" bless --folder "$TempDiskPath/" --openfolder "$TempDiskPath/" hdiutil detach "$TempDiskPath" - hdiutil convert tsetup.temp.dmg -format UDZO -imagekey zlib-level=9 -ov -o "$SetupFile" + hdiutil convert tsetup.temp.dmg -format UDBZ -ov -o "$SetupFile" rm tsetup.temp.dmg fi fi diff --git a/Telegram/build/version b/Telegram/build/version index 950d4cda08..781bb0fff7 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 3001009 +AppVersion 3001010 AppVersionStrMajor 3.1 -AppVersionStrSmall 3.1.9 -AppVersionStr 3.1.9 -BetaChannel 0 -AlphaVersion 3001009005 -AppVersionOriginal 3.1.9.5 +AppVersionStrSmall 3.1.10 +AppVersionStr 3.1.10 +BetaChannel 1 +AlphaVersion 0 +AppVersionOriginal 3.1.10.beta diff --git a/changelog.txt b/changelog.txt index de9e3599b6..0e287813ac 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +3.1.10 beta (29.10.21) + +- Native support for M1 on macOS. + 3.1.9 (08.10.21) - Fix crash in chat closing while scrolling (macOS only).