From 97b576f446862dd182473a3e727473be41c2f4bb Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 5 May 2018 22:07:05 +0300 Subject: [PATCH] Alpha version 1.2.18. - Improve working through proxy servers. - Bug fixes and other minor improvements. --- 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/version | 10 +++++----- changelog.txt | 5 +++++ 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 07cbf3c53..19e446a79 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.2.18.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 0572d3605..e5f9d9d60 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,17,4 - PRODUCTVERSION 1,2,17,4 + FILEVERSION 1,2,18,0 + PRODUCTVERSION 1,2,18,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -52,10 +52,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.2.17.4" + VALUE "FileVersion", "1.2.18.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.17.4" + VALUE "ProductVersion", "1.2.18.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 49308fd5d..bb2b29707 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,17,4 - PRODUCTVERSION 1,2,17,4 + FILEVERSION 1,2,18,0 + PRODUCTVERSION 1,2,18,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.2.17.4" + VALUE "FileVersion", "1.2.18.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.17.4" + VALUE "ProductVersion", "1.2.18.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 3f42a14e4..2900381d3 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -9,9 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/utils.h" -#define BETA_VERSION_MACRO (1002017004ULL) +#define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 1002017; -constexpr str_const AppVersionStr = "1.2.17"; -constexpr bool AppAlphaVersion = false; +constexpr int AppVersion = 1002018; +constexpr str_const AppVersionStr = "1.2.18"; +constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/build/version b/Telegram/build/version index 93f270f93..d76f2d8e4 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1002017 +AppVersion 1002018 AppVersionStrMajor 1.2 -AppVersionStrSmall 1.2.17 -AppVersionStr 1.2.17 -AlphaChannel 0 -BetaVersion 1002017004 +AppVersionStrSmall 1.2.18 +AppVersionStr 1.2.18 +AlphaChannel 1 +BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index 2180b9657..466d44590 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +1.2.18 alpha (05.05.18) + +- Improve working through proxy servers. +- Bug fixes and other minor improvements. + 1.2.17 (08.04.18) - Bug fixes and other minor improvements.