Skip to content

Commit a6d04b6

Browse files
authored
chore: clean up residual directories, add Core references, trim readiness (#349)
- Deleted src/c#/GeneralUpdate.Common/ (dead code after project merge) - Deleted src/c#/GeneralUpdate.ClientCore/ (dead code after project merge) - Updated Bowl, Drivelution, Extension to reference Core directly (removed file-link compilation to deleted Common directory) - Fixed namespace references: GeneralUpdate.Common → GeneralUpdate.Core in Bowl, Drivelution, Extension source files - Added IsTrimmable + EnableTrimAnalyzer to Core.csproj - Upgraded Extension Microsoft.Extensions packages to 10.0.1 Closes #348
1 parent 10ce007 commit a6d04b6

108 files changed

Lines changed: 60 additions & 6154 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/c#/GeneralUpdate.Bowl/Bowl.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
using GeneralUpdate.Bowl.Internal;
77
using GeneralUpdate.Bowl.Strategies;
88
using GeneralUpdate.Bowl.Strategys;
9-
using GeneralUpdate.Common.FileBasic;
10-
using GeneralUpdate.Common.Internal.Bootstrap;
11-
using GeneralUpdate.Common.Internal.JsonContext;
12-
using GeneralUpdate.Common.Shared;
13-
using GeneralUpdate.Common.Shared.Object;
9+
using GeneralUpdate.Core.FileSystem;
10+
using GeneralUpdate.Core.Configuration;
11+
using GeneralUpdate.Core.JsonContext;
12+
using GeneralUpdate.Core;
13+
using GeneralUpdate.Core.Configuration;
1414

1515
namespace GeneralUpdate.Bowl;
1616

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

Lines changed: 9 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<LangVersion>default</LangVersion>
44
<Nullable>enable</Nullable>
@@ -17,81 +17,27 @@
1717
<PackageIcon>bowl.jpeg</PackageIcon>
1818
<TargetFrameworks>netstandard2.0;</TargetFrameworks>
1919
</PropertyGroup>
20+
2021
<ItemGroup>
21-
<PackageReference Include="System.Collections.Immutable" Version="10.0.1" />
22-
<PackageReference Include="System.Text.Json" Version="10.0.1" />
22+
<ProjectReference Include="..\GeneralUpdate.Core\GeneralUpdate.Core.csproj" />
2323
</ItemGroup>
24+
2425
<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\Sha256HashAlgorithm.cs" Link="Common\Sha256HashAlgorithm.cs" />
41-
<Compile Include="..\GeneralUpdate.Common\Internal\Bootstrap\AbstractBootstrap.cs" Link="Common\AbstractBootstrap.cs" />
42-
<Compile Include="..\GeneralUpdate.Common\Internal\Bootstrap\UpdateOption.cs" Link="Common\UpdateOption.cs" />
43-
<Compile Include="..\GeneralUpdate.Common\Internal\Bootstrap\UpdateOptionValue.cs" Link="Common\UpdateOptionValue.cs" />
44-
<Compile Include="..\GeneralUpdate.Common\Internal\Bootstrap\Environments.cs" Link="Common\Environments.cs" />
45-
<Compile Include="..\GeneralUpdate.Common\Internal\Event\EventManager.cs" Link="Common\EventManager.cs" />
46-
<Compile Include="..\GeneralUpdate.Common\Internal\Event\IEventManager.cs" Link="Common\IEventManager.cs" />
47-
<Compile Include="..\GeneralUpdate.Common\Internal\Exception\ExceptionEventArgs.cs" Link="Common\ExceptionEventArgs.cs" />
48-
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\FileNodesJsonContext.cs" Link="Common\FileNodesJsonContext.cs" />
49-
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\GlobalConfigInfoOSSJsonContext.cs" Link="Common\GlobalConfigInfoOSSJsonContext.cs" />
50-
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\HttpParameterJsonContext.cs" Link="Common\HttpParameterJsonContext.cs" />
51-
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\PacketJsonContext.cs" Link="Common\PacketJsonContext.cs" />
52-
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\ProcessInfoJsonContext.cs" Link="Common\ProcessInfoJsonContext.cs" />
53-
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\ReportRespJsonContext.cs" Link="Common\ReportRespJsonContext.cs" />
54-
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\VersionOSSJsonContext.cs" Link="Common\VersionOSSJsonContext.cs" />
55-
<Compile Include="..\GeneralUpdate.Common\Internal\JsonContext\VersionRespJsonContext.cs" Link="Common\VersionRespJsonContext.cs" />
56-
<Compile Include="..\GeneralUpdate.Common\Internal\Pipeline\IMiddleware.cs" Link="Common\IMiddleware.cs" />
57-
<Compile Include="..\GeneralUpdate.Common\Internal\Pipeline\PipelineBuilder.cs" Link="Common\PipelineBuilder.cs" />
58-
<Compile Include="..\GeneralUpdate.Common\Internal\Pipeline\PipelineContext.cs" Link="Common\PipelineContext.cs" />
59-
<Compile Include="..\GeneralUpdate.Common\Internal\Strategy\AbstractStrategy.cs" Link="Common\AbstractStrategy.cs" />
60-
<Compile Include="..\GeneralUpdate.Common\Internal\Strategy\IStrategy.cs" Link="Common\IStrategy.cs" />
61-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Configinfo.cs" Link="Common\Configinfo.cs" />
62-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\BaseConfigInfo.cs" Link="Common\BaseConfigInfo.cs" />
63-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\ConfigurationMapper.cs" Link="Common\ConfigurationMapper.cs" />
64-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\DTO\BaseResponseDTO.cs" Link="Common\BaseResponseDTO.cs" />
65-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\DTO\VersionRespDTO.cs" Link="Common\VersionRespDTO.cs" />
66-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Enum\AppType.cs" Link="Common\AppType.cs" />
67-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Enum\Format.cs" Link="Common\Format.cs" />
68-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Enum\PlatformType.cs" Link="Common\PlatformType.cs" />
69-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Enum\ReportType.cs" Link="Common\ReportType.cs" />
70-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Enum\UpdateMode.cs" Link="Common\UpdateMode.cs" />
71-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\GlobalConfigInfo.cs" Link="Common\GlobalConfigInfo.cs" />
72-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\GlobalConfigInfoOSS.cs" Link="Common\GlobalConfigInfoOSS.cs" />
73-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\ObjectTranslator.cs" Link="Common\ObjectTranslator.cs" />
74-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\Packet.cs" Link="Common\Packet.cs" />
75-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\ProcessInfo.cs" Link="Common\ProcessInfo.cs" />
76-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\VersionInfo.cs" Link="Common\VersionInfo.cs" />
77-
<Compile Include="..\GeneralUpdate.Common\Shared\Object\VersionOSS.cs" Link="Common\VersionOSS.cs" />
78-
<Compile Include="..\GeneralUpdate.Common\Shared\Service\VersionService.cs" Link="Common\VersionService.cs" />
79-
<Compile Include="..\GeneralUpdate.Common\Shared\Trace\GeneralTracer.cs" Link="Common\GeneralTracer.cs" />
80-
<Compile Include="..\GeneralUpdate.Common\Shared\Trace\TextTraceListener.cs" Link="Common\TextTraceListener.cs" />
81-
<Compile Include="..\GeneralUpdate.Common\Shared\Trace\WindowsOutputDebugListener.cs" Link="Common\WindowsOutputDebugListener.cs" />
26+
<PackageReference Include="System.Collections.Immutable" Version="10.0.1" />
27+
<PackageReference Include="System.Text.Json" Version="10.0.1" />
8228
</ItemGroup>
29+
8330
<ItemGroup>
8431
<Content Include="Applications\**\*">
8532
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8633
<PackageCopyToOutput>true</PackageCopyToOutput>
8734
</Content>
8835
</ItemGroup>
89-
<ItemGroup>
90-
<Folder Include="Common\" />
91-
</ItemGroup>
36+
9237
<ItemGroup>
9338
<InternalsVisibleTo Include="BowlTest" />
9439
</ItemGroup>
40+
9541
<ItemGroup>
9642
<None Include="../../../imgs/bowl.jpeg">
9743
<Pack>True</Pack>

src/c#/GeneralUpdate.Bowl/Internal/CrashReporter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
using System.IO;
44
using System.Threading;
55
using System.Threading.Tasks;
6-
using GeneralUpdate.Common.FileBasic;
7-
using GeneralUpdate.Common.Shared;
6+
using GeneralUpdate.Core.FileSystem;
7+
using GeneralUpdate.Core;
88

99
namespace GeneralUpdate.Bowl.Internal;
1010

src/c#/GeneralUpdate.Bowl/Internal/EnvironmentProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Threading;
22
using System.Threading.Tasks;
3-
using GeneralUpdate.Common.Internal.Bootstrap;
3+
using GeneralUpdate.Core.Configuration;
44

55
namespace GeneralUpdate.Bowl.Internal;
66

src/c#/GeneralUpdate.Bowl/Internal/WindowsSystemInfoProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.IO;
44
using System.Threading;
55
using System.Threading.Tasks;
6-
using GeneralUpdate.Common.Shared;
6+
using GeneralUpdate.Core;
77

88
namespace GeneralUpdate.Bowl.Internal;
99

src/c#/GeneralUpdate.Bowl/Strategies/LinuxBowlStrategy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Threading;
66
using System.Threading.Tasks;
77
using GeneralUpdate.Bowl.Internal;
8-
using GeneralUpdate.Common.Shared;
8+
using GeneralUpdate.Core;
99

1010
namespace GeneralUpdate.Bowl.Strategies;
1111

src/c#/GeneralUpdate.Bowl/Strategies/MacBowlStrategy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.IO;
44
using System.Threading;
55
using System.Threading.Tasks;
6-
using GeneralUpdate.Common.Shared;
6+
using GeneralUpdate.Core;
77

88
namespace GeneralUpdate.Bowl.Strategies;
99

src/c#/GeneralUpdate.Bowl/Strategies/ProcessRunner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Diagnostics;
44
using System.Threading;
55
using System.Threading.Tasks;
6-
using GeneralUpdate.Common.Shared;
6+
using GeneralUpdate.Core;
77

88
namespace GeneralUpdate.Bowl.Strategies;
99

src/c#/GeneralUpdate.Bowl/Strategies/WindowsBowlStrategy.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using System.Runtime.InteropServices;
55
using System.Threading;
66
using System.Threading.Tasks;
7-
using GeneralUpdate.Common.FileBasic;
8-
using GeneralUpdate.Common.Shared;
7+
using GeneralUpdate.Core.FileSystem;
8+
using GeneralUpdate.Core;
99

1010
namespace GeneralUpdate.Bowl.Strategies;
1111

src/c#/GeneralUpdate.Bowl/Strategys/AbstractStrategy.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using System.Collections.Generic;
1+
using System.Collections.Generic;
22
using System.Diagnostics;
33
using System.IO;
4-
using GeneralUpdate.Common.FileBasic;
5-
using GeneralUpdate.Common.Shared;
4+
using GeneralUpdate.Core.FileSystem;
5+
using GeneralUpdate.Core;
66

77
namespace GeneralUpdate.Bowl.Strategys;
88

0 commit comments

Comments
 (0)