!61 Dev

JusterZhu · gitee-org · commit fc2d323ee0c6 · 2024-12-01T06:13:18.000Z
Merge pull request !61 from Juster Zhu/dev
diff --git a/src/c#/GeneralUpdate.Bowl/GeneralUpdate.Bowl.csproj b/src/c#/GeneralUpdate.Bowl/GeneralUpdate.Bowl.csproj
@@ -13,29 +13,17 @@
         <Title>GeneralUpdate.Bowl</Title>
         <Authors>JusterZhu</Authors>
         <RepositoryType>public</RepositoryType>
-        <PackageTags>upgrade</PackageTags>
+        <PackageTags>upgrade,update</PackageTags>
         <PackageReleaseNotes>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.</PackageReleaseNotes>
         <PackageIcon>bowl.jpeg</PackageIcon>
-        <Version>1.0.4</Version>
+        <Version>9.0.0</Version>
     </PropertyGroup>
     
     <ItemGroup>
         <None Update="bowl.jpeg">
             <Pack>True</Pack>
             <PackagePath></PackagePath>
         </None>
-        <None Update="Applications\Linux\procdump-3.3.0-0.cm2.x86_64.rpm">
-            <Pack>True</Pack>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="Applications\Linux\procdump-3.3.0-0.el8.x86_64.rpm">
-            <Pack>True</Pack>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="Applications\Linux\procdump_3.3.0_amd64.deb">
-            <Pack>True</Pack>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
     </ItemGroup>
 
     <ItemGroup>
@@ -45,10 +33,12 @@
     <ItemGroup>
       <ProjectReference Include="..\GeneralUpdate.Common\GeneralUpdate.Common.csproj" />
     </ItemGroup>
-    
+
+
     <ItemGroup>
-        <EmbeddedResource Include="Applications\**\*">
+        <Content Include="Applications\**\*">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </EmbeddedResource>
+            <PackageCopyToOutput>true</PackageCopyToOutput>
+        </Content>
     </ItemGroup>
 </Project>
diff --git a/src/c#/GeneralUpdate.Bowl/Strategys/WindowStrategy.cs b/src/c#/GeneralUpdate.Bowl/Strategys/WindowStrategy.cs
@@ -21,6 +21,7 @@ public override void Launch()
         _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
