Skip to content

Commit 4606048

Browse files
committed
fix: error
1. Remove try from middleware; exceptions are needed during processing to interrupt the update process. 2. Remove references to common, differential, and other libraries.
1 parent 7cef87a commit 4606048

File tree

7 files changed

+191
-15
lines changed

7 files changed

+191
-15
lines changed

src/c#/GeneralUpdate.Bowl/Common/git.keep

Whitespace-only changes.

src/c#/GeneralUpdate.Bowl/GeneralUpdate.Bowl.csproj

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,73 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30+
<PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
3031
<PackageReference Include="System.Text.Json" Version="9.0.0" />
3132
</ItemGroup>
32-
33+
3334
<ItemGroup>
34-
<ProjectReference Include="..\GeneralUpdate.Common\GeneralUpdate.Common.csproj" />
35+
<Compile Include="..\GeneralUpdate.Common\Compress\CompressProvider.cs" Link="Common\CompressProvider.cs" />
36+
<Compile Include="..\GeneralUpdate.Common\Compress\ICompressionStrategy.cs" Link="Common\ICompressionStrategy.cs" />
37+
<Compile Include="..\GeneralUpdate.Common\Compress\ZipCompressionStrategy.cs" Link="Common\ZipCompressionStrategy.cs" />
38+
<Compile Include="..\GeneralUpdate.Common\Download\DownloadManager.cs" Link="Common\DownloadManager.cs" />
39+
<Compile Include="..\GeneralUpdate.Common\Download\DownloadTask.cs" Link="Common\DownloadTask.cs" />
40+
<Compile Include="..\GeneralUpdate.Common\Download\MultiEventArgs\MutiAllDownloadCompletedEventArgs.cs" Link="Common\MutiAllDownloadCompletedEventArgs.cs" />
41+
<Compile Include="..\GeneralUpdate.Common\Download\MultiEventArgs\MutiDownloadCompletedEventArgs.cs" Link="Common\MutiDownloadCompletedEventArgs.cs" />
42+
<Compile Include="..\GeneralUpdate.Common\Download\MultiEventArgs\MutiDownloadErrorEventArgs.cs" Link="Common\MutiDownloadErrorEventArgs.cs" />
43+
<Compile Include="..\GeneralUpdate.Common\Download\MultiEventArgs\MutiDownloadStatisticsEventArgs.cs" Link="Common\MutiDownloadStatisticsEventArgs.cs" />
44+
<Compile Include="..\GeneralUpdate.Common\FileBasic\BlackListManager.cs" Link="Common\BlackListManager.cs" />
45+
<Compile Include="..\GeneralUpdate.Common\FileBasic\ComparisonResult.cs" Link="Common\ComparisonResult.cs" />
46+
<Compile Include="..\GeneralUpdate.Common\FileBasic\FileNode.cs" Link="Common\FileNode.cs" />
47+
<Compile Include="..\GeneralUpdate.Common\FileBasic\FileTree.cs" Link="Common\FileTree.cs" />
48+
<Compile Include="..\GeneralUpdate.Common\FileBasic\StorageManager.cs" Link="Common\StorageManager.cs" />
49+
<Compile Include="..\GeneralUpdate.Common\HashAlgorithms\HashAlgorithmBase.cs" Link="Common\HashAlgorithmBase.cs" />
50+
<Compile Include="..\GeneralUpdate.Common\HashAlgorithms\Md5HashAlgorithm.cs" Link="Common\Md5HashAlgorithm.cs" />
51+
<Compile Include="..\GeneralUpdate.Common\HashAlgorithms\Sha1HashAlgorithm.cs" Link="Common\Sha1HashAlgorithm.cs" />
52+
<Compile Include="..\GeneralUpdate.Common\HashAlgorithms\Sha256HashAlgorithm.cs" Link="Common\Sha256HashAlgorithm.cs" />
53+
<Compile Include="..\GeneralUpdate.Common\Internal\Bootstrap\AbstractBootstrap.cs" Link="Common\AbstractBootstrap.cs" />
54+
<Compile Include="..\GeneralUpdate.Common\Internal\Bootstrap\UpdateOption.cs" Link="Common\UpdateOption.cs" />
55+
<Compile Include="..\GeneralUpdate.Common\Internal\Bootstrap\UpdateOptionValue.cs" Link="Common\UpdateOptionValue.cs" />
56+
<Compile Include="..\GeneralUpdate.Common\Internal\Event\EventManager.cs" Link="Common\EventManager.cs" />
57+
<Compile Include="..\GeneralUpdate.Common\Internal\Event\IEventManager.cs" Link="Common\IEventManager.cs" />
58+
<Compile Include="..\GeneralUpdate.Common\Internal\Exception\ExceptionEventArgs.cs" Link="Common\ExceptionEventArgs.cs" />
59+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\FileNodesJsonContext.cs" Link="Common\FileNodesJsonContext.cs" />
60+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\GlobalConfigInfoOSSJsonContext.cs" Link="Common\GlobalConfigInfoOSSJsonContext.cs" />
61+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\HttpParameterJsonContext.cs" Link="Common\HttpParameterJsonContext.cs" />
62+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\PacketJsonContext.cs" Link="Common\PacketJsonContext.cs" />
63+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\ProcessInfoJsonContext.cs" Link="Common\ProcessInfoJsonContext.cs" />
64+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\ReportRespJsonContext.cs" Link="Common\ReportRespJsonContext.cs" />
65+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\VersionOSSJsonContext.cs" Link="Common\VersionOSSJsonContext.cs" />
66+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\VersionRespJsonContext.cs" Link="Common\VersionRespJsonContext.cs" />
67+
<Compile Include="..\GeneralUpdate.Common\Internal\Pipeline\IMiddleware.cs" Link="Common\IMiddleware.cs" />
68+
<Compile Include="..\GeneralUpdate.Common\Internal\Pipeline\PipelineBuilder.cs" Link="Common\PipelineBuilder.cs" />
69+
<Compile Include="..\GeneralUpdate.Common\Internal\Pipeline\PipelineContext.cs" Link="Common\PipelineContext.cs" />
70+
<Compile Include="..\GeneralUpdate.Common\Internal\Strategy\AbstractStrategy.cs" Link="Common\AbstractStrategy.cs" />
71+
<Compile Include="..\GeneralUpdate.Common\Internal\Strategy\IStrategy.cs" Link="Common\IStrategy.cs" />
72+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Configinfo.cs" Link="Common\Configinfo.cs" />
73+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\DTO\BaseResponseDTO.cs" Link="Common\BaseResponseDTO.cs" />
74+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\DTO\VersionRespDTO.cs" Link="Common\VersionRespDTO.cs" />
75+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Enum\AppType.cs" Link="Common\AppType.cs" />
76+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Enum\Format.cs" Link="Common\Format.cs" />
77+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Enum\PlatformType.cs" Link="Common\PlatformType.cs" />
78+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Enum\ReportType.cs" Link="Common\ReportType.cs" />
79+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\GlobalConfigInfo.cs" Link="Common\GlobalConfigInfo.cs" />
80+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\GlobalConfigInfoOSS.cs" Link="Common\GlobalConfigInfoOSS.cs" />
81+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Packet.cs" Link="Common\Packet.cs" />
82+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\ProcessInfo.cs" Link="Common\ProcessInfo.cs" />
83+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\VersionInfo.cs" Link="Common\VersionInfo.cs" />
84+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\VersionOSS.cs" Link="Common\VersionOSS.cs" />
85+
<Compile Include="..\GeneralUpdate.Common\Shared\Service\VersionService.cs" Link="Common\VersionService.cs" />
3586
</ItemGroup>
3687

