Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #73

Merged
merged 2 commits into from
Nov 29, 2024
Merged

Dev #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39b7acc
移除冗余文件
JusterZhu Nov 27, 2024
bd3275d
添加nuget打包说明
JusterZhu Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ MAUI GeneralUpdate.Maui

- https://gitee.com/GeneralTeam/GeneralUpdate-Samples



功能介绍：

| 功能 | 是否支持 | 备注 |
Expand Down
80 changes: 55 additions & 25 deletions src/c#/GeneralUpdate.Bowl/GeneralUpdate.Bowl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,70 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>12</LangVersion>
<LangVersion>default</LangVersion>
<Nullable>enable</Nullable>
<Description>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.</Description>
<Copyright>Copyright © 2024 JusterZhu. All rights reserved.</Copyright>
<PackageProjectUrl>https://github.com/GeneralLibrary/GeneralUpdate</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme</PackageLicenseUrl>
<RepositoryUrl>https://github.com/GeneralLibrary/GeneralUpdate</RepositoryUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Title>GeneralUpdate.Bowl</Title>
<Authors>JusterZhu</Authors>
<RepositoryType>public</RepositoryType>
<PackageTags>upgrade</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>
</PropertyGroup>

<ItemGroup>
<None Update="Applications\Windows\procdump.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Applications\Windows\procdump64.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Applications\Windows\procdump64a.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Applications\Linux\procdump-3.3.0-0.cm2.x86_64.rpm">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Applications\Linux\procdump-3.3.0-0.el8.x86_64.rpm">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Applications\Linux\procdump_3.3.0_amd64.deb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Applications\Windows\export.bat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<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>
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\GeneralUpdate.Common\GeneralUpdate.Common.csproj" />
</ItemGroup>


<ItemGroup>
<None Remove="Applications\Windows\export.bat" />
<EmbeddedResource Include="Applications\Windows\export.bat">
<Pack>True</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<None Remove="Applications\Windows\procdump.exe" />
<EmbeddedResource Include="Applications\Windows\procdump.exe">
<Pack>True</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<None Remove="Applications\Windows\procdump64.exe" />
<EmbeddedResource Include="Applications\Windows\procdump64.exe">
<Pack>True</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<None Remove="Applications\Windows\procdump64a.exe" />
<EmbeddedResource Include="Applications\Windows\procdump64a.exe">
<Pack>True</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
</Project>
Binary file added src/c#/GeneralUpdate.Bowl/bowl.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 14 additions & 7 deletions src/c#/GeneralUpdate.ClientCore/GeneralUpdate.ClientCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,22 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>2.12.10</Version>
<Authors>juster.zhu</Authors>
<Authors>JusterZhu</Authors>
<Description>Provides functions related to upgrade and update programs.</Description>
<ApplicationIcon>GeneralUpdate.ico</ApplicationIcon>
<PackageIcon>GeneralUpdate128.png</PackageIcon>
<PackageIcon>GeneralUpdate.ico</PackageIcon>
<SignAssembly>False</SignAssembly>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<RepositoryUrl>https://github.com/JusterZhu/GeneralUpdate</RepositoryUrl>
<Copyright>Copyright © 2024</Copyright>
<RepositoryUrl>https://github.com/GeneralLibrary/GeneralUpdate</RepositoryUrl>
<Copyright>Copyright © 2024 JusterZhu. All rights reserved.</Copyright>
<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>
<PackageProjectUrl>https://github.com/JusterZhu/GeneralUpdate</PackageProjectUrl>
<LangVersion>12</LangVersion>
<LangVersion>default</LangVersion>
<Nullable>enable</Nullable>
<Title>GeneralUpdate.ClientCore</Title>
<PackageLicenseUrl>https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme</PackageLicenseUrl>
<RepositoryType>public</RepositoryType>
<PackageTags>upgrade</PackageTags>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
</PropertyGroup>

<ItemGroup>
Expand All @@ -30,7 +34,10 @@
</ItemGroup>

<ItemGroup>
<None Remove="GeneralUpdate.ico" />
<None Update="GeneralUpdate.ico">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>

