AOT适配

Author: JusterZhu

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

@@ -5,9 +5,9 @@
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <ApplicationManifest></ApplicationManifest>
-    <!--<PublishAot>true</PublishAot>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>-->
+    <PublishAot>true</PublishAot>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -41,6 +41,7 @@ public class GeneralClientBootstrap : AbstractBootstrap<GeneralClientBootstrap,
     /// <returns></returns>
     public override async Task<GeneralClientBootstrap> LaunchAsync()
     {
+        CallSmallBowlHome(_configinfo.Bowl);
         ExecuteCustomOptions();
         ClearEnvironmentVariable();
         await ExecuteWorkflowAsync();
@@ -143,16 +144,14 @@ private async Task ExecuteWorkflowAsync()
             , AppType.ClientApp
             ,_configinfo.AppSecretKey
             ,_configinfo.Platform
-            ,_configinfo.ProductId
-            , VersionRespJsonContext.Default.VersionRespDTO);
+            ,_configinfo.ProductId);
 
         var upgradeResp = await VersionService.Validate(_configinfo.UpdateUrl
             , _configinfo.UpgradeClientVersion
             , AppType.UpgradeApp
             ,_configinfo.AppSecretKey
             ,_configinfo.Platform
-            ,_configinfo.ProductId
-            , VersionRespJsonContext.Default.VersionRespDTO);
+            ,_configinfo.ProductId);
 
         _configinfo.IsUpgradeUpdate = CheckUpgrade(upgradeResp);
         _configinfo.IsMainUpdate = CheckUpgrade(mainResp);
@@ -331,7 +330,6 @@ private void CallSmallBowlHome(string processName)
     /// <returns></returns>
     private void ExecuteCustomOptions()
     {
-        CallSmallBowlHome(_configinfo.Bowl);
         if (!_customOptions.Any()) return;
 
         foreach (var option in _customOptions)

src/c#/GeneralUpdate.Common/AOT/JsonContext/HttpParameterJsonContext.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace GeneralUpdate.Common.AOT.JsonContext;
+
+[JsonSerializable(typeof(bool))]
+[JsonSerializable(typeof(bool?))]
+[JsonSerializable(typeof(int))]
+[JsonSerializable(typeof(int?))]
+[JsonSerializable(typeof(string))]
+[JsonSerializable(typeof(Dictionary<string, object>))]
+public partial class HttpParameterJsonContext: JsonSerializerContext;

src/c#/GeneralUpdate.Common/AOT/JsonContext/ReportRespJsonContext.cs

@@ -0,0 +1,7 @@
+using System.Text.Json.Serialization;
+using GeneralUpdate.Common.Shared.Object;
+
+namespace GeneralUpdate.Common.AOT.JsonContext;
+
+[JsonSerializable(typeof(BaseResponseDTO<bool>))]
+public partial class ReportRespJsonContext : JsonSerializerContext;

src/c#/GeneralUpdate.Common/Shared/Service/VersionService.cs

@@ -9,6 +9,7 @@
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
 using System.Threading.Tasks;
+using GeneralUpdate.Common.AOT.JsonContext;
 using GeneralUpdate.Common.Shared.Object;
 
 namespace GeneralUpdate.Common.Shared.Service
@@ -36,7 +37,7 @@ public static async Task Report(string httpUrl
                 { "Status", status },
                 { "Type", type }
             };
-            await PostTaskAsync<BaseResponseDTO<bool>>(httpUrl, parameters);
+            await PostTaskAsync<BaseResponseDTO<bool>>(httpUrl, parameters, ReportRespJsonContext.Default.BaseResponseDTOBoolean);
         }
 
         /// <summary>
@@ -54,8 +55,7 @@ public static async Task<VersionRespDTO> Validate(string httpUrl
             , int appType
             , string appKey
             , int platform
-            , string productId
-            , JsonTypeInfo<VersionRespDTO>? typeInfo = null)
+            , string productId)
         {
             var parameters = new Dictionary<string, object>
             {
@@ -65,7 +65,7 @@ public static async Task<VersionRespDTO> Validate(string httpUrl
                 { "Platform", platform },
                 { "ProductId", productId }
             };
-            return await PostTaskAsync<VersionRespDTO>(httpUrl, parameters, typeInfo);
+            return await PostTaskAsync<VersionRespDTO>(httpUrl, parameters, VersionRespJsonContext.Default.VersionRespDTO);
         }
 
         private static async Task<T> PostTaskAsync<T>(string httpUrl, Dictionary<string, object> parameters, JsonTypeInfo<T>? typeInfo = null)
@@ -77,7 +77,7 @@ private static async Task<T> PostTaskAsync<T>(string httpUrl, Dictionary<string,
             });
             httpClient.Timeout = TimeSpan.FromSeconds(15);
             httpClient.DefaultRequestHeaders.Accept.ParseAdd("text/html, application/xhtml+xml, */*");
-            string parametersJson = JsonSerializer.Serialize(parameters);
+            var parametersJson = JsonSerializer.Serialize(parameters, HttpParameterJsonContext.Default.DictionaryStringObject);
             var stringContent = new StringContent(parametersJson, Encoding.UTF8, "application/json");
             var result = await httpClient.PostAsync(uri, stringContent);
             var reseponseJson = await result.Content.ReadAsStringAsync();

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

@@ -5,8 +5,8 @@
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <!--<PublishAot>true</PublishAot>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>-->
+    <PublishAot>true</PublishAot>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
 
   <ItemGroup>