消除aot警告

xljiulang · xljiulang · commit 22bba9247c99 · 2024-06-15T17:52:59.000+08:00
diff --git a/AppAot/AppHostedService.cs b/AppAot/AppHostedService.cs
@@ -7,24 +7,23 @@
 namespace AppAot
 {
     class AppHostedService : BackgroundService
-    { 
+    {
         private readonly IServiceScopeFactory serviceScopeFactory;
         private readonly ILogger<AppHostedService> logger;
 
-        public AppHostedService( 
+        public AppHostedService(
             IServiceScopeFactory serviceScopeFactory,
             ILogger<AppHostedService> logger)
-        { 
+        {
             this.serviceScopeFactory = serviceScopeFactory;
             this.logger = logger;
         }
 
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-        { 
+        {
             using var scope = this.serviceScopeFactory.CreateScope();
             var api = scope.ServiceProvider.GetRequiredService<ICloudflareApi>();
             var appData = await api.GetAppDataAsync();
-            appData = await api.GetAppData2Async();
             this.logger.LogInformation($"WebpackCompilationHash: {appData.WebpackCompilationHash}");
         }
     }
diff --git a/AppAot/ICloudflareApi.cs b/AppAot/ICloudflareApi.cs
@@ -9,9 +9,6 @@ namespace AppAot
     public interface ICloudflareApi
     {
         [HttpGet("/page-data/app-data.json")]
-        Task<AppData> GetAppDataAsync();
-
-        [HttpGet("/page-data/app-data.json")]
-        ITask<AppData> GetAppData2Async();
+        Task<AppData> GetAppDataAsync(); 
     }
 }
diff --git a/WebApiClientCore.Abstractions/CodeAnalysis/RequiresDynamicCodeAttribute.cs b/WebApiClientCore.Abstractions/CodeAnalysis/RequiresDynamicCodeAttribute.cs
@@ -0,0 +1,25 @@
+﻿#if NETSTANDARD2_1 || NET5_0
+namespace System.Diagnostics.CodeAnalysis
+{
+    /// <summary>
+    /// Specifies that the attributed class, constructor, or method requires dynamic code.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Method, Inherited = false)]
+    sealed class RequiresDynamicCodeAttribute : Attribute
+    {
+        /// <summary>
+        /// Gets the message associated with the requirement for dynamic code.
+        /// </summary>
+        public string Message { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequiresDynamicCodeAttribute"/> class with the specified message.
+        /// </summary>
+        /// <param name="message">The message associated with the requirement for dynamic code.</param>
+        public RequiresDynamicCodeAttribute(string message)
+        {
+            this.Message = message;
+        }
+    }
+}
+#endif
diff --git a/WebApiClientCore.Abstractions/CodeAnalysis/RequiresUnreferencedCodeAttribute.cs b/WebApiClientCore.Abstractions/CodeAnalysis/RequiresUnreferencedCodeAttribute.cs
@@ -0,0 +1,22 @@
+﻿#if NETSTANDARD2_1
+namespace System.Diagnostics.CodeAnalysis
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Method, Inherited = false)]
+    sealed class RequiresUnreferencedCodeAttribute : Attribute
+    {
+        /// <summary>
+        /// 获取或设置对于未引用代码的要求的消息。
+        /// </summary>
+        public string Message { get; }
+
+        /// <summary>
+        /// 初始化 <see cref="RequiresUnreferencedCodeAttribute"/> 类的新实例。
+        /// </summary>
+        /// <param name="message">对于未引用代码的要求的消息。</param>
+        public RequiresUnreferencedCodeAttribute(string message)
+        {
+            this.Message = message;
+        }
+    }
+}
+#endif
diff --git a/WebApiClientCore.Abstractions/HttpApiOptions.cs b/WebApiClientCore.Abstractions/HttpApiOptions.cs
@@ -1,5 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Xml;
@@ -96,10 +98,14 @@ private static JsonSerializerOptions CreateJsonSerializeOptions()
         /// 创建反序列化JsonSerializerOptions
         /// </summary>
         /// <returns></returns>
+        [UnconditionalSuppressMessage("Trimming", "IL3050", Justification = "JsonCompatibleConverter.EnumReader使用前已经判断RuntimeFeature.IsDynamicCodeSupported")]
         private static JsonSerializerOptions CreateJsonDeserializeOptions()
         {
             var options = CreateJsonSerializeOptions();
-            options.Converters.Add(JsonCompatibleConverter.EnumReader);
+            if (RuntimeFeature.IsDynamicCodeSupported)
+            {
+                options.Converters.Add(JsonCompatibleConverter.EnumReader);
+            }
             options.Converters.Add(JsonCompatibleConverter.DateTimeReader);
             return options;
         }
diff --git a/WebApiClientCore.Abstractions/Serialization/JsonConverters/JsonCompatibleConverter.cs b/WebApiClientCore.Abstractions/Serialization/JsonConverters/JsonCompatibleConverter.cs
@@ -1,4 +1,5 @@
-﻿using System.Text.Json.Serialization;
+﻿using System.Diagnostics.CodeAnalysis;
+using System.Text.Json.Serialization;
 
 namespace WebApiClientCore.Serialization.JsonConverters
 {
@@ -7,10 +8,20 @@ namespace WebApiClientCore.Serialization.JsonConverters
     /// </summary>
     public static class JsonCompatibleConverter
     {
+        private static JsonStringEnumConverter? stringEnumConverter;
+
         /// <summary>
         /// 获取Enum类型反序列化兼容的转换器
         /// </summary>
-        public static JsonConverter EnumReader { get; } = new JsonStringEnumConverter();
+        public static JsonConverter EnumReader
+        {
+            [RequiresDynamicCode("JsonStringEnumConverter需要动态代码")]
+            get
+            {
+                stringEnumConverter ??= new JsonStringEnumConverter();
+                return stringEnumConverter;
+            }
+        }
 
         /// <summary>
         /// 获取DateTime类型反序列化兼容的转换器
diff --git a/WebApiClientCore.Extensions.OAuths/CodeAnalysis/RequiresDynamicCodeAttribute.cs b/WebApiClientCore.Extensions.OAuths/CodeAnalysis/RequiresDynamicCodeAttribute.cs
@@ -0,0 +1,25 @@
+﻿#if NETSTANDARD2_1 || NET5_0
+namespace System.Diagnostics.CodeAnalysis
+{
+    /// <summary>
+    /// Specifies that the attributed class, constructor, or method requires dynamic code.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Method, Inherited = false)]
+    sealed class RequiresDynamicCodeAttribute : Attribute
+    {
+        /// <summary>
+        /// Gets the message associated with the requirement for dynamic code.
+        /// </summary>
+        public string Message { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequiresDynamicCodeAttribute"/> class with the specified message.
+        /// </summary>
+        /// <param name="message">The message associated with the requirement for dynamic code.</param>
+        public RequiresDynamicCodeAttribute(string message)
+        {
+            this.Message = message;
+        }
+    }
+}
+#endif
diff --git a/WebApiClientCore.Extensions.OAuths/CodeAnalysis/RequiresUnreferencedCodeAttribute.cs b/WebApiClientCore.Extensions.OAuths/CodeAnalysis/RequiresUnreferencedCodeAttribute.cs
@@ -0,0 +1,22 @@
+﻿#if NETSTANDARD2_1
+namespace System.Diagnostics.CodeAnalysis
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Method, Inherited = false)]
+    sealed class RequiresUnreferencedCodeAttribute : Attribute
+    {
+        /// <summary>
+        /// 获取或设置对于未引用代码的要求的消息。
+        /// </summary>
+        public string Message { get; }
+
+        /// <summary>
+        /// 初始化 <see cref="RequiresUnreferencedCodeAttribute"/> 类的新实例。
+        /// </summary>
+        /// <param name="message">对于未引用代码的要求的消息。</param>
+        public RequiresUnreferencedCodeAttribute(string message)
+        {
+            this.Message = message;
+        }
+    }
+}
+#endif
diff --git a/WebApiClientCore.OpenApi.SourceGenerator/HttpApiSettings.cs b/WebApiClientCore.OpenApi.SourceGenerator/HttpApiSettings.cs
@@ -29,7 +29,7 @@ public HttpApiSettings()
             this.ResponseArrayType = "List";
             this.ResponseDictionaryType = "Dictionary";
             this.ParameterArrayType = "IEnumerable";
-            this.ParameterDictionaryType = "IDictionary"; 
+            this.ParameterDictionaryType = "IDictionary";
 
             this.OperationNameGenerator = new OperationNameProvider();
             this.ParameterNameGenerator = new ParameterNameProvider();
@@ -157,8 +157,8 @@ private static string PrettyName(string name)
                     name = name.Replace("[]", "Array");
                 }
 
-                var matchs = Regex.Matches(name, @"\W");
-                if (matchs.Count == 0 || matchs.Count % 2 > 0)
+                var matches = Regex.Matches(name, @"\W");
+                if (matches.Count == 0 || matches.Count % 2 > 0)
                 {
                     return name;
                 }
@@ -167,7 +167,7 @@ private static string PrettyName(string name)
                 return Regex.Replace(name, @"\W", m =>
                 {
                     index++;
-                    return index < matchs.Count / 2 ? "Of" : null;
+                    return index < matches.Count / 2 ? "Of" : string.Empty;
                 });
             }
         }