</Project>
27 changes: 26 additions & 1 deletion src/c#/GeneralUpdate.Common/GeneralUpdate.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,39 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<LangVersion>12</LangVersion>
<LangVersion>default</LangVersion>
<Nullable>enable</Nullable>
<TargetFramework>netstandard2.0</TargetFramework>
<Title>GeneralUpdate.Common</Title>
<Authors>JusterZhu</Authors>
<Description>The infrastructure required to support all components is necessary, and this nuget package is essential.</Description>
<Copyright>Copyright © 2024 JusterZhu. All rights reserved.</Copyright>
<PackageProjectUrl>https://github.com/GeneralLibrary/GeneralUpdate</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme</PackageLicenseUrl>
<PackageIcon>GeneralUpdate128.png</PackageIcon>
<RepositoryUrl>https://github.com/GeneralLibrary/GeneralUpdate</RepositoryUrl>
<RepositoryType>public</RepositoryType>
<PackageTags>upgrade</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>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
<PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
<None Include="..\..\..\imgs\GeneralUpdate.ico">
<Pack>True</Pack>
<PackagePath></PackagePath>
<Link>GeneralUpdate.ico</Link>
</None>
<None Update="GeneralUpdate128.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
</Project>
Binary file added src/c#/GeneralUpdate.Common/GeneralUpdate128.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 14 additions & 7 deletions src/c#/GeneralUpdate.Core/GeneralUpdate.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,33 @@
<OutputType>Library</OutputType>
<PackageId>$(AssemblyName)</PackageId>
<Version>4.14.21</Version>
<Authors>juster.zhu</Authors>
<Authors>JusterZhu</Authors>
<Company>juster.zhu</Company>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ApplicationIcon>GeneralUpdate.ico</ApplicationIcon>
<PackageIcon>GeneralUpdate128.png</PackageIcon>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Copyright>Copyright © 2024</Copyright>
<PackageIcon>GeneralUpdate.ico</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>
<RepositoryUrl>https://github.com/JusterZhu/GeneralUpdate</RepositoryUrl>
<AssemblyName>GeneralUpdate.Core</AssemblyName>
<RootNamespace>GeneralUpdate.Core</RootNamespace>
<PackageProjectUrl>https://github.com/JusterZhu/GeneralUpdate</PackageProjectUrl>
<LangVersion>12</LangVersion>
<PackageProjectUrl>https://github.com/GeneralLibrary/GeneralUpdate</PackageProjectUrl>
<LangVersion>default</LangVersion>
<Nullable>enable</Nullable>
<Title>GeneralUpdate.Core</Title>
<PackageLicenseUrl>https://github.com/GeneralLibrary/GeneralUpdate?tab=MIT-1-ov-file#readme</PackageLicenseUrl>
<RepositoryType>public</RepositoryType>
<PackageTags>upgrade</PackageTags>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\GeneralUpdate.Differential\GeneralUpdate.Differential.csproj" />
</ItemGroup>
<ItemGroup>
<None Remove="GeneralUpdate.ico" />
<None Update="GeneralUpdate.ico">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
</Project>
21 changes: 15 additions & 6 deletions src/c#/GeneralUpdate.Differential/GeneralUpdate.Differential.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,32 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ApplicationIcon>GeneralUpdate.ico</ApplicationIcon>
<PackageIcon>GeneralUpdate128.png</PackageIcon>
<PackageIcon>GeneralUpdate.ico</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>juster.zhu</Authors>
<Authors>JusterZhu</Authors>
<Version>1.4.3</Version>
<PackageProjectUrl>https://github.com/JusterZhu/GeneralUpdate</PackageProjectUrl>
<Copyright>Copyright © 2023</Copyright>
<LangVersion>12</LangVersion>
<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>
<PackageReleaseNotes>The binary differential update function is provided, but the configuration file update function is reserved.</PackageReleaseNotes>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\GeneralUpdate.Common\GeneralUpdate.Common.csproj" />
</ItemGroup>

<ItemGroup>
<None Remove="GeneralUpdate.ico" />
<None Update="GeneralUpdate.ico">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>

</Project>
9 changes: 8 additions & 1 deletion src/c#/Generalupdate.CatBowl/Generalupdate.CatBowl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@

<ItemGroup>
<ProjectReference Include="..\GeneralUpdate.Bowl\GeneralUpdate.Bowl.csproj" />
<ProjectReference Include="..\GeneralUpdate.Differential\GeneralUpdate.Differential.csproj" />
</ItemGroup>

<Target Name="AppFiles" AfterTargets="Build">
<ItemGroup>
<ExeFiles Include="$(MSBuildThisFileDirectory)Applications\Windows\*.exe" />
<BatFiles Include="$(MSBuildThisFileDirectory)Applications\Windows\*.bat" />
</ItemGroup>
<Copy SourceFiles="@(AppFiles)" DestinationFolder="$(OutputPath)" />
</Target>

</Project>
6 changes: 2 additions & 4 deletions src/c#/Generalupdate.CatBowl/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
using System.Text;
using GeneralUpdate.Bowl;
using GeneralUpdate.Bowl.Strategys;
using GeneralUpdate.Common.Compress;
using GeneralUpdate.Common.Shared.Object;

namespace Generalupdate.CatBowl;

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
{
Expand All @@ -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";
Expand Down
1 change: 0 additions & 1 deletion src/sql/sql_v2.0.txt
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/sql/update.sql
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions src/sql/update_v2.0.sql
View file
Open in desktop

This file was deleted.

Binary file removed tag/20230422/GeneralUpdate.ClientCore.2.12.10.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed tag/20230422/GeneralUpdate.Core.4.14.20.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed tag/20230422/GeneralUpdate.Differential.1.4.2.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed tag/20230422/GeneralUpdate.Maui.OSS.1.0.0.nupkg
View file
Open in desktop
Binary file not shown.
Loading