Upgrade to .NET 9 and improve patch handling

Updated project files to target .NET 9 and enabled AOT publishing. Improved patch logic by adding PatchEnabled context and handling null checks in upgrade validation. Added Microsoft.Bcl.AsyncInterfaces package and refined decompression path selection based on patch status.

Author: JusterZhu

src/c#/GeneralUpdate.Client/GeneralUpdate.Client.csproj

@@ -2,10 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>default</LangVersion>
+    <PublishAot>true</PublishAot>
   </PropertyGroup>
 
   <ItemGroup>

src/c#/GeneralUpdate.Client/Program.cs

@@ -16,12 +16,6 @@ static async Task Main(string[] args)
         {
             try
             {
-                /*GeneralTracer.Info("Starting client");
-                GeneralTracer.Error("test error");
-                GeneralTracer.Debug("test debug");
-                GeneralTracer.SetTracingEnabled(false);
-                GeneralTracer.Dispose();*/
-                
                 Console.WriteLine($"主程序初始化，{DateTime.Now}！");
                 Console.WriteLine("当前运行目录：" + Thread.GetDomain().BaseDirectory);
                 await Task.Delay(2000);

src/c#/GeneralUpdate.ClientCore/GeneralClientBootstrap.cs

@@ -306,12 +306,15 @@ private bool CheckFail(string version)
     /// <returns></returns>
     private bool CheckUpgrade(VersionRespDTO? response)
     {
-        if (response == null)
+        if (response is null)
             return false;
 
+        if (response.Body is null)
+            return false;
+        
         if (response.Code == 200)
             return response.Body.Count > 0;
-
+        
         return false;
     }
 

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

@@ -87,6 +87,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
         <PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
         <PackageReference Include="System.Net.Http" Version="4.3.4" />
         <PackageReference Include="System.Net.Requests" Version="4.3.0" />

src/c#/GeneralUpdate.ClientCore/Pipeline/CompressMiddleware.cs

@@ -20,7 +20,10 @@ public Task InvokeAsync(PipelineContext? context)
             var sourcePath = context.Get<string>("ZipFilePath");
             var patchPath = context.Get<string>("PatchPath");
             var encoding = context.Get<Encoding>("Encoding");
-            CompressProvider.Decompress(format,sourcePath,patchPath, encoding);
+            var appPath = context.Get<string>("SourcePath");
+            var patchEnabled = context.Get<bool?>("PatchEnabled");
+            
+            CompressProvider.Decompress(format, sourcePath,patchEnabled == false ? appPath : patchPath, encoding);
         });
     }
 }

src/c#/GeneralUpdate.ClientCore/Strategys/WindowsStrategy.cs

@@ -48,6 +48,7 @@ public override async Task ExecuteAsync()
                     //patch middleware
                     context.Add("SourcePath", _configinfo.InstallPath);
                     context.Add("PatchPath", patchPath);
+                    context.Add("PatchEnabled", _configinfo.PatchEnabled);
 
                     var pipelineBuilder = new PipelineBuilder(context)
                         .UseMiddlewareIf<PatchMiddleware>(_configinfo.PatchEnabled)

src/c#/GeneralUpdate.Upgrad/GeneralUpdate.Upgrad.csproj

@@ -2,11 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PublishAot>true</PublishAot>
     <LangVersion>default</LangVersion>
+    <PublishAot>true</PublishAot>
   </PropertyGroup>
 
   <ItemGroup>