diff --git a/src/c#/GeneralUpdate.Bowl/GeneralUpdate.Bowl.csproj b/src/c#/GeneralUpdate.Bowl/GeneralUpdate.Bowl.csproj index 1d658443927f7075f0a6e4442d8d3fd316de6d9e..00d1432f2e43d3076d302d211c9ccde857f8dd80 100644 --- a/src/c#/GeneralUpdate.Bowl/GeneralUpdate.Bowl.csproj +++ b/src/c#/GeneralUpdate.Bowl/GeneralUpdate.Bowl.csproj @@ -13,10 +13,10 @@ GeneralUpdate.Bowl JusterZhu public - upgrade + upgrade,update 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 + 9.0.0 @@ -24,18 +24,6 @@ True - - True - PreserveNewest - - - True - PreserveNewest - - - True - PreserveNewest - @@ -45,10 +33,12 @@ - + + - + PreserveNewest - + true + diff --git a/src/c#/GeneralUpdate.Bowl/Strategys/WindowStrategy.cs b/src/c#/GeneralUpdate.Bowl/Strategys/WindowStrategy.cs index dbc77f5bbfa6c5c0550b92bde69d4993d4c2146d..ff772fd82680a9433fdb9a1fbd4d749a927ecb65 100644 --- a/src/c#/GeneralUpdate.Bowl/Strategys/WindowStrategy.cs +++ b/src/c#/GeneralUpdate.Bowl/Strategys/WindowStrategy.cs @@ -21,6 +21,7 @@ internal class WindowStrategy : AbstractStrategy _parameter.InnerApp = Path.Combine(_applicationsDirectory, GetAppName()); var dmpFullName = Path.Combine(_parameter.FailDirectory, _parameter.DumpFileName); _parameter.InnerArguments = $"-e -ma {_parameter.ProcessNameOrId} {dmpFullName}"; + //This method is used to launch scripts in applications. base.Launch(); ExecuteFinalTreatment(); } diff --git a/src/c#/GeneralUpdate.Client/Program.cs b/src/c#/GeneralUpdate.Client/Program.cs index 328636ac816cb6eb28981234cc9279bdd0a6ebf7..5e127e50a14311852f0639151b31251d8bbc2c58 100644 --- a/src/c#/GeneralUpdate.Client/Program.cs +++ b/src/c#/GeneralUpdate.Client/Program.cs @@ -14,7 +14,7 @@ namespace GeneralUpdate.Client { static async Task Main(string[] args) { - /*try + try { Console.WriteLine($"主程序初始化，{DateTime.Now}！"); Console.WriteLine("当前运行目录：" + Thread.GetDomain().BaseDirectory); @@ -57,7 +57,7 @@ namespace GeneralUpdate.Client catch (Exception e) { Console.WriteLine(e.Message + "\n" + e.StackTrace); - }*/ + } /*var paramsOSS = new GlobalConfigInfoOSS(); paramsOSS.Url = "http://192.168.50.203/versions.json"; diff --git a/src/c#/GeneralUpdate.ClientCore/GeneralUpdate.ClientCore.csproj b/src/c#/GeneralUpdate.ClientCore/GeneralUpdate.ClientCore.csproj index 8314fc5530be33111b0beaa4d5f73e734543ea17..b6a37db07522acc171964903143b8d32192856a7 100644 --- a/src/c#/GeneralUpdate.ClientCore/GeneralUpdate.ClientCore.csproj +++ b/src/c#/GeneralUpdate.ClientCore/GeneralUpdate.ClientCore.csproj @@ -2,11 +2,11 @@ netstandard2.0 - 2.12.10 + 9.0.0 JusterZhu Provides functions related to upgrade and update programs. GeneralUpdate.ico - GeneralUpdate.ico + GeneralUpdate.png False https://github.com/GeneralLibrary/GeneralUpdate Copyright © 2024 JusterZhu. All rights reserved. @@ -17,7 +17,7 @@ GeneralUpdate.ClientCore https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme public - upgrade + upgrade,update true @@ -40,4 +40,11 @@ + + + True + + + + diff --git a/src/c#/GeneralUpdate.ClientCore/GeneralUpdate.png b/src/c#/GeneralUpdate.ClientCore/GeneralUpdate.png new file mode 100644 index 0000000000000000000000000000000000000000..c8a51ff692fb434aea351d66ef66fb16cb35ebfe Binary files /dev/null and b/src/c#/GeneralUpdate.ClientCore/GeneralUpdate.png differ diff --git a/src/c#/GeneralUpdate.Common/GeneralUpdate.Common.csproj b/src/c#/GeneralUpdate.Common/GeneralUpdate.Common.csproj index d77b724aa92d5d40f1b301b285c4077e76f8f7eb..afba5a0c5b953015d078c3567d64740be03647d9 100644 --- a/src/c#/GeneralUpdate.Common/GeneralUpdate.Common.csproj +++ b/src/c#/GeneralUpdate.Common/GeneralUpdate.Common.csproj @@ -13,10 +13,10 @@ GeneralUpdate128.png https://github.com/GeneralLibrary/GeneralUpdate public - upgrade + upgrade,update The infrastructure required to support all components is necessary, and this nuget package is essential. true - 2.0.0 + 9.0.0 diff --git a/src/c#/GeneralUpdate.Core/GeneralUpdate.Core.csproj b/src/c#/GeneralUpdate.Core/GeneralUpdate.Core.csproj index 1841be67857cb63f9d13ab663ff25953486d288c..0673c2c34e56066ad794a4cb30e60a1263654787 100644 --- a/src/c#/GeneralUpdate.Core/GeneralUpdate.Core.csproj +++ b/src/c#/GeneralUpdate.Core/GeneralUpdate.Core.csproj @@ -3,12 +3,12 @@ netstandard2.0 Library $(AssemblyName) - 4.14.21 + 9.0.0 JusterZhu juster.zhu false GeneralUpdate.ico - GeneralUpdate.ico + GeneralUpdate.png 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. @@ -21,7 +21,7 @@ GeneralUpdate.Core https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme public - upgrade + upgrade,update true @@ -33,4 +33,10 @@ + + + True + + + \ No newline at end of file diff --git a/src/c#/GeneralUpdate.Core/GeneralUpdate.png b/src/c#/GeneralUpdate.Core/GeneralUpdate.png new file mode 100644 index 0000000000000000000000000000000000000000..c8a51ff692fb434aea351d66ef66fb16cb35ebfe Binary files /dev/null and b/src/c#/GeneralUpdate.Core/GeneralUpdate.png differ diff --git a/src/c#/GeneralUpdate.Core/Strategys/WindowsStrategy.cs b/src/c#/GeneralUpdate.Core/Strategys/WindowsStrategy.cs index b82d94e2448f5854fcef263110daebcffeba8314..8d72a7c6452d2c490d29365ab0f7ec405a7aac37 100644 --- a/src/c#/GeneralUpdate.Core/Strategys/WindowsStrategy.cs +++ b/src/c#/GeneralUpdate.Core/Strategys/WindowsStrategy.cs @@ -99,12 +99,18 @@ namespace GeneralUpdate.Core.Strategys { try { - var appBowlPath = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? null : CheckPath(_configinfo.InstallPath, _configinfo.Bowl); - var appPath = string.IsNullOrWhiteSpace(appBowlPath) ? CheckPath(_configinfo.InstallPath, _configinfo.MainAppName) : appBowlPath; - if(string.IsNullOrEmpty(appPath)) - throw new Exception($"Can't find the app {appPath}!"); + var mainAppPath = CheckPath(_configinfo.InstallPath, _configinfo.MainAppName); + if (string.IsNullOrEmpty(mainAppPath)) + throw new Exception($"Can't find the app {mainAppPath}!"); - Process.Start(appPath); + Process.Start(mainAppPath); + + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + var bowlAppPath = CheckPath(_configinfo.InstallPath, _configinfo.Bowl); + if (!string.IsNullOrEmpty(bowlAppPath)) + Process.Start(bowlAppPath); + } } catch (Exception e) { diff --git a/src/c#/GeneralUpdate.Differential/GeneralUpdate.Differential.csproj b/src/c#/GeneralUpdate.Differential/GeneralUpdate.Differential.csproj index 58f977ef56e35e56dfad8121ffe3c6342c1c4129..c06e9d405bd33e40140250247560b462ebf27b45 100644 --- a/src/c#/GeneralUpdate.Differential/GeneralUpdate.Differential.csproj +++ b/src/c#/GeneralUpdate.Differential/GeneralUpdate.Differential.csproj @@ -3,11 +3,11 @@ netstandard2.0 GeneralUpdate.ico - GeneralUpdate.ico + GeneralUpdate.png https://github.com/JusterZhu/GeneralUpdate The binary differential update function is provided, but the configuration file update function is reserved. JusterZhu - 1.4.3 + 9.0.0 https://github.com/GeneralLibrary/GeneralUpdate Copyright © 2024 JusterZhu. All rights reserved. default @@ -15,7 +15,7 @@ GeneralUpdate.Differential https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme public - upgrade + upgrade,update The binary differential update function is provided, but the configuration file update function is reserved. true @@ -31,4 +31,11 @@ + + + True + + + + diff --git a/src/c#/GeneralUpdate.Differential/GeneralUpdate.png b/src/c#/GeneralUpdate.Differential/GeneralUpdate.png new file mode 100644 index 0000000000000000000000000000000000000000..c8a51ff692fb434aea351d66ef66fb16cb35ebfe Binary files /dev/null and b/src/c#/GeneralUpdate.Differential/GeneralUpdate.png differ diff --git a/src/c#/Generalupdate.CatBowl/Program.cs b/src/c#/Generalupdate.CatBowl/Program.cs index 9b124a28f51723e17b8933ec7edda223967019c8..e0d1b9be32853138285f880cda7c3233ed9d127c 100644 --- a/src/c#/Generalupdate.CatBowl/Program.cs +++ b/src/c#/Generalupdate.CatBowl/Program.cs @@ -1,4 +1,5 @@ -using System.Text; +using System.Reflection; +using System.Text; using GeneralUpdate.Bowl; using GeneralUpdate.Bowl.Strategys;