迁移SourceGenerator到基础功能

Author: xljiulang

App/Startup.cs

@@ -45,11 +45,11 @@ public void ConfigureServices(IServiceCollection services)
             // 添加控制器
             services.AddControllers().AddXmlSerializerFormatters();
 
-            // 应用编译时生成接口的代理类型代码
+            // 全局默认配置
             services
                 .AddWebApiClient()
-                .UseJsonFirstApiActionDescriptor()
-                .UseSourceGeneratorHttpApiActivator();
+                .ConfigureHttpApi(o => { })
+                .UseJsonFirstApiActionDescriptor();
 
             // 注册userApi
             services.AddHttpApi(typeof(IUserApi)).ConfigureHttpApi(o =>

AppAot/Program.cs

@@ -12,7 +12,6 @@ static void Main(string[] args)
                 {
                     services
                         .AddWebApiClient()
-                        .UseSourceGeneratorHttpApiActivator() // SG 激活器
                         .ConfigureHttpApi(options => // json SG生成器配置
                         {
                             var jsonContext = AppJsonSerializerContext.Default;

WebApiClientCore.Analyzers.SourceGenerator/DynamicDependencyBuilder.cs

@@ -1,7 +1,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace WebApiClientCore.Analyzers.SourceGenerator
@@ -36,7 +35,7 @@ public override string ToString()
             builder.AppendLine("#if NET5_0_OR_GREATER");
             builder.AppendLine("using System.Diagnostics.CodeAnalysis;");
             builder.AppendLine("using System.Runtime.CompilerServices;");
-            builder.AppendLine($"namespace WebApiClientCore.Implementations");
+            builder.AppendLine($"namespace WebApiClientCore");
             builder.AppendLine("{");
             builder.AppendLine("    /// <summary>动态依赖初始化器</summary>");
             builder.AppendLine($"    static partial class {this.ClassName}");

WebApiClientCore.Extensions.SourceGenerator/DependencyInjection/WebApiClientBuilderExtensions.cs

@@ -1,6 +1,4 @@
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using WebApiClientCore;
-using WebApiClientCore.Implementations;
+using System;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -12,18 +10,12 @@ public static class WebApiClientBuilderExtensions
         /// <summary>
         /// 编译时使用SourceGenerator生成接口的代理类型代码
         /// 运行时查找接口的代理类型并创建实例
-        /// </summary>
-        /// <remarks>
-        /// <para>• 要求声明http接口的项目的编程语言为c#</para>
-        /// <para>• 要求声明http接口的项目引用WebApiClientCore.Extensions.SourceGenerator包</para>
-        /// <para>• 要求Visual Studio或msbuild工具为最新版本</para>
-        /// </remarks>
+        /// </summary> 
         /// <param name="builder"></param>
         /// <returns></returns>
+        [Obsolete("SourceGenerator功能已合并到基础包并默认启用")]
         public static IWebApiClientBuilder UseSourceGeneratorHttpApiActivator(this IWebApiClientBuilder builder)
         {
-            builder.Services.RemoveAll(typeof(IHttpApiActivator<>));
-            builder.Services.AddSingleton(typeof(IHttpApiActivator<>), typeof(SourceGeneratorHttpApiActivator<>));
             return builder;
         }
     }

WebApiClientCore.Extensions.SourceGenerator/Implementations/MethodFeature.cs

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup> 
+	<PropertyGroup>
 		<Nullable>enable</Nullable>
-		<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+		<TargetFramework>netstandard2.1</TargetFramework>
 		<DocumentationFile>$(TargetPath)\$(AssemblyName).xml</DocumentationFile>
 
 		<SignAssembly>true</SignAssembly>
@@ -15,14 +14,4 @@
 	<ItemGroup>
 		<ProjectReference Include="..\WebApiClientCore\WebApiClientCore.csproj" />
 	</ItemGroup>
-
-  <!--nuget analyzers和tools目录-->
-  <ItemGroup>
-    <None Include="NugetPackage\tools\*.*" PackagePath="tools" Pack="true" />
-    <None Include="NugetPackage\analyzers\dotnet\cs\**" PackagePath="analyzers\dotnet\cs" Pack="true" />
-  </ItemGroup>
-
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="dotnet publish ../WebApiClientCore.Analyzers.SourceGenerator/WebApiClientCore.Analyzers.SourceGenerator.csproj -c Release -o NugetPackage/analyzers/dotnet/cs" />
-  </Target>
 </Project>

WebApiClientCore.Extensions.SourceGenerator/NugetPackage/tools/install.ps1

@@ -6,8 +6,8 @@ namespace WebApiClientCore
     /// <summary>
     /// 表示HttpApi代理类的特性
     /// </summary>
-    [AttributeUsage(AttributeTargets.Class)]
     [EditorBrowsable(EditorBrowsableState.Never)]
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]    
     public sealed class HttpApiProxyClassAttribute : Attribute
     {
         /// <summary>

WebApiClientCore.Extensions.SourceGenerator/NugetPackage/tools/uninstall.ps1

@@ -6,8 +6,8 @@ namespace WebApiClientCore
     /// <summary>
     /// 表示HttpApi代理方法的特性 
     /// </summary>
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
     [EditorBrowsable(EditorBrowsableState.Never)]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
     public sealed class HttpApiProxyMethodAttribute : Attribute
     {
         /// <summary>