diff --git a/WebApiClientCore/Implementations/DefaultHttpApiActivator.cs b/WebApiClientCore/Implementations/DefaultHttpApiActivator.cs
@@ -1,5 +1,7 @@
 ﻿using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+using WebApiClientCore.Exceptions;
 
 namespace WebApiClientCore.Implementations
 {
@@ -21,12 +23,21 @@ public class DefaultHttpApiActivator<[DynamicallyAccessedMembers(DynamicallyAcce
         /// <param name="actionInvokerProvider"></param>
         /// <exception cref="ArgumentException"></exception>
         /// <exception cref="NotSupportedException"></exception>
-        [UnconditionalSuppressMessage("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.", Justification = "<Pending>")]
+        [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "ILEmitHttpApiActivator使用之前已经使用RuntimeFeature.IsDynamicCodeCompiled来判断")]
         public DefaultHttpApiActivator(IApiActionDescriptorProvider apiActionDescriptorProvider, IApiActionInvokerProvider actionInvokerProvider)
         {
-            this.httpApiActivator = SourceGeneratorHttpApiActivator<THttpApi>.IsSupported
-                ? new SourceGeneratorHttpApiActivator<THttpApi>(apiActionDescriptorProvider, actionInvokerProvider)
-                : new ILEmitHttpApiActivator<THttpApi>(apiActionDescriptorProvider, actionInvokerProvider);
+            if (SourceGeneratorHttpApiActivator<THttpApi>.IsSupported)
+            {
+                this.httpApiActivator = new SourceGeneratorHttpApiActivator<THttpApi>(apiActionDescriptorProvider, actionInvokerProvider);
+            }
+            else if (RuntimeFeature.IsDynamicCodeCompiled)
+            {
+                this.httpApiActivator = new ILEmitHttpApiActivator<THttpApi>(apiActionDescriptorProvider, actionInvokerProvider);
+            }
+            else
+            {
+                throw new ProxyTypeCreateException(typeof(HttpApi));
+            }
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,6 @@ namespace AppAot`
`9`	`9`	`public interface ICloudflareApi`
`10`	`10`	`{`
`11`	`11`	`[HttpGet("/page-data/app-data.json")]`
`12`		`- Task<AppData> GetAppDataAsync();`
`13`		`-`
`14`		`- [HttpGet("/page-data/app-data.json")]`
`15`		`- ITask<AppData> GetAppData2Async();`
	`12`	`+ Task<AppData> GetAppDataAsync();`
`16`	`13`	`}`
`17`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public HttpApiSettings()`
`29`	`29`	`this.ResponseArrayType = "List";`
`30`	`30`	`this.ResponseDictionaryType = "Dictionary";`
`31`	`31`	`this.ParameterArrayType = "IEnumerable";`
`32`		`- this.ParameterDictionaryType = "IDictionary";`
	`32`	`+ this.ParameterDictionaryType = "IDictionary";`
`33`	`33`
`34`	`34`	`this.OperationNameGenerator = new OperationNameProvider();`
`35`	`35`	`this.ParameterNameGenerator = new ParameterNameProvider();`
`@@ -157,8 +157,8 @@ private static string PrettyName(string name)`
`157`	`157`	`name = name.Replace("[]", "Array");`
`158`	`158`	`}`
`159`	`159`
`160`		`- var matchs = Regex.Matches(name, @"\W");`
`161`		`- if (matchs.Count == 0 \|\| matchs.Count % 2 > 0)`
	`160`	`+ var matches = Regex.Matches(name, @"\W");`
	`161`	`+ if (matches.Count == 0 \|\| matches.Count % 2 > 0)`
`162`	`162`	`{`
`163`	`163`	`return name;`
`164`	`164`	`}`
`@@ -167,7 +167,7 @@ private static string PrettyName(string name)`
`167`	`167`	`return Regex.Replace(name, @"\W", m =>`
`168`	`168`	`{`
`169`	`169`	`index++;`
`170`		`- return index < matchs.Count / 2 ? "Of" : null;`
	`170`	`+ return index < matches.Count / 2 ? "Of" : string.Empty;`
`171`	`171`	`});`
`172`	`172`	`}`
`173`	`173`	`}`