37-
3888
<ItemGroup>
3989
<Content Include="Applications\**\*">
4090
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4191
<PackageCopyToOutput>true</PackageCopyToOutput>
4292
</Content>
4393
</ItemGroup>
94+
95+
96+
<ItemGroup>
97+
<Folder Include="Common\" />
98+
</ItemGroup>
4499
</Project>

src/c#/GeneralUpdate.ClientCore/Common/git.keep

Whitespace-only changes.

src/c#/GeneralUpdate.ClientCore/GeneralUpdate.ClientCore.csproj

Lines changed: 65 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,74 @@
2121
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
2222
</PropertyGroup>
2323

24+
<ItemGroup>
25+
<Compile Include="..\GeneralUpdate.Common\Compress\CompressProvider.cs" Link="Common\CompressProvider.cs" />
26+
<Compile Include="..\GeneralUpdate.Common\Compress\ICompressionStrategy.cs" Link="Common\ICompressionStrategy.cs" />
27+
<Compile Include="..\GeneralUpdate.Common\Compress\ZipCompressionStrategy.cs" Link="Common\ZipCompressionStrategy.cs" />
28+
<Compile Include="..\GeneralUpdate.Common\Download\DownloadManager.cs" Link="Common\DownloadManager.cs" />
29+
<Compile Include="..\GeneralUpdate.Common\Download\DownloadTask.cs" Link="Common\DownloadTask.cs" />
30+
<Compile Include="..\GeneralUpdate.Common\Download\MultiEventArgs\MutiAllDownloadCompletedEventArgs.cs" Link="Common\MutiAllDownloadCompletedEventArgs.cs" />
31+
<Compile Include="..\GeneralUpdate.Common\Download\MultiEventArgs\MutiDownloadCompletedEventArgs.cs" Link="Common\MutiDownloadCompletedEventArgs.cs" />
32+
<Compile Include="..\GeneralUpdate.Common\Download\MultiEventArgs\MutiDownloadErrorEventArgs.cs" Link="Common\MutiDownloadErrorEventArgs.cs" />
33+
<Compile Include="..\GeneralUpdate.Common\Download\MultiEventArgs\MutiDownloadStatisticsEventArgs.cs" Link="Common\MutiDownloadStatisticsEventArgs.cs" />
34+
<Compile Include="..\GeneralUpdate.Common\FileBasic\BlackListManager.cs" Link="Common\BlackListManager.cs" />
35+
<Compile Include="..\GeneralUpdate.Common\FileBasic\ComparisonResult.cs" Link="Common\ComparisonResult.cs" />
36+
<Compile Include="..\GeneralUpdate.Common\FileBasic\FileNode.cs" Link="Common\FileNode.cs" />
37+
<Compile Include="..\GeneralUpdate.Common\FileBasic\FileTree.cs" Link="Common\FileTree.cs" />
38+
<Compile Include="..\GeneralUpdate.Common\FileBasic\StorageManager.cs" Link="Common\StorageManager.cs" />
39+
<Compile Include="..\GeneralUpdate.Common\HashAlgorithms\HashAlgorithmBase.cs" Link="Common\HashAlgorithmBase.cs" />
40+
<Compile Include="..\GeneralUpdate.Common\HashAlgorithms\Md5HashAlgorithm.cs" Link="Common\Md5HashAlgorithm.cs" />
41+
<Compile Include="..\GeneralUpdate.Common\HashAlgorithms\Sha1HashAlgorithm.cs" Link="Common\Sha1HashAlgorithm.cs" />
42+
<Compile Include="..\GeneralUpdate.Common\HashAlgorithms\Sha256HashAlgorithm.cs" Link="Common\Sha256HashAlgorithm.cs" />
43+
<Compile Include="..\GeneralUpdate.Common\Internal\Bootstrap\AbstractBootstrap.cs" Link="Common\AbstractBootstrap.cs" />
44+
<Compile Include="..\GeneralUpdate.Common\Internal\Bootstrap\UpdateOption.cs" Link="Common\UpdateOption.cs" />
45+
<Compile Include="..\GeneralUpdate.Common\Internal\Bootstrap\UpdateOptionValue.cs" Link="Common\UpdateOptionValue.cs" />
46+
<Compile Include="..\GeneralUpdate.Common\Internal\Event\EventManager.cs" Link="Common\EventManager.cs" />
47+
<Compile Include="..\GeneralUpdate.Common\Internal\Event\IEventManager.cs" Link="Common\IEventManager.cs" />
48+
<Compile Include="..\GeneralUpdate.Common\Internal\Exception\ExceptionEventArgs.cs" Link="Common\ExceptionEventArgs.cs" />
49+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\FileNodesJsonContext.cs" Link="Common\FileNodesJsonContext.cs" />
50+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\GlobalConfigInfoOSSJsonContext.cs" Link="Common\GlobalConfigInfoOSSJsonContext.cs" />
51+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\HttpParameterJsonContext.cs" Link="Common\HttpParameterJsonContext.cs" />
52+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\PacketJsonContext.cs" Link="Common\PacketJsonContext.cs" />
53+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\ProcessInfoJsonContext.cs" Link="Common\ProcessInfoJsonContext.cs" />
54+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\ReportRespJsonContext.cs" Link="Common\ReportRespJsonContext.cs" />
55+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\VersionOSSJsonContext.cs" Link="Common\VersionOSSJsonContext.cs" />
56+
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\VersionRespJsonContext.cs" Link="Common\VersionRespJsonContext.cs" />
57+
<Compile Include="..\GeneralUpdate.Common\Internal\Pipeline\IMiddleware.cs" Link="Common\IMiddleware.cs" />
58+
<Compile Include="..\GeneralUpdate.Common\Internal\Pipeline\PipelineBuilder.cs" Link="Common\PipelineBuilder.cs" />
59+
<Compile Include="..\GeneralUpdate.Common\Internal\Pipeline\PipelineContext.cs" Link="Common\PipelineContext.cs" />
60+
<Compile Include="..\GeneralUpdate.Common\Internal\Strategy\AbstractStrategy.cs" Link="Common\AbstractStrategy.cs" />
61+
<Compile Include="..\GeneralUpdate.Common\Internal\Strategy\IStrategy.cs" Link="Common\IStrategy.cs" />
62+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Configinfo.cs" Link="Common\Configinfo.cs" />
63+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\DTO\BaseResponseDTO.cs" Link="Common\BaseResponseDTO.cs" />
64+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\DTO\VersionRespDTO.cs" Link="Common\VersionRespDTO.cs" />
65+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Enum\AppType.cs" Link="Common\AppType.cs" />
66+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Enum\Format.cs" Link="Common\Format.cs" />
67+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Enum\PlatformType.cs" Link="Common\PlatformType.cs" />
68+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Enum\ReportType.cs" Link="Common\ReportType.cs" />
69+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\GlobalConfigInfo.cs" Link="Common\GlobalConfigInfo.cs" />
70+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\GlobalConfigInfoOSS.cs" Link="Common\GlobalConfigInfoOSS.cs" />
71+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Packet.cs" Link="Common\Packet.cs" />
72+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\ProcessInfo.cs" Link="Common\ProcessInfo.cs" />
73+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\VersionInfo.cs" Link="Common\VersionInfo.cs" />
74+
<Compile Include="..\GeneralUpdate.Common\Shared\Object\VersionOSS.cs" Link="Common\VersionOSS.cs" />
75+
<Compile Include="..\GeneralUpdate.Common\Shared\Service\VersionService.cs" Link="Common\VersionService.cs" />
76+
<Compile Include="..\GeneralUpdate.Differential\Binary\BinaryHandler.cs" Link="Common\BinaryHandler.cs" />
77+
<Compile Include="..\GeneralUpdate.Differential\Binary\BZip2Constants.cs" Link="Common\BZip2Constants.cs" />
78+
<Compile Include="..\GeneralUpdate.Differential\Binary\BZip2InputStream.cs" Link="Common\BZip2InputStream.cs" />
79+
<Compile Include="..\GeneralUpdate.Differential\Binary\BZip2OutputStream.cs" Link="Common\BZip2OutputStream.cs" />
80+
<Compile Include="..\GeneralUpdate.Differential\Binary\IChecksum.cs" Link="Common\IChecksum.cs" />
81+
<Compile Include="..\GeneralUpdate.Differential\Binary\StrangeCRC.cs" Link="Common\StrangeCRC.cs" />
82+
<Compile Include="..\GeneralUpdate.Differential\DifferentialCore.cs" Link="Common\DifferentialCore.cs" />
83+
</ItemGroup>
84+
2485
<ItemGroup>
2586
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
2687
<PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
2788
<PackageReference Include="System.Net.Http" Version="4.3.4" />
2889
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
2990
</ItemGroup>
3091

31-
<ItemGroup>
32-
<ProjectReference Include="..\GeneralUpdate.Common\GeneralUpdate.Common.csproj" />
33-
<ProjectReference Include="..\GeneralUpdate.Differential\GeneralUpdate.Differential.csproj" />
34-
</ItemGroup>
35-
3692
<ItemGroup>
3793
<None Update="GeneralUpdate.ico">
3894
<Pack>True</Pack>
@@ -47,4 +103,8 @@
47103
</None>
48104
</ItemGroup>
49105

106+
<ItemGroup>
107+
<Folder Include="Common\" />
108+
</ItemGroup>
109+
50110
</Project>

src/c#/GeneralUpdate.Core/Common/git.keep

Whitespace-only changes.

0 commit comments

Comments
 (0)