AOT适配

Author: JusterZhu

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

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text.Json;
+using GeneralUpdate.Bowl.Internal;
 using GeneralUpdate.Bowl.Strategys;
 using GeneralUpdate.Common.AOT.JsonContext;
 using GeneralUpdate.Common.Shared.Object;

…c#/GeneralUpdate.Bowl/Strategys/Crash.cs …/c#/GeneralUpdate.Bowl/Internal/Crash.cssrc/c#/GeneralUpdate.Bowl/Strategys/Crash.cs renamed to src/c#/GeneralUpdate.Bowl/Internal/Crash.cs src/c#/GeneralUpdate.Bowl/Strategys/Crash.cs renamed to src/c#/GeneralUpdate.Bowl/Internal/Crash.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
+using GeneralUpdate.Bowl.Strategys;
 
-namespace GeneralUpdate.Bowl.Strategys;
+namespace GeneralUpdate.Bowl.Internal;
 
-public class Crash
+internal class Crash
 {
     public MonitorParameter Parameter { get; set; }
 

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

@@ -0,0 +1,6 @@
+using System.Text.Json.Serialization;
+
+namespace GeneralUpdate.Bowl.Internal;
+
+[JsonSerializable(typeof(Crash))]
+internal partial class CrashJsonContext : JsonSerializerContext;

…eralUpdate.Bowl/Strategys/LinuxSystem.cs …neralUpdate.Bowl/Internal/LinuxSystem.cssrc/c#/GeneralUpdate.Bowl/Strategys/LinuxSystem.cs renamed to src/c#/GeneralUpdate.Bowl/Internal/LinuxSystem.cs src/c#/GeneralUpdate.Bowl/Strategys/LinuxSystem.cs renamed to src/c#/GeneralUpdate.Bowl/Internal/LinuxSystem.cs

@@ -1,4 +1,4 @@
-namespace GeneralUpdate.Bowl.Strategys;
+namespace GeneralUpdate.Bowl.Internal;
 
 internal class LinuxSystem
 {

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

@@ -1,12 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using GeneralUpdate.Common.FileBasic;
 
 namespace GeneralUpdate.Bowl.Strategys;
 
-public abstract class AbstractStrategy : IStrategy
+internal abstract class AbstractStrategy : IStrategy
 {
     protected MonitorParameter _parameter;
     protected List<string> OutputList = new ();

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

@@ -1,6 +1,8 @@
-namespace GeneralUpdate.Bowl.Strategys;
+using GeneralUpdate.Bowl.Internal;
 
-public interface IStrategy
+namespace GeneralUpdate.Bowl.Strategys;
+
+internal interface IStrategy
 {
     void Launch();
 

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

@@ -3,10 +3,11 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using GeneralUpdate.Bowl.Internal;
 
 namespace GeneralUpdate.Bowl.Strategys;
 
-public class LinuxStrategy : AbstractStrategy
+internal class LinuxStrategy : AbstractStrategy
 {
     /*procdump-3.3.0-0.cm2.x86_64.rpm:
       Compatible Systems: This RPM package may be suitable for certain CentOS or RHEL-based derivatives, specifically the CM2 version. CM2 typically refers to ClearOS 7.x or similar community-maintained versions.

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

@@ -3,11 +3,12 @@
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
+using GeneralUpdate.Bowl.Internal;
 using GeneralUpdate.Common.FileBasic;
 
 namespace GeneralUpdate.Bowl.Strategys;
 
-public class WindowStrategy : AbstractStrategy
+internal class WindowStrategy : AbstractStrategy
 {
     private const string WorkModel = "Upgrade";
     private string? _applicationsDirectory;
@@ -62,7 +63,7 @@ private void CreateCrash()
             ProcdumpOutPutLines = OutputList
         };
         var failJsonPath = Path.Combine(_parameter.FailDirectory, _parameter.FailFileName);
-        GeneralFileManager.CreateJson(failJsonPath, crash);
+        GeneralFileManager.CreateJson(failJsonPath, crash, CrashJsonContext.Default.Crash);
     }
 
     /// <summary>

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

@@ -48,7 +48,7 @@ await Task.Run(() =>
                 if (!File.Exists(appPath)) 
                     throw new Exception($"The application does not exist {upgradeAppName} !");
 
-                var json = JsonSerializer.Serialize(configGlobalConfigInfo);
+                var json = JsonSerializer.Serialize(configGlobalConfigInfo, GlobalConfigInfoOSSJsonContext.Default.GlobalConfigInfoOSS);
                 Environment.SetEnvironmentVariable("GlobalConfigInfoOSS", json, EnvironmentVariableTarget.User);
                 Process.Start(appPath);
             }

src/c#/GeneralUpdate.Common/FileBasic/GeneralFileManager.cs

@@ -50,16 +50,15 @@ public ComparisonResult Compare(string leftDir, string rightDir)
             return ComparisonResult;
         }
 
-        public static void CreateJson<T>(string targetPath, T obj) where T : class
+        public static void CreateJson<T>(string targetPath, T obj, JsonTypeInfo<T>? typeInfo = null) where T : class
         {
             var folderPath = Path.GetDirectoryName(targetPath) ??
                              throw new ArgumentException("invalid path", nameof(targetPath));
+            
             if (!Directory.Exists(folderPath))
-            {
                 Directory.CreateDirectory(folderPath);
-            }
-
-            var jsonString = JsonSerializer.Serialize(obj);
+            
+            var jsonString = typeInfo!= null ? JsonSerializer.Serialize(obj, typeInfo) : JsonSerializer.Serialize(obj);
             File.WriteAllText(targetPath, jsonString);
         }