feat: 更新依赖,移除SG的实现,项目没有移除,后期再继续学习 (#502)

joesdu · Aug 2, 2024 · 3bc27b2 · 3bc27b2
2 parents bd16bb9 + 01d508d
commit 3bc27b2
Show file tree

Hide file tree

Showing 10 changed files with 156 additions and 169 deletions.
diff --git a/Build.ps1 b/Build.ps1
@@ -33,7 +33,7 @@ exec { & dotnet test $solution -c Release --no-build -l trx --verbosity=normal }
 
 # Core
 exec { & dotnet pack .\src\EasilyNET.Core\EasilyNET.Core.csproj -c Release -o $artifacts --include-symbols -p:SymbolPackageFormat=snupkg --no-build }
-exec { & dotnet pack .\src\EasilyNET.Core.SourceGenerator\EasilyNET.Core.SourceGenerator.csproj -c Release -o $artifacts --no-build }
+# exec { & dotnet pack .\src\EasilyNET.Core.SourceGenerator\EasilyNET.Core.SourceGenerator.csproj -c Release -o $artifacts --no-build }
 exec { & dotnet pack .\src\EasilyNET.WebCore\EasilyNET.WebCore.csproj -c Release -o $artifacts --include-symbols -p:SymbolPackageFormat=snupkg --no-build }
 exec { & dotnet pack .\src\EasilyNET.WebCore.Swagger\EasilyNET.WebCore.Swagger.csproj -c Release -o $artifacts --include-symbols -p:SymbolPackageFormat=snupkg --no-build }
 

diff --git a/EasilyNET.sln b/EasilyNET.sln
@@ -68,7 +68,7 @@ Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-co
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApi.SourceGenerator.Test", "sample\WebApi.SourceGenerator.Test\WebApi.SourceGenerator.Test.csproj", "{4A011ECD-3C24-4818-8C42-A9361BF4119A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasilyNET.Core.SourceGenerator", "src\EasilyNET.Core.SourceGenerator\EasilyNET.Core.SourceGenerator.csproj", "{7B1CB9C6-F4EB-4FAA-A17D-345946F6DD7C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasilyNET.Core.SourceGenerator", "src\EasilyNET.Core.SourceGenerator\EasilyNET.Core.SourceGenerator.csproj", "{64D128C1-919B-4A60-A715-5910D5204251}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -151,10 +151,10 @@ Global
 		{4A011ECD-3C24-4818-8C42-A9361BF4119A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4A011ECD-3C24-4818-8C42-A9361BF4119A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A011ECD-3C24-4818-8C42-A9361BF4119A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B1CB9C6-F4EB-4FAA-A17D-345946F6DD7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B1CB9C6-F4EB-4FAA-A17D-345946F6DD7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B1CB9C6-F4EB-4FAA-A17D-345946F6DD7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B1CB9C6-F4EB-4FAA-A17D-345946F6DD7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64D128C1-919B-4A60-A715-5910D5204251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64D128C1-919B-4A60-A715-5910D5204251}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64D128C1-919B-4A60-A715-5910D5204251}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64D128C1-919B-4A60-A715-5910D5204251}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -181,7 +181,7 @@ Global
 		{8F9C18F9-A526-DCA0-597F-90D64AE5C6C2} = {8D626EA8-CB54-BC41-363A-217881BEBA6E}
 		{9B426136-DC85-603B-94FB-F3C0B2E72713} = {4F9DEAE5-078F-E77A-2E4A-FEB6FFE226FF}
 		{4A011ECD-3C24-4818-8C42-A9361BF4119A} = {4F9DEAE5-078F-E77A-2E4A-FEB6FFE226FF}
-		{7B1CB9C6-F4EB-4FAA-A17D-345946F6DD7C} = {8D626EA8-CB54-BC41-363A-217881BEBA6E}
+		{64D128C1-919B-4A60-A715-5910D5204251} = {8D626EA8-CB54-BC41-363A-217881BEBA6E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BF2C0069-ED43-44A1-A66C-2CC1B62E3EA3}

diff --git a/sample/WebApi.SourceGenerator.Test/Controllers/WeatherForecastController.cs b/sample/WebApi.SourceGenerator.Test/Controllers/WeatherForecastController.cs
@@ -1,4 +1,3 @@
-using System.ComponentModel;
 using Microsoft.AspNetCore.Mvc;
 
 namespace WebApi.SourceGenerator.Test.Controllers;
@@ -14,34 +13,4 @@ public class WeatherForecastController(WeatherForecastService wfs) : ControllerB
     /// <returns></returns>
     [HttpGet("GetWeatherForecast")]
     public IEnumerable<WeatherForecast> Get() => wfs.Get();
-
-    /// <summary>
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet("GetEnumDescription")]
-    public string GetEnumDescription() => ETestEnumDescription.A.ToDescription();
-}
-
-/// <summary>
-/// ²âÊÔÃ¶¾ÙÔ´ÂëÉú³ÉÆ÷
-/// </summary>
-public enum ETestEnumDescription
-{
-    /// <summary>
-    /// A
-    /// </summary>
-    [Description("ADES")]
-    A,
-
-    /// <summary>
-    /// B
-    /// </summary>
-    [Description("BDES")]
-    B,
-
-    /// <summary>
-    /// C
-    /// </summary>
-    [Description("CDES")]
-    C
 }
diff --git a/sample/WebApi.SourceGenerator.Test/WebApi.SourceGenerator.Test.csproj b/sample/WebApi.SourceGenerator.Test/WebApi.SourceGenerator.Test.csproj
@@ -7,12 +7,11 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.0" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\src\EasilyNET.AutoDependencyInjection\EasilyNET.AutoDependencyInjection.csproj" />
-		<ProjectReference Include="..\..\src\EasilyNET.Core.SourceGenerator\EasilyNET.Core.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
 		<ProjectReference Include="..\..\src\EasilyNET.WebCore.Swagger\EasilyNET.WebCore.Swagger.csproj" />
 	</ItemGroup>
 

diff --git a/sample/WebApi.Test.Unit/WebApi.Test.Unit.csproj b/sample/WebApi.Test.Unit/WebApi.Test.Unit.csproj
@@ -39,7 +39,7 @@
 		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
 		<PackageReference Include="Serilog.Sinks.Map" Version="2.0.0" />
 		<PackageReference Include="Serilog.Sinks.OpenTelemetry" Version="4.0.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -23,9 +23,9 @@
     <PackageVersion Include="MongoDB.Driver.GridFS" Version="2.28.0" />
     <PackageVersion Include="RabbitMQ.Client" Version="7.0.0-rc.7" />
     <PackageVersion Include="Serilog" Version="4.0.2-dev-02220" />
-    <PackageVersion Include="Spectre.Console.Json" Version="0.49.2-preview.0.13" />
-    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
-    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
+    <PackageVersion Include="Spectre.Console.Json" Version="0.49.2-preview.0.14" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.0" />
     <!--microsoft asp.net core -->
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.6.24327.7" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-preview.6.24327.7" />