diff --git a/README.md b/README.md index f66208c1..f18f015c 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,8 @@ MAUI GeneralUpdate.Maui - https://gitee.com/GeneralTeam/GeneralUpdate-Samples + + 功能介绍: | 功能 | 是否支持 | 备注 | diff --git a/src/c#/GeneralUpdate.Bowl/GeneralUpdate.Bowl.csproj b/src/c#/GeneralUpdate.Bowl/GeneralUpdate.Bowl.csproj index 0c47f789..72e61df9 100644 --- a/src/c#/GeneralUpdate.Bowl/GeneralUpdate.Bowl.csproj +++ b/src/c#/GeneralUpdate.Bowl/GeneralUpdate.Bowl.csproj @@ -2,40 +2,70 @@ netstandard2.0 - 12 + default enable + Bowl is used to monitor whether the main program can start normally after an upgrade. If it detects that the main program crashes on startup, it will restore the backup. + Copyright © 2024 JusterZhu. All rights reserved. + https://github.com/GeneralLibrary/GeneralUpdate + https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme + https://github.com/GeneralLibrary/GeneralUpdate + true + GeneralUpdate.Bowl + JusterZhu + public + upgrade + Bowl is used to monitor whether the main program can start normally after an upgrade. If it detects that the main program crashes on startup, it will restore the backup. + bowl.jpeg + 1.0.4 - + - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + + True + + + + True + PreserveNewest + + + True + PreserveNewest + + + True + PreserveNewest + - + - + + + + + True + PreserveNewest + + + + True + PreserveNewest + + + + True + PreserveNewest + + + + True + PreserveNewest + + diff --git a/src/c#/GeneralUpdate.Bowl/bowl.jpeg b/src/c#/GeneralUpdate.Bowl/bowl.jpeg new file mode 100644 index 00000000..b099e216 Binary files /dev/null and b/src/c#/GeneralUpdate.Bowl/bowl.jpeg differ diff --git a/src/c#/GeneralUpdate.ClientCore/GeneralUpdate.ClientCore.csproj b/src/c#/GeneralUpdate.ClientCore/GeneralUpdate.ClientCore.csproj index 43b09695..8314fc55 100644 --- a/src/c#/GeneralUpdate.ClientCore/GeneralUpdate.ClientCore.csproj +++ b/src/c#/GeneralUpdate.ClientCore/GeneralUpdate.ClientCore.csproj @@ -3,18 +3,22 @@ netstandard2.0 2.12.10 - juster.zhu + JusterZhu Provides functions related to upgrade and update programs. GeneralUpdate.ico - GeneralUpdate128.png + GeneralUpdate.ico False - False - https://github.com/JusterZhu/GeneralUpdate - Copyright © 2024 + https://github.com/GeneralLibrary/GeneralUpdate + Copyright © 2024 JusterZhu. All rights reserved. Provides high-performance, low-loss, resume-breakpoint, version-by-version update, binary differential update, incremental update function, configuration file retention update and other features https://github.com/JusterZhu/GeneralUpdate - 12 + default enable + GeneralUpdate.ClientCore + https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme + public + upgrade + true @@ -30,7 +34,10 @@ - + + True + + diff --git a/src/c#/GeneralUpdate.Common/GeneralUpdate.Common.csproj b/src/c#/GeneralUpdate.Common/GeneralUpdate.Common.csproj index d4cfe5ca..d77b724a 100644 --- a/src/c#/GeneralUpdate.Common/GeneralUpdate.Common.csproj +++ b/src/c#/GeneralUpdate.Common/GeneralUpdate.Common.csproj @@ -1,9 +1,22 @@  - 12 + default enable netstandard2.0 + GeneralUpdate.Common + JusterZhu + The infrastructure required to support all components is necessary, and this nuget package is essential. + Copyright © 2024 JusterZhu. All rights reserved. + https://github.com/GeneralLibrary/GeneralUpdate + https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme + GeneralUpdate128.png + https://github.com/GeneralLibrary/GeneralUpdate + public + upgrade + The infrastructure required to support all components is necessary, and this nuget package is essential. + true + 2.0.0 @@ -11,4 +24,16 @@ + + + + True + + GeneralUpdate.ico + + + True + + + diff --git a/src/c#/GeneralUpdate.Common/GeneralUpdate128.png b/src/c#/GeneralUpdate.Common/GeneralUpdate128.png new file mode 100644 index 00000000..a50af55a Binary files /dev/null and b/src/c#/GeneralUpdate.Common/GeneralUpdate128.png differ diff --git a/src/c#/GeneralUpdate.Core/GeneralUpdate.Core.csproj b/src/c#/GeneralUpdate.Core/GeneralUpdate.Core.csproj index 06639130..1841be67 100644 --- a/src/c#/GeneralUpdate.Core/GeneralUpdate.Core.csproj +++ b/src/c#/GeneralUpdate.Core/GeneralUpdate.Core.csproj @@ -4,26 +4,33 @@ Library $(AssemblyName) 4.14.21 - juster.zhu + JusterZhu juster.zhu false GeneralUpdate.ico - GeneralUpdate128.png - False - Copyright © 2024 + GeneralUpdate.ico + Copyright © 2024 JusterZhu. All rights reserved. This section describes how to upgrade client applications. Provides high-performance, low-loss, resume-breakpoint, version-by-version update, binary differential update, incremental update function, configuration file retention update and other features. https://github.com/JusterZhu/GeneralUpdate GeneralUpdate.Core GeneralUpdate.Core - https://github.com/JusterZhu/GeneralUpdate - 12 + https://github.com/GeneralLibrary/GeneralUpdate + default enable + GeneralUpdate.Core + https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme + public + upgrade + true - + + True + + \ No newline at end of file diff --git a/src/c#/GeneralUpdate.Differential/GeneralUpdate.Differential.csproj b/src/c#/GeneralUpdate.Differential/GeneralUpdate.Differential.csproj index ae772653..58f977ef 100644 --- a/src/c#/GeneralUpdate.Differential/GeneralUpdate.Differential.csproj +++ b/src/c#/GeneralUpdate.Differential/GeneralUpdate.Differential.csproj @@ -3,15 +3,21 @@ netstandard2.0 GeneralUpdate.ico - GeneralUpdate128.png + GeneralUpdate.ico https://github.com/JusterZhu/GeneralUpdate The binary differential update function is provided, but the configuration file update function is reserved. - juster.zhu + JusterZhu 1.4.3 - https://github.com/JusterZhu/GeneralUpdate - Copyright © 2023 - 12 + https://github.com/GeneralLibrary/GeneralUpdate + Copyright © 2024 JusterZhu. All rights reserved. + default enable + GeneralUpdate.Differential + https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme + public + upgrade + The binary differential update function is provided, but the configuration file update function is reserved. + true @@ -19,7 +25,10 @@ - + + True + + diff --git a/src/c#/Generalupdate.CatBowl/Generalupdate.CatBowl.csproj b/src/c#/Generalupdate.CatBowl/Generalupdate.CatBowl.csproj index 8803e9b0..277080b2 100644 --- a/src/c#/Generalupdate.CatBowl/Generalupdate.CatBowl.csproj +++ b/src/c#/Generalupdate.CatBowl/Generalupdate.CatBowl.csproj @@ -9,7 +9,14 @@ - + + + + + + + + diff --git a/src/c#/Generalupdate.CatBowl/Program.cs b/src/c#/Generalupdate.CatBowl/Program.cs index ba6bdd88..9b124a28 100644 --- a/src/c#/Generalupdate.CatBowl/Program.cs +++ b/src/c#/Generalupdate.CatBowl/Program.cs @@ -1,8 +1,6 @@ using System.Text; using GeneralUpdate.Bowl; using GeneralUpdate.Bowl.Strategys; -using GeneralUpdate.Common.Compress; -using GeneralUpdate.Common.Shared.Object; namespace Generalupdate.CatBowl; @@ -10,7 +8,7 @@ class Program { static void Main(string[] args) { - /*var installPath = @"D:\github_project\GeneralUpdate\src\c#\GeneralUpdate.CatBowl\bin\Debug\net8.0\"; + var installPath = AppDomain.CurrentDomain.BaseDirectory; var lastVersion = "1.0.0.3"; var processInfo = new MonitorParameter { @@ -22,7 +20,7 @@ static void Main(string[] args) BackupDirectory = Path.Combine(installPath, lastVersion), WorkModel = "Normal" }; - Bowl.Launch(processInfo);*/ + Bowl.Launch(processInfo); /*var source = @"D:\packet\release"; var target = @"D:\packet\1.zip"; diff --git a/src/sql/sql_v2.0.txt b/src/sql/sql_v2.0.txt deleted file mode 100644 index 2e6c1a23..00000000 --- a/src/sql/sql_v2.0.txt +++ /dev/null @@ -1 +0,0 @@ -INSERT INTO updateversioninfo VALUES('41A54379C7164921876821A3468572E5',123456,'temp','http://119.3.152.74:8083/survey/vrtk','1.0.0.0.1',1,'41A54379-C7D6-4920-8768-21A3468572E5'); \ No newline at end of file diff --git a/src/sql/update.sql b/src/sql/update.sql deleted file mode 100644 index b9283b8a..00000000 --- a/src/sql/update.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TABLE `updateversioninfo` ( - `MD5` varchar(32) NOT NULL DEFAULT 'update packet md5', - `PubTime` int DEFAULT '0', - `Name` varchar(64) NOT NULL DEFAULT 'version name', - `Url` varchar(255) NOT NULL DEFAULT 'update url', - `Version` varchar(20) NOT NULL DEFAULT 'last version number', - `ClientType` int NOT NULL DEFAULT '1', - PRIMARY KEY (`MD5`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ciupdateversioninfo; \ No newline at end of file diff --git a/src/sql/update_v2.0.sql b/src/sql/update_v2.0.sql deleted file mode 100644 index 844a2679..00000000 --- a/src/sql/update_v2.0.sql +++ /dev/null @@ -1,32 +0,0 @@ --- -------------------------------------------------------- --- 主机: 124.71.144.66 --- 服务器版本: 5.6.50-log - Source distribution --- 服务器操作系统: Linux --- HeidiSQL 版本: 11.3.0.6295 --- -------------------------------------------------------- - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET NAMES utf8 */; -/*!50503 SET NAMES utf8mb4 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- 导出 表 juster_java.updateversioninfo 结构 -CREATE TABLE IF NOT EXISTS `updateversioninfo` ( - `MD5` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'update packet md5' COMMENT 'MD5码', - `PubTime` int(11) NOT NULL DEFAULT '0' COMMENT '版本发布时间', - `Name` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT 'version name' COMMENT '版本名称', - `Url` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'update url' COMMENT '更新包文件服务器地址', - `Version` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'last version number' COMMENT '版本号', - `ClientType` int(11) NOT NULL DEFAULT '1' COMMENT '客户端类型', - `AppSecretKey` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'app密钥', - PRIMARY KEY (`MD5`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- 数据导出被取消选择。 - -/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; -/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40111 SET SQL_NOTES=IFNULL(@OLD_SQL_NOTES, 1) */; diff --git a/tag/20230422/GeneralUpdate.ClientCore.2.12.10.nupkg b/tag/20230422/GeneralUpdate.ClientCore.2.12.10.nupkg deleted file mode 100644 index 802616a8..00000000 Binary files a/tag/20230422/GeneralUpdate.ClientCore.2.12.10.nupkg and /dev/null differ diff --git a/tag/20230422/GeneralUpdate.Core.4.14.20.nupkg b/tag/20230422/GeneralUpdate.Core.4.14.20.nupkg deleted file mode 100644 index e8b94b5e..00000000 Binary files a/tag/20230422/GeneralUpdate.Core.4.14.20.nupkg and /dev/null differ diff --git a/tag/20230422/GeneralUpdate.Differential.1.4.2.nupkg b/tag/20230422/GeneralUpdate.Differential.1.4.2.nupkg deleted file mode 100644 index 894b97c7..00000000 Binary files a/tag/20230422/GeneralUpdate.Differential.1.4.2.nupkg and /dev/null differ diff --git a/tag/20230422/GeneralUpdate.Maui.OSS.1.0.0.nupkg b/tag/20230422/GeneralUpdate.Maui.OSS.1.0.0.nupkg deleted file mode 100644 index 6c97d2a7..00000000 Binary files a/tag/20230422/GeneralUpdate.Maui.OSS.1.0.0.nupkg and /dev/null differ