From 69f53744789a6b3a6b7b23096a160728e4ba3a0e Mon Sep 17 00:00:00 2001 From: Apex Liu Date: Tue, 16 Jun 2020 00:58:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E5=8F=91=E5=B8=833.5.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/builder/core/ver.py | 4 ++-- .../tp_assist_macos/src/TP-Assist-Info.plist | 4 ++-- client/tp_assist_macos/src/csrc/ts_ver.h | 2 +- client/tp_assist_win/tp_assist.rc | Bin 8800 -> 8792 bytes client/tp_assist_win/ts_ver.h | 2 +- dist/client/windows/assist/installer.nsi | Bin 3052 -> 3052 bytes server/www/teleport/webroot/app/app_ver.py | 2 +- version.in | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/builder/core/ver.py b/build/builder/core/ver.py index b92165b..9fe1ebb 100644 --- a/build/builder/core/ver.py +++ b/build/builder/core/ver.py @@ -1,3 +1,3 @@ # -*- coding: utf8 -*- -VER_TP_SERVER = "3.5.5" -VER_TP_ASSIST = "3.5.5" +VER_TP_SERVER = "3.5.6" +VER_TP_ASSIST = "3.5.6" diff --git a/client/tp_assist_macos/src/TP-Assist-Info.plist b/client/tp_assist_macos/src/TP-Assist-Info.plist index 421ea8e..1df91ea 100644 --- a/client/tp_assist_macos/src/TP-Assist-Info.plist +++ b/client/tp_assist_macos/src/TP-Assist-Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.5.5 + 3.5.6 CFBundleSignature ???? CFBundleVersion - 3.5.5 + 3.5.6 LSApplicationCategoryType public.app-category.productivity LSMinimumSystemVersion diff --git a/client/tp_assist_macos/src/csrc/ts_ver.h b/client/tp_assist_macos/src/csrc/ts_ver.h index 935d5a2..bcff7cb 100644 --- a/client/tp_assist_macos/src/csrc/ts_ver.h +++ b/client/tp_assist_macos/src/csrc/ts_ver.h @@ -1,6 +1,6 @@ #ifndef __TS_ASSIST_VER_H__ #define __TS_ASSIST_VER_H__ -#define TP_ASSIST_VER L"3.5.5" +#define TP_ASSIST_VER L"3.5.6" #endif // __TS_ASSIST_VER_H__ diff --git a/client/tp_assist_win/tp_assist.rc b/client/tp_assist_win/tp_assist.rc index 2f7babf78000420feb9264eade15a7a3c1ff7a1b..0835dd0370942c16641cc30638ba802edbb28df9 100644 GIT binary patch delta 78 zcmaFha>HcJElixI40=GR7zTsMg|fPvon#&{ Vq6mpk4v`a@d`6sWbDZ2SW&i~66ZQZA diff --git a/client/tp_assist_win/ts_ver.h b/client/tp_assist_win/ts_ver.h index 935d5a2..bcff7cb 100644 --- a/client/tp_assist_win/ts_ver.h +++ b/client/tp_assist_win/ts_ver.h @@ -1,6 +1,6 @@ #ifndef __TS_ASSIST_VER_H__ #define __TS_ASSIST_VER_H__ -#define TP_ASSIST_VER L"3.5.5" +#define TP_ASSIST_VER L"3.5.6" #endif // __TS_ASSIST_VER_H__ diff --git a/dist/client/windows/assist/installer.nsi b/dist/client/windows/assist/installer.nsi index d893ee309786e7ad4ed6840ecc811131f3223803..27648559ba72957d4a4a649369e50d9e16663949 100644 GIT binary patch delta 20 ccmaDO{ziPmELKLd$+KBa8O=6dWR+$E08_>W)&Kwi delta 20 ccmaDO{ziPmELKL-$+KBa8BI4|WR+$E08_LE)Bpeg diff --git a/server/www/teleport/webroot/app/app_ver.py b/server/www/teleport/webroot/app/app_ver.py index e294008..3a7ad7a 100644 --- a/server/www/teleport/webroot/app/app_ver.py +++ b/server/www/teleport/webroot/app/app_ver.py @@ -1,3 +1,3 @@ # -*- coding: utf8 -*- -TP_SERVER_VER = "3.5.5" +TP_SERVER_VER = "3.5.6" TP_ASSIST_REQUIRE_VER = "3.5.5" diff --git a/version.in b/version.in index 524c7f5..7941094 100644 --- a/version.in +++ b/version.in @@ -10,8 +10,8 @@ Minor: 次版本号。如果两个程序集的名称和主版本号相同,而 Revision: 修订号。主版本号和次版本号都相同但修订号不同的程序集应是完全可互换的。 这适用于修复以前发布的程序集中的错误或安全漏洞。 -TP_SERVER 3.5.5 # 整个服务端打包的版本 +TP_SERVER 3.5.6 # 整个服务端打包的版本 TP_TPCORE 3.5.5 # 核心服务 tp_core 的版本 TP_TPWEB 3.1.0 # web服务 tp_web 的版本(一般除非升级Python,否则不会变化) -TP_ASSIST 3.5.5 # 助手版本 +TP_ASSIST 3.5.6 # 助手版本 TP_ASSIST_REQUIRE 3.5.5 # 适配的助手最低版本