增加Aot兼容性适配

Author: xljiulang

WebApiClientCore.Abstractions/ApiActionDescriptor.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
 namespace WebApiClientCore
@@ -14,6 +15,9 @@ public abstract class ApiActionDescriptor
         /// 获取所在接口类型
         /// 这个值不一定是声明方法的接口类型
         /// </summary>
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+#endif
         public abstract Type InterfaceType { get; protected set; }
 
         /// <summary>

WebApiClientCore.Abstractions/IApiActionDescriptorProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
 namespace WebApiClientCore
@@ -13,6 +14,10 @@ public interface IApiActionDescriptorProvider
         /// </summary>
         /// <param name="method">接口的方法</param>
         /// <param name="interfaceType">接口类型</param> 
-        ApiActionDescriptor CreateActionDescriptor(MethodInfo method, Type interfaceType);
+        ApiActionDescriptor CreateActionDescriptor(MethodInfo method,
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+#endif
+        Type interfaceType);
     }
 }

WebApiClientCore.Abstractions/IHttpApiActivator.cs

@@ -1,12 +1,14 @@
-namespace WebApiClientCore
+using System.Diagnostics.CodeAnalysis;
+
+namespace WebApiClientCore
 {
     /// <summary>
     /// 定义THttpApi的实例创建器的接口
     /// </summary>
     /// <typeparam name="THttpApi"></typeparam>
     public interface IHttpApiActivator<
 #if NET5_0_OR_GREATER
-        [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 #endif
     THttpApi>
     {

WebApiClientCore.Abstractions/Serialization/KeyValueSerializerOptions.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -40,8 +41,13 @@ public JsonNamingPolicy? DictionaryKeyPolicy
         /// </summary>
         public bool IgnoreNullValues
         {
+#if NET5_0_OR_GREATER
+            get => jsonOptions.DefaultIgnoreCondition == JsonIgnoreCondition.WhenWritingNull;
+            set => jsonOptions.DefaultIgnoreCondition = value ? JsonIgnoreCondition.WhenWritingNull : JsonIgnoreCondition.Never;
+#else
             get => jsonOptions.IgnoreNullValues;
             set => jsonOptions.IgnoreNullValues = value;
+#endif
         }
 
         /// <summary>
@@ -90,6 +96,10 @@ public KeyValueSerializerOptions()
         /// </summary>
         /// <param name="typeToConvert">目标类型</param>
         /// <returns></returns>
+#if NET8_0_OR_GREATER
+        [RequiresDynamicCode("Getting a converter for a type may require reflection which depends on runtime code generation.")]
+        [RequiresUnreferencedCode("Getting a converter for a type may require reflection which depends on unreferenced code.")]
+#endif
         public JsonConverter GetConverter(Type typeToConvert)
         {
             return this.jsonOptions.GetConverter(typeToConvert);

WebApiClientCore.Abstractions/WebApiClientCore.Abstractions.csproj

@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<Nullable>enable</Nullable>
+		<Nullable>enable</Nullable> 
 		<TargetFrameworks>netstandard2.1;net5.0;net8.0</TargetFrameworks>
+		<IsAotCompatible Condition="'$(TargetFramework)' == 'net8.0'">true</IsAotCompatible>
 
 		<RootNamespace>WebApiClientCore</RootNamespace>
 		<AssemblyName>WebApiClientCore.Abstractions</AssemblyName>

WebApiClientCore.Extensions.OAuths/DependencyInjection/TokenHandlerExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using WebApiClientCore.Extensions.OAuths;
 using WebApiClientCore.Extensions.OAuths.HttpMessageHandlers;
 
@@ -38,6 +39,9 @@ public static IHttpClientBuilder AddOAuthTokenHandler(this IHttpClientBuilder bu
         /// <param name="handlerFactory">hanlder的创建委托</param>
         /// <param name="tokenProviderSearchMode">token提供者的查找模式</param> 
         /// <returns></returns>
+#if NET5_0_OR_GREATER
+        [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2072", Justification = "类型httpApiType明确是不会被裁剪的")]
+#endif
         public static IHttpClientBuilder AddOAuthTokenHandler<TOAuthTokenHandler>(this IHttpClientBuilder builder, Func<IServiceProvider, ITokenProvider, TOAuthTokenHandler> handlerFactory, TypeMatchMode tokenProviderSearchMode = TypeMatchMode.TypeOrBaseTypes)
             where TOAuthTokenHandler : OAuthTokenHandler
         {

WebApiClientCore.Extensions.OAuths/DependencyInjection/TokenProviderExtensions.GrantTypeClient.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Options;
 using System;
+using System.Diagnostics.CodeAnalysis;
 using WebApiClientCore.Extensions.OAuths.TokenProviders;
 
 namespace Microsoft.Extensions.DependencyInjection
@@ -16,7 +17,11 @@ public static partial class TokenProviderExtensions
         /// <param name="services"></param>
         /// <param name="alias">TokenProvider的别名</param>
         /// <returns></returns>     
-        public static OptionsBuilder<ClientCredentialsOptions> AddClientCredentialsTokenProvider<THttpApi>(this IServiceCollection services, string alias = "")
+        public static OptionsBuilder<ClientCredentialsOptions> AddClientCredentialsTokenProvider<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+#endif
+        THttpApi>(this IServiceCollection services, string alias = "")
         { 
             var builder = services.AddTokenProvider<THttpApi, ClientCredentialsTokenProvider>(alias);
             return new OptionsBuilder<ClientCredentialsOptions>(builder.Services, builder.Name);
@@ -29,7 +34,11 @@ public static OptionsBuilder<ClientCredentialsOptions> AddClientCredentialsToken
         /// <param name="services"></param>
         /// <param name="configureOptions">配置</param> 
         /// <returns></returns>
-        public static OptionsBuilder<ClientCredentialsOptions> AddClientCredentialsTokenProvider<THttpApi>(this IServiceCollection services, Action<ClientCredentialsOptions> configureOptions)
+        public static OptionsBuilder<ClientCredentialsOptions> AddClientCredentialsTokenProvider<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+#endif
+        THttpApi>(this IServiceCollection services, Action<ClientCredentialsOptions> configureOptions)
         {
             return services.AddClientCredentialsTokenProvider<THttpApi>().Configure(configureOptions);
         }
@@ -42,7 +51,11 @@ public static OptionsBuilder<ClientCredentialsOptions> AddClientCredentialsToken
         /// <param name="alias">TokenProvider的别名</param>
         /// <param name="configureOptions">配置</param>
         /// <returns></returns>
-        public static OptionsBuilder<ClientCredentialsOptions> AddClientCredentialsTokenProvider<THttpApi>(this IServiceCollection services, string alias, Action<ClientCredentialsOptions> configureOptions)
+        public static OptionsBuilder<ClientCredentialsOptions> AddClientCredentialsTokenProvider<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+#endif
+        THttpApi>(this IServiceCollection services, string alias, Action<ClientCredentialsOptions> configureOptions)
         {
             return services.AddClientCredentialsTokenProvider<THttpApi>(alias).Configure(configureOptions);
         }

WebApiClientCore.Extensions.OAuths/DependencyInjection/TokenProviderExtensions.GrantTypePassword.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Options;
 using System;
+using System.Diagnostics.CodeAnalysis;
 using WebApiClientCore.Extensions.OAuths.TokenProviders;
 
 namespace Microsoft.Extensions.DependencyInjection
@@ -16,7 +17,11 @@ public static partial class TokenProviderExtensions
         /// <param name="services"></param>
         /// <param name="alias">TokenProvider的别名</param>
         /// <returns></returns>
-        public static OptionsBuilder<PasswordCredentialsOptions> AddPasswordCredentialsTokenProvider<THttpApi>(this IServiceCollection services, string alias = "")
+        public static OptionsBuilder<PasswordCredentialsOptions> AddPasswordCredentialsTokenProvider<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+#endif
+        THttpApi>(this IServiceCollection services, string alias = "")
         {
             var builder = services.AddTokenProvider<THttpApi, PasswordCredentialsTokenProvider>(alias);
             return new OptionsBuilder<PasswordCredentialsOptions>(builder.Services, builder.Name);
@@ -29,7 +34,11 @@ public static OptionsBuilder<PasswordCredentialsOptions> AddPasswordCredentialsT
         /// <param name="services"></param>
         /// <param name="configureOptions">配置</param>
         /// <returns></returns>
-        public static OptionsBuilder<PasswordCredentialsOptions> AddPasswordCredentialsTokenProvider<THttpApi>(this IServiceCollection services, Action<PasswordCredentialsOptions> configureOptions)
+        public static OptionsBuilder<PasswordCredentialsOptions> AddPasswordCredentialsTokenProvider<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+#endif
+        THttpApi>(this IServiceCollection services, Action<PasswordCredentialsOptions> configureOptions)
         {
             return services.AddPasswordCredentialsTokenProvider<THttpApi>().Configure(configureOptions);
         }
@@ -42,7 +51,11 @@ public static OptionsBuilder<PasswordCredentialsOptions> AddPasswordCredentialsT
         /// <param name="alias">TokenProvider的别名</param>
         /// <param name="configureOptions">配置</param>
         /// <returns></returns>
-        public static OptionsBuilder<PasswordCredentialsOptions> AddPasswordCredentialsTokenProvider<THttpApi>(this IServiceCollection services, string alias, Action<PasswordCredentialsOptions> configureOptions)
+        public static OptionsBuilder<PasswordCredentialsOptions> AddPasswordCredentialsTokenProvider<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+#endif
+        THttpApi>(this IServiceCollection services, string alias, Action<PasswordCredentialsOptions> configureOptions)
         {
             return services.AddPasswordCredentialsTokenProvider<THttpApi>(alias).Configure(configureOptions);
         }

WebApiClientCore.Extensions.OAuths/DependencyInjection/TokenProviderExtensions.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using WebApiClientCore;
 using WebApiClientCore.Extensions.OAuths;
@@ -20,7 +21,11 @@ public static partial class TokenProviderExtensions
         /// <param name="tokenRequest">token请求委托</param>
         /// <param name="alias">TokenProvider的别名</param>
         /// <returns></returns>
-        public static ITokenProviderBuilder AddTokenProvider<THttpApi>(this IServiceCollection services, Func<IServiceProvider, Task<TokenResult?>> tokenRequest, string alias = "")
+        public static ITokenProviderBuilder AddTokenProvider<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+#endif
+        THttpApi>(this IServiceCollection services, Func<IServiceProvider, Task<TokenResult?>> tokenRequest, string alias = "")
         {
             return services.AddTokenProvider<THttpApi, DelegateTokenProvider>(s => new DelegateTokenProvider(s, tokenRequest), alias);
         }
@@ -36,11 +41,11 @@ public static ITokenProviderBuilder AddTokenProvider<THttpApi>(this IServiceColl
         /// <returns></returns>
         public static ITokenProviderBuilder AddTokenProvider<
 #if NET5_0_OR_GREATER
-        [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 #endif
         THttpApi,
 #if NET5_0_OR_GREATER
-        [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
 #endif
         TTokenProvider>(this IServiceCollection services, Func<IServiceProvider, TTokenProvider> tokenProviderFactory, string alias = "")
             where TTokenProvider : class, ITokenProvider
@@ -62,11 +67,11 @@ public static ITokenProviderBuilder AddTokenProvider<
         /// <returns></returns>
         public static ITokenProviderBuilder AddTokenProvider<
 #if NET5_0_OR_GREATER
-        [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 #endif
         THttpApi,
 #if NET5_0_OR_GREATER
-        [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
 #endif
         TTokenProvider>(this IServiceCollection services, string alias = "")
             where TTokenProvider : class, ITokenProvider
@@ -86,7 +91,15 @@ public static ITokenProviderBuilder AddTokenProvider<
         /// <param name="services"></param>
         /// <param name="alias">TokenProvider的别名</param>
         /// <returns></returns>
-        private static ITokenProviderBuilder AddTokenProviderCore<THttpApi, TTokenProvider>(this IServiceCollection services, string alias)
+        private static ITokenProviderBuilder AddTokenProviderCore<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+#endif
+        THttpApi,
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
+#endif
+        TTokenProvider>(this IServiceCollection services, string alias)
             where TTokenProvider : class, ITokenProvider
         {
             if (alias == null)

WebApiClientCore.Extensions.OAuths/ITokenProviderFactory.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace WebApiClientCore.Extensions.OAuths
 {
@@ -14,7 +15,11 @@ public interface ITokenProviderFactory
         /// <param name="typeMatchMode">类型匹配模式</param>     
         /// <returns></returns>
         /// <exception cref="InvalidOperationException"></exception>
-        ITokenProvider Create(Type httpApiType, TypeMatchMode typeMatchMode = TypeMatchMode.TypeOnly);
+        ITokenProvider Create(
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+#endif
+            Type httpApiType, TypeMatchMode typeMatchMode = TypeMatchMode.TypeOnly);
 
         /// <summary>
         /// 通过接口类型获取或创建其对应的token提供者
@@ -24,6 +29,10 @@ public interface ITokenProviderFactory
         /// <param name="alias">TokenProvider的别名</param>     
         /// <returns></returns>
         /// <exception cref="InvalidOperationException"></exception>
-        ITokenProvider Create(Type httpApiType, TypeMatchMode typeMatchMode, string alias);
+        ITokenProvider Create(
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+#endif
+            Type httpApiType, TypeMatchMode typeMatchMode, string alias);
     }
 }