@@ -14,7 +14,7 @@ internal class Program
     {
         static async Task Main(string[] args)
         {
-            /*try
+            try
             {
                 Console.WriteLine($"主程序初始化，{DateTime.Now}！");
                 Console.WriteLine("当前运行目录：" + Thread.GetDomain().BaseDirectory);
@@ -57,7 +57,7 @@ static async Task Main(string[] args)
             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
@@ -2,11 +2,11 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.12.10</Version>
+        <Version>9.0.0</Version>
         <Authors>JusterZhu</Authors>
         <Description>Provides functions related to upgrade and update programs.</Description>
         <ApplicationIcon>GeneralUpdate.ico</ApplicationIcon>
-        <PackageIcon>GeneralUpdate.ico</PackageIcon>
+        <PackageIcon>GeneralUpdate.png</PackageIcon>
         <SignAssembly>False</SignAssembly>
         <RepositoryUrl>https://github.com/GeneralLibrary/GeneralUpdate</RepositoryUrl>
         <Copyright>Copyright © 2024 JusterZhu. All rights reserved.</Copyright>
@@ -17,7 +17,7 @@
         <Title>GeneralUpdate.ClientCore</Title>
         <PackageLicenseUrl>https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme</PackageLicenseUrl>
         <RepositoryType>public</RepositoryType>
-        <PackageTags>upgrade</PackageTags>
+        <PackageTags>upgrade,update</PackageTags>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     </PropertyGroup>
 
@@ -40,4 +40,11 @@
       </None>
     </ItemGroup>
 
+    <ItemGroup>
+      <None Update="GeneralUpdate.png">
+        <Pack>True</Pack>
+        <PackagePath></PackagePath>
+      </None>
+    </ItemGroup>
+
 </Project>
diff --git a/src/c#/GeneralUpdate.ClientCore/GeneralUpdate.png b/src/c#/GeneralUpdate.ClientCore/GeneralUpdate.png
diff --git a/src/c#/GeneralUpdate.Common/GeneralUpdate.Common.csproj b/src/c#/GeneralUpdate.Common/GeneralUpdate.Common.csproj
@@ -13,10 +13,10 @@
         <PackageIcon>GeneralUpdate128.png</PackageIcon>
         <RepositoryUrl>https://github.com/GeneralLibrary/GeneralUpdate</RepositoryUrl>
         <RepositoryType>public</RepositoryType>
-        <PackageTags>upgrade</PackageTags>
+        <PackageTags>upgrade,update</PackageTags>
         <PackageReleaseNotes>The infrastructure required to support all components is necessary, and this nuget package is essential.</PackageReleaseNotes>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-        <Version>2.0.0</Version>
+        <Version>9.0.0</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/c#/GeneralUpdate.Core/GeneralUpdate.Core.csproj b/src/c#/GeneralUpdate.Core/GeneralUpdate.Core.csproj
@@ -3,12 +3,12 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
     <PackageId>$(AssemblyName)</PackageId>
-    <Version>4.14.21</Version>
+    <Version>9.0.0</Version>
     <Authors>JusterZhu</Authors>
     <Company>juster.zhu</Company>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ApplicationIcon>GeneralUpdate.ico</ApplicationIcon>
-    <PackageIcon>GeneralUpdate.ico</PackageIcon>
+    <PackageIcon>GeneralUpdate.png</PackageIcon>
     <Copyright>Copyright © 2024 JusterZhu. All rights reserved.</Copyright>
     <Description>This section describes how to upgrade client applications.</Description>
     <PackageReleaseNotes>Provides high-performance, low-loss, resume-breakpoint, version-by-version update, binary differential update, incremental update function, configuration file retention update and other features.</PackageReleaseNotes>
@@ -21,7 +21,7 @@
     <Title>GeneralUpdate.Core</Title>
     <PackageLicenseUrl>https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme</PackageLicenseUrl>
     <RepositoryType>public</RepositoryType>
-    <PackageTags>upgrade</PackageTags>
+    <PackageTags>upgrade,update</PackageTags>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
   </PropertyGroup>
   <ItemGroup>
@@ -33,4 +33,10 @@
       <PackagePath></PackagePath>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <None Update="GeneralUpdate.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/src/c#/GeneralUpdate.Core/GeneralUpdate.png b/src/c#/GeneralUpdate.Core/GeneralUpdate.png
diff --git a/src/c#/GeneralUpdate.Core/Strategys/WindowsStrategy.cs b/src/c#/GeneralUpdate.Core/Strategys/WindowsStrategy.cs
@@ -99,12 +99,18 @@ public override void StartApp()
         {
             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
@@ -3,19 +3,19 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <ApplicationIcon>GeneralUpdate.ico</ApplicationIcon>
-    <PackageIcon>GeneralUpdate.ico</PackageIcon>
+    <PackageIcon>GeneralUpdate.png</PackageIcon>
     <RepositoryUrl>https://github.com/JusterZhu/GeneralUpdate</RepositoryUrl>
     <Description>The binary differential update function is provided, but the configuration file update function is reserved.</Description>
     <Authors>JusterZhu</Authors>
-    <Version>1.4.3</Version>
+    <Version>9.0.0</Version>
     <PackageProjectUrl>https://github.com/GeneralLibrary/GeneralUpdate</PackageProjectUrl>
     <Copyright>Copyright © 2024 JusterZhu. All rights reserved.</Copyright>
     <LangVersion>default</LangVersion>
     <Nullable>enable</Nullable>
     <Title>GeneralUpdate.Differential</Title>
     <PackageLicenseUrl>https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme</PackageLicenseUrl>
     <RepositoryType>public</RepositoryType>
-    <PackageTags>upgrade</PackageTags>
+    <PackageTags>upgrade,update</PackageTags>
     <PackageReleaseNotes>The binary differential update function is provided, but the configuration file update function is reserved.</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
   </PropertyGroup>
@@ -31,4 +31,11 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="GeneralUpdate.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/src/c#/GeneralUpdate.Differential/GeneralUpdate.png b/src/c#/GeneralUpdate.Differential/GeneralUpdate.png
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public override void Launch()`
`21`	`21`	`_parameter.InnerApp = Path.Combine(_applicationsDirectory, GetAppName());`
`22`	`22`	`var dmpFullName = Path.Combine(_parameter.FailDirectory, _parameter.DumpFileName);`
`23`	`23`	`_parameter.InnerArguments = $"-e -ma {_parameter.ProcessNameOrId} {dmpFullName}";`
	`24`	`+ //This method is used to launch scripts in applications.`
`24`	`25`	`base.Launch();`
`25`	`26`	`ExecuteFinalTreatment();`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ internal class Program`
`14`	`14`	`{`
`15`	`15`	`static async Task Main(string[] args)`
`16`	`16`	`{`
`17`		`- /*try`
	`17`	`+ try`
`18`	`18`	`{`
`19`	`19`	`Console.WriteLine($"主程序初始化，{DateTime.Now}！");`
`20`	`20`	`Console.WriteLine("当前运行目录：" + Thread.GetDomain().BaseDirectory);`
`@@ -57,7 +57,7 @@ static async Task Main(string[] args)`
`57`	`57`	`catch (Exception e)`
`58`	`58`	`{`
`59`	`59`	`Console.WriteLine(e.Message + "\n" + e.StackTrace);`
`60`		`- }*/`
	`60`	`+ }`
`61`	`61`
`62`	`62`	`/*var paramsOSS = new GlobalConfigInfoOSS();`
`63`	`63`	`paramsOSS.Url = "http://192.168.50.203/versions.json";`
Original file line number	Diff line number	Diff line change
`@@ -99,12 +99,18 @@ public override void StartApp()`
`99`	`99`	`{`
`100`	`100`	`try`
`101`	`101`	`{`
`102`		`- var appBowlPath = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? null : CheckPath(_configinfo.InstallPath, _configinfo.Bowl);`
`103`		`- var appPath = string.IsNullOrWhiteSpace(appBowlPath) ? CheckPath(_configinfo.InstallPath, _configinfo.MainAppName) : appBowlPath;`
`104`		`- if(string.IsNullOrEmpty(appPath))`
`105`		`- throw new Exception($"Can't find the app {appPath}!");`
	`102`	`+ var mainAppPath = CheckPath(_configinfo.InstallPath, _configinfo.MainAppName);`
	`103`	`+ if (string.IsNullOrEmpty(mainAppPath))`
	`104`	`+ throw new Exception($"Can't find the app {mainAppPath}!");`
`106`	`105`
`107`		`- Process.Start(appPath);`
	`106`	`+ Process.Start(mainAppPath);`
	`107`	`+`
	`108`	`+ if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux))`
	`109`	`+ {`
	`110`	`+ var bowlAppPath = CheckPath(_configinfo.InstallPath, _configinfo.Bowl);`
	`111`	`+ if (!string.IsNullOrEmpty(bowlAppPath))`
	`112`	`+ Process.Start(bowlAppPath);`
	`113`	`+ }`
`108`	`114`	`}`
`109`	`115`	`catch (Exception e)`
`110`	`116`	`{`