diff --git a/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.GenerationTests.csproj b/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.GenerationTests.csproj deleted file mode 100644 index 1d50c270..00000000 --- a/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.GenerationTests.csproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - netcoreapp5.0 - false - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(GetTargetPathDependsOn);GetDependencyTargetPaths - - - - - - - - diff --git a/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.SampleApp.csproj b/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.SampleApp.csproj new file mode 100644 index 00000000..c2c7c43f --- /dev/null +++ b/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.SampleApp.csproj @@ -0,0 +1,21 @@ + + + + netcoreapp5.0 + 9 + false + + + + + + + + + + + + + + + diff --git a/src/Dhgms.Nucleotide.Generators/Dhgms.Nucleotide.Generators.csproj b/src/Dhgms.Nucleotide.Generators/Dhgms.Nucleotide.Generators.csproj index 95900ed1..17e5d92b 100644 --- a/src/Dhgms.Nucleotide.Generators/Dhgms.Nucleotide.Generators.csproj +++ b/src/Dhgms.Nucleotide.Generators/Dhgms.Nucleotide.Generators.csproj @@ -8,6 +8,7 @@ - + + diff --git a/src/Dhgms.Nucleotide.Generators/Features/Cqrs/CommandFactoryInterfaceGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/Cqrs/CommandFactoryInterfaceGeneratorProcessor.cs index ab08e968..01bb4ae4 100644 --- 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" + $"Whipstaff.Core.IAuditableCommandFactory" }; } diff --git a/src/Dhgms.Nucleotide.Generators/Features/Cqrs/CommandInterfaceGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/Cqrs/CommandInterfaceGeneratorProcessor.cs index 218d2079..341ec1d4 100644 --- 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" + $"Whipstaff.Core.IAuditableRequest" }; } return new[] { - $"Dhgms.AspNetCoreContrib.Abstractions.IAuditableRequest" + $"Whipstaff.Core.IAuditableRequest" }; } } diff --git a/src/Dhgms.Nucleotide.Generators/Features/Cqrs/QueryFactoryInterfaceGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/Cqrs/QueryFactoryInterfaceGeneratorProcessor.cs index 7da225c0..3c716aab 100644 --- 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" + $"Whipstaff.Core.IAuditableQueryFactory" }; } diff --git a/src/Dhgms.Nucleotide.Generators/Features/Cqrs/QueryInterfaceGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/Cqrs/QueryInterfaceGeneratorProcessor.cs index 030e11cc..97d69678 100644 --- 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" + $"Whipstaff.Core.IAuditableRequest" }; } return new[] { - $"Dhgms.AspNetCoreContrib.Abstractions.IAuditableRequest" + $"Whipstaff.Core.IAuditableRequest" }; } } diff --git a/src/Dhgms.Nucleotide.Generators/Features/Mvc/MvcControllerGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/Mvc/MvcControllerGeneratorProcessor.cs index ca4a2251..fe6e2cc9 100644 --- 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 GetUsings() /// 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 GetImplementedInterfaces(string entityName) { diff --git a/src/Dhgms.Nucleotide.Generators/Features/WebApi/WebApiServiceGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/WebApi/WebApiServiceGeneratorProcessor.cs index f52264dd..34e6f7ea 100644 --- 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 GetUsings() /// 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 GetImplementedInterfaces(string entityName) { diff --git a/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.ModelTests.csproj b/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.ModelTests.csproj deleted file mode 100644 index 6590d4ec..00000000 --- a/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.ModelTests.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - netstandard2.0 - false - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.SampleGenerator.csproj b/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.SampleGenerator.csproj new file mode 100644 index 00000000..c0832da9 --- /dev/null +++ b/src/Dhgms.Nucleotide.ModelTests/Dhgms.Nucleotide.SampleGenerator.csproj @@ -0,0 +1,28 @@ + + + + netstandard2.0 + false + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Dhgms.Nucleotide.ModelTests/TestEntityTypeConfigurationGenerator.cs b/src/Dhgms.Nucleotide.ModelTests/TestEntityTypeConfigurationGenerator.cs deleted file mode 100644 index 37335c10..00000000 --- a/src/Dhgms.Nucleotide.ModelTests/TestEntityTypeConfigurationGenerator.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Dhgms.Nucleotide.Generators.Features.EntityFramework; -using Dhgms.Nucleotide.Generators.Models; -using Microsoft.CodeAnalysis; - -namespace Dhgms.Nucleotide.ModelTests -{ - [Generator] - public sealed class TestEntityTypeConfigurationGenerator : EntityFrameworkEntityTypeConfigurationGenerator - { - protected override INucleotideGenerationModel NucleotideGenerationModel => new ModelGenerationDetails(); - } -} diff --git a/src/Dhgms.Nucleotide.UnitTests/Dhgms.Nucleotide.UnitTests.csproj b/src/Dhgms.Nucleotide.UnitTests/Dhgms.Nucleotide.UnitTests.csproj index 79c2970e..5c22abb6 100644 --- a/src/Dhgms.Nucleotide.UnitTests/Dhgms.Nucleotide.UnitTests.csproj +++ b/src/Dhgms.Nucleotide.UnitTests/Dhgms.Nucleotide.UnitTests.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/Dhgms.Nucleotide.sln b/src/Dhgms.Nucleotide.sln index d02a54a8..c3438a44 100644 --- 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 index 14c83898..e74f970f 100644 --- 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