Whipstaff (#165)

* prep for whipstaff * generation now firing again * now using whipstaff namespaces * Update version.json * Delete TestEntityTypeConfigurationGenerator.cs
dpvreony · Aug 24, 2021 · 52361ac · 52361ac
1 parent a9ab6cf
commit 52361ac
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 88 deletions.
diff --git a/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.GenerationTests.csproj b/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.GenerationTests.csproj
diff --git a/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.SampleApp.csproj b/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.SampleApp.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <LangVersion>9</LangVersion>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Whipstaff.AspNetCore" Version="5.0.12" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Dhgms.Nucleotide.ModelTests\Dhgms.Nucleotide.SampleGenerator.csproj" PrivateAssets="all" ReferenceOutputAssembly="true" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="$(ProjectDir)..\Dhgms.Nucleotide.ModelTests\bin\$(Configuration)\netstandard2.0\Dhgms.Nucleotide.SampleGenerator.dll" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Dhgms.Nucleotide.Generators/Dhgms.Nucleotide.Generators.csproj b/src/Dhgms.Nucleotide.Generators/Dhgms.Nucleotide.Generators.csproj
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" PrivateAssets="none" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" PrivateAssets="none" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Dhgms.Nucleotide.Generators/Features/Cqrs/CommandFactoryInterfaceGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/Cqrs/CommandFactoryInterfaceGeneratorProcessor.cs
@@ -50,7 +50,7 @@ protected override string[] GetBaseInterfaces(IEntityGenerationModel entityGener
             var className = entityGenerationModel.ClassName;
             return new []
             {
-                $"Dhgms.AspNetCoreContrib.Abstractions.IAuditableCommandFactory<Commands.IAdd{className}Command, RequestDtos.Add{className}RequestDto, ResponseDtos.Add{className}ResponseDto, Commands.IDelete{className}Command, ResponseDtos.Delete{className}ResponseDto, Commands.IUpdate{className}Command, RequestDtos.Update{className}RequestDto, ResponseDtos.Update{className}ResponseDto>"
+                $"Whipstaff.Core.IAuditableCommandFactory<Commands.IAdd{className}Command, RequestDtos.Add{className}RequestDto, ResponseDtos.Add{className}ResponseDto, Commands.IDelete{className}Command, ResponseDtos.Delete{className}ResponseDto, Commands.IUpdate{className}Command, RequestDtos.Update{className}RequestDto, ResponseDtos.Update{className}ResponseDto>"
             };
         }
 

diff --git a/src/Dhgms.Nucleotide.Generators/Features/Cqrs/CommandInterfaceGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/Cqrs/CommandInterfaceGeneratorProcessor.cs
@@ -43,13 +43,13 @@ protected override string[] GetBaseInterfaces(IEntityGenerationModel entityGener
             {
                 return new[]
                 {
-                    $"Dhgms.AspNetCoreContrib.Abstractions.IAuditableRequest<long, ResponseDtos.{prefix}{entityGenerationModel.ClassName}ResponseDto>"
+                    $"Whipstaff.Core.IAuditableRequest<long, ResponseDtos.{prefix}{entityGenerationModel.ClassName}ResponseDto>"
                 };
             }
 
             return new[]
             {
-                $"Dhgms.AspNetCoreContrib.Abstractions.IAuditableRequest<RequestDtos.{prefix}{entityGenerationModel.ClassName}RequestDto, ResponseDtos.{prefix}{entityGenerationModel.ClassName}ResponseDto>"
+                $"Whipstaff.Core.IAuditableRequest<RequestDtos.{prefix}{entityGenerationModel.ClassName}RequestDto, ResponseDtos.{prefix}{entityGenerationModel.ClassName}ResponseDto>"
             };
         }
     }

diff --git a/src/Dhgms.Nucleotide.Generators/Features/Cqrs/QueryFactoryInterfaceGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/Cqrs/QueryFactoryInterfaceGeneratorProcessor.cs
@@ -49,7 +49,7 @@ protected override string[] GetBaseInterfaces(IEntityGenerationModel entityGener
             var className = entityGenerationModel.ClassName;
             return new []
             {
-                $"Dhgms.AspNetCoreContrib.Abstractions.IAuditableQueryFactory<Queries.IList{className}Query, RequestDtos.List{className}RequestDto, ResponseDtos.List{className}ResponseDto, Queries.IView{className}Query, ResponseDtos.View{className}ResponseDto>"
+                $"Whipstaff.Core.IAuditableQueryFactory<Queries.IList{className}Query, RequestDtos.List{className}RequestDto, ResponseDtos.List{className}ResponseDto, Queries.IView{className}Query, ResponseDtos.View{className}ResponseDto>"
             };
         }
 

diff --git a/src/Dhgms.Nucleotide.Generators/Features/Cqrs/QueryInterfaceGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/Cqrs/QueryInterfaceGeneratorProcessor.cs
@@ -46,13 +46,13 @@ protected override string[] GetBaseInterfaces(IEntityGenerationModel entityGener
             {
                 return new[]
                 {
-                    $"Dhgms.AspNetCoreContrib.Abstractions.IAuditableRequest<long, ResponseDtos.{prefix}{entityGenerationModel.ClassName}ResponseDto>"
+                    $"Whipstaff.Core.IAuditableRequest<long, ResponseDtos.{prefix}{entityGenerationModel.ClassName}ResponseDto>"
                 };
             }
 
             return new[]
             {
-                $"Dhgms.AspNetCoreContrib.Abstractions.IAuditableRequest<RequestDtos.{prefix}{entityGenerationModel.ClassName}RequestDto, ResponseDtos.{prefix}{entityGenerationModel.ClassName}ResponseDto>"
+                $"Whipstaff.Core.IAuditableRequest<RequestDtos.{prefix}{entityGenerationModel.ClassName}RequestDto, ResponseDtos.{prefix}{entityGenerationModel.ClassName}ResponseDto>"
             };
         }
     }

diff --git a/src/Dhgms.Nucleotide.Generators/Features/Mvc/MvcControllerGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/Mvc/MvcControllerGeneratorProcessor.cs
@@ -44,7 +44,7 @@ protected override IList<string> GetUsings()
 
         /// <inheritdoc />
         protected override string GetBaseClass(string entityName) =>
-            $"Dhgms.AspNetCoreContrib.Controllers.QueryOnlyController<{entityName}Controller, Queries.IList{entityName}Query, RequestDtos.List{entityName}RequestDto, ResponseDtos.List{entityName}ResponseDto, Queries.IView{entityName}Query, ResponseDtos.View{entityName}ResponseDto>";
+            $"Whipstaff.AspNetCore.QueryOnlyController<{entityName}Controller, Queries.IList{entityName}Query, RequestDtos.List{entityName}RequestDto, ResponseDtos.List{entityName}ResponseDto, Queries.IView{entityName}Query, ResponseDtos.View{entityName}ResponseDto>";
 
         protected override IList<string> GetImplementedInterfaces(string entityName)
         {

diff --git a/src/Dhgms.Nucleotide.Generators/Features/WebApi/WebApiServiceGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/WebApi/WebApiServiceGeneratorProcessor.cs
@@ -42,7 +42,7 @@ protected override IList<string> GetUsings()
 
         /// <inheritdoc />
         protected override string GetBaseClass(string entityName) =>
-            $"Dhgms.AspNetCoreContrib.Controllers.CrudController<{entityName}Controller, Queries.IList{entityName}Query, RequestDtos.List{entityName}RequestDto, ResponseDtos.List{entityName}ResponseDto, Queries.IView{entityName}Query, ResponseDtos.View{entityName}ResponseDto, Commands.IAdd{entityName}Command, RequestDtos.Add{entityName}RequestDto, ResponseDtos.Add{entityName}ResponseDto, Commands.IDelete{entityName}Command, ResponseDtos.Delete{entityName}ResponseDto, Commands.IUpdate{entityName}Command, RequestDtos.Update{entityName}RequestDto, ResponseDtos.Update{entityName}ResponseDto>";
+            $"Whipstaff.AspNetCore.CrudController<{entityName}Controller, Queries.IList{entityName}Query, RequestDtos.List{entityName}RequestDto, ResponseDtos.List{entityName}ResponseDto, Queries.IView{entityName}Query, ResponseDtos.View{entityName}ResponseDto, Commands.IAdd{entityName}Command, RequestDtos.Add{entityName}RequestDto, ResponseDtos.Add{entityName}ResponseDto, Commands.IDelete{entityName}Command, ResponseDtos.Delete{entityName}ResponseDto, Commands.IUpdate{entityName}Command, RequestDtos.Update{entityName}RequestDto, ResponseDtos.Update{entityName}ResponseDto>";
 
         protected override IList<string> GetImplementedInterfaces(string entityName)
         {

diff --git a/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.ModelTests.csproj b/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.ModelTests.csproj
diff --git a/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.SampleGenerator.csproj b/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.SampleGenerator.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Dhgms.Nucleotide.Generators\Dhgms.Nucleotide.Generators.csproj" PrivateAssets="all"  ReferenceOutputAssembly="true" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="$(ProjectDir)..\Dhgms.Nucleotide.Generators\bin\$(Configuration)\netstandard2.0\Dhgms.Nucleotide.Generators.dll" />
+  </ItemGroup>
+
+  <!--<PropertyGroup>
+    <GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
+  </PropertyGroup>
+
+  <Target Name="GetDependencyTargetPaths">
+    <ItemGroup>
+      <TargetPathWithTargetPlatformMoniker Include="$(PKGDhgms_Nucleotide_Generators)\lib\netstandard2.0\Dhgms.Nucleotide.Generators.dll" IncludeRuntimeDependency="false" />
+    </ItemGroup>
+  </Target>-->
+</Project>
diff --git a/src/Dhgms.Nucleotide.ModelTests/TestEntityTypeConfigurationGenerator.cs b/src/Dhgms.Nucleotide.ModelTests/TestEntityTypeConfigurationGenerator.cs
diff --git a/src/Dhgms.Nucleotide.UnitTests/Dhgms.Nucleotide.UnitTests.csproj b/src/Dhgms.Nucleotide.UnitTests/Dhgms.Nucleotide.UnitTests.csproj
@@ -31,7 +31,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Dhgms.Nucleotide.Generators\Dhgms.Nucleotide.Generators.csproj" />
-    <ProjectReference Include="..\Dhgms.Nucleotide.ModelTests\Dhgms.Nucleotide.ModelTests.csproj" />
+    <ProjectReference Include="..\Dhgms.Nucleotide.ModelTests\Dhgms.Nucleotide.SampleGenerator.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Dhgms.Nucleotide.sln b/src/Dhgms.Nucleotide.sln
@@ -7,11 +7,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dhgms.Nucleotide", "Dhgms.N
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dhgms.Nucleotide.UnitTests", "Dhgms.Nucleotide.UnitTests\Dhgms.Nucleotide.UnitTests.csproj", "{46CF8EB7-1526-44BC-BB6E-DAF6F0A33155}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dhgms.Nucleotide.ModelTests", "Dhgms.Nucleotide.ModelTests\Dhgms.Nucleotide.ModelTests.csproj", "{8B50F266-A8FC-4766-B953-88C29BDC93D0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dhgms.Nucleotide.SampleGenerator", "Dhgms.Nucleotide.ModelTests\Dhgms.Nucleotide.SampleGenerator.csproj", "{8B50F266-A8FC-4766-B953-88C29BDC93D0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dhgms.Nucleotide.Analyzers", "Dhgms.Nucleotide.Analyzers\Dhgms.Nucleotide.Analyzers.csproj", "{DA9882C5-9A73-4CB5-8AE2-18ABA0854DE8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dhgms.Nucleotide.GenerationTests", "Dhgms.Nucleotide.GenerationTests\Dhgms.Nucleotide.GenerationTests.csproj", "{91B35FF3-3B4A-4F63-B437-302756C4EF71}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dhgms.Nucleotide.SampleApp", "Dhgms.Nucleotide.GenerationTests\Dhgms.Nucleotide.SampleApp.csproj", "{91B35FF3-3B4A-4F63-B437-302756C4EF71}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3B51307A-81A9-485E-841F-A023FDE3B148}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.0",
+  "version": "3.1",
   "publicReleaseRefSpec": [
     "^refs/heads/main$", // we release out of master
     "^refs/heads/preview/.*", // we release previews