diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/en.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/Localization/MyProjectName/ApplicationContracts/en.json similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/en.json rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/Localization/MyProjectName/ApplicationContracts/en.json diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj index 317662c6ac..6b7caa489c 100644 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj @@ -4,20 +4,20 @@ netstandard2.0 - + MyCompanyName.MyProjectName - - + - + + diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/pt-BR.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/pt-BR.json deleted file mode 100644 index 958055dcd5..0000000000 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/pt-BR.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "culture": "pt-BR", - "texts": { - "Permission:MyProjectName": "MyProjectName" - } -} \ No newline at end of file diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/zh-Hans.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/zh-Hans.json deleted file mode 100644 index 15d26f90a0..0000000000 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/zh-Hans.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "culture": "zh-Hans", - "texts": { - "Permission:MyProjectName": "MyProjectName" - } - } \ No newline at end of file diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs similarity index 76% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs index 84be3eb86f..27f2c6e096 100644 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs @@ -1,7 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; -using MyCompanyName.MyProjectName.Localization; +using MyCompanyName.MyProjectName.Localization; using Volo.Abp.Application; -using Volo.Abp.Authorization.Permissions; using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; @@ -25,7 +23,7 @@ namespace MyCompanyName.MyProjectName { options.Resources .Get() - .AddVirtualJson("/MyCompanyName/MyProjectName/Localization/ApplicationContracts"); + .AddVirtualJson("/Localization/MyProjectName/ApplicationContracts"); }); } } diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissionDefinitionProvider.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNamePermissionDefinitionProvider.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissionDefinitionProvider.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNamePermissionDefinitionProvider.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNamePermissions.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNamePermissions.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj index 03a3c8d193..59d547ae8c 100644 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj @@ -4,11 +4,14 @@ netstandard2.0 - + MyCompanyName.MyProjectName + + + diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationAutoMapperProfile.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationAutoMapperProfile.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs similarity index 85% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs index 891ff26af3..025eb7e3bb 100644 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs @@ -1,7 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.AutoMapper; +using Volo.Abp.AutoMapper; using Volo.Abp.Modularity; -using Volo.Abp.Settings; namespace MyCompanyName.MyProjectName { diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettingDefinitionProvider.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/Settings/MyProjectNameSettingDefinitionProvider.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettingDefinitionProvider.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application/Settings/MyProjectNameSettingDefinitionProvider.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettings.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/Settings/MyProjectNameSettings.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettings.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application/Settings/MyProjectNameSettings.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/en.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/DomainShared/en.json similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/en.json rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/DomainShared/en.json diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/Localization/MyProjectNameResource.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectNameResource.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/Localization/MyProjectNameResource.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectNameResource.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj index 21e138f24b..e5698774eb 100644 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj @@ -4,11 +4,16 @@ netstandard2.0 - + MyCompanyName.MyProjectName + + + + + diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainSharedModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainSharedModule.cs deleted file mode 100644 index 98c279b543..0000000000 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainSharedModule.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Modularity; -using Volo.Abp.Localization; -using MyCompanyName.MyProjectName.Localization; - -namespace MyCompanyName.MyProjectName -{ - [DependsOn( - typeof(AbpLocalizationModule) - )] - public class MyProjectNameDomainSharedModule : AbpModule - { - public override void ConfigureServices(ServiceConfigurationContext context) - { - Configure(options => - { - options.Resources.Add("en"); - }); - } - } -} diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainErrorCodes.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainErrorCodes.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameDomainModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs similarity index 70% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameDomainModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs index 81f815a022..39341e9dba 100644 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameDomainModule.cs +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs @@ -1,27 +1,28 @@ -using Microsoft.Extensions.DependencyInjection; -using MyCompanyName.MyProjectName.Localization; +using Volo.Abp.Modularity; using Volo.Abp.Localization; +using MyCompanyName.MyProjectName.Localization; using Volo.Abp.Localization.ExceptionHandling; -using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; namespace MyCompanyName.MyProjectName { [DependsOn( - typeof(MyProjectNameDomainSharedModule) + typeof(AbpLocalizationModule) )] - public class MyProjectNameDomainModule : AbpModule + public class MyProjectNameDomainSharedModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { Configure(options => { - options.FileSets.AddEmbedded(); + options.FileSets.AddEmbedded(); }); Configure(options => { - options.Resources.Get().AddVirtualJson("/MyCompanyName/MyProjectName/Localization/Domain"); + options.Resources + .Add("en") + .AddVirtualJson("/Localization/MyProjectName/DomainShared"); }); Configure(options => diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/en.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/Domain/en.json similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/en.json rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/Domain/en.json diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj index 59e1709df7..8376aba526 100644 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj @@ -4,20 +4,20 @@ netstandard2.0 - + MyCompanyName.MyProjectName - - + - + + diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/pt-BR.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/pt-BR.json deleted file mode 100644 index 6d746df04c..0000000000 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/pt-BR.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "culture": "pt-BR", - "texts": { - - } -} \ No newline at end of file diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/zh-Hans.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/zh-Hans.json deleted file mode 100644 index e4557f0ad2..0000000000 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/zh-Hans.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "culture": "zh-Hans", - "texts": { - - } - } \ No newline at end of file diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameConsts.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameConsts.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs new file mode 100644 index 0000000000..849aa1073a --- /dev/null +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs @@ -0,0 +1,28 @@ +using MyCompanyName.MyProjectName.Localization; +using Volo.Abp.Localization; +using Volo.Abp.Modularity; +using Volo.Abp.VirtualFileSystem; + +namespace MyCompanyName.MyProjectName +{ + [DependsOn( + typeof(MyProjectNameDomainSharedModule) + )] + public class MyProjectNameDomainModule : AbpModule + { + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.FileSets.AddEmbedded(); + }); + + Configure(options => + { + options.Resources + .Get() + .AddVirtualJson("/Localization/MyProjectName/Domain"); + }); + } + } +} diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/IMyProjectNameDbContext.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/IMyProjectNameDbContext.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/IMyProjectNameDbContext.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/IMyProjectNameDbContext.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContext.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContext.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj index 0ca5581406..98af2369f0 100644 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj @@ -4,12 +4,15 @@ netstandard2.0 - + MyCompanyName.MyProjectName - + + + + diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj index c169b10e80..afa1abf52f 100644 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj @@ -4,12 +4,15 @@ netstandard2.0 - + MyCompanyName.MyProjectName - + + + + diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName/MyProjectName/MyProjectNameHttpApiClientModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyProjectNameHttpApiClientModule.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName/MyProjectName/MyProjectNameHttpApiClientModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyProjectNameHttpApiClientModule.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj index 4050c826f6..ea8716cd47 100644 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj @@ -4,12 +4,15 @@ netstandard2.0 - + MyCompanyName.MyProjectName - + + + + diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/MyProjectNameHttpApiModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs similarity index 83% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/MyProjectNameHttpApiModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs index 3c993bc8a6..e905ca2a62 100644 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/MyProjectNameHttpApiModule.cs +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs @@ -5,7 +5,8 @@ namespace MyCompanyName.MyProjectName { [DependsOn( typeof(MyProjectNameApplicationContractsModule), - typeof(AbpAspNetCoreMvcModule))] + typeof(AbpAspNetCoreMvcModule) + )] public class MyProjectNameHttpApiModule : AbpModule { diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/IMyProjectNameMongoDbContext.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/IMyProjectNameMongoDbContext.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/IMyProjectNameMongoDbContext.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/IMyProjectNameMongoDbContext.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContext.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContext.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContext.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContext.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContextExtensions.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContextExtensions.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContextExtensions.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContextExtensions.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbModule.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbModule.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs similarity index 100% rename from templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj index ec90deacf4..2a8d540aae 100644 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj @@ -4,12 +4,15 @@ netstandard2.0 - + MyCompanyName.MyProjectName - + + + + diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/MyProjectName/Web/en.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/MyProjectName/Web/en.json new file mode 100644 index 0000000000..92e4e9582b --- /dev/null +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/MyProjectName/Web/en.json @@ -0,0 +1,6 @@ +{ + "culture": "en", + "texts": { + + } +} \ No newline at end of file diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/pt-BR.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/pt-BR.json deleted file mode 100644 index 6d746df04c..0000000000 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/pt-BR.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "culture": "pt-BR", - "texts": { - - } -} \ No newline at end of file diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/zh-Hans.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/zh-Hans.json deleted file mode 100644 index e4557f0ad2..0000000000 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/zh-Hans.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "culture": "zh-Hans", - "texts": { - - } - } \ No newline at end of file diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index 3eb58c5168..98f8930f10 100644 --- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -11,23 +11,26 @@ - - - + + - + + + + + + + - - - + + - - - + + diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj b/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj index 7451bac8bf..41dba3a55a 100644 --- a/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj @@ -4,7 +4,7 @@ netcoreapp2.2 - + MyCompanyName.MyProjectName diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestBase.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestBase.cs new file mode 100644 index 0000000000..d06f234758 --- /dev/null +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestBase.cs @@ -0,0 +1,7 @@ +namespace MyCompanyName.MyProjectName +{ + public abstract class MyProjectNameApplicationTestBase : MyProjectNameTestBase + { + + } +} \ No newline at end of file diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName/MyProjectName/MyProjectNameApplicationTestModule.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestModule.cs similarity index 100% rename from templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName/MyProjectName/MyProjectNameApplicationTestModule.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestModule.cs diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/Samples/SampleAppService_Tests.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/Samples/SampleAppService_Tests.cs new file mode 100644 index 0000000000..ba55181a1c --- /dev/null +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/Samples/SampleAppService_Tests.cs @@ -0,0 +1,21 @@ +using System.Threading.Tasks; +using Xunit; + +namespace MyCompanyName.MyProjectName.Samples +{ + public class SampleAppService_Tests : MyProjectNameDomainTestBase + { + //private readonly SampleAppService _sampleAppService; + + public SampleAppService_Tests() + { + //_sampleAppService = GetRequiredService(); + } + + [Fact] + public async Task Method1Async() + { + + } + } +} diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj b/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj index fa8a0e6ae7..f318fa557f 100644 --- a/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj @@ -4,7 +4,7 @@ netcoreapp2.2 - + MyCompanyName.MyProjectName diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestBase.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestBase.cs similarity index 100% rename from templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestBase.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestBase.cs diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestModule.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestModule.cs similarity index 100% rename from templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestModule.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestModule.cs diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/Samples/SampleManager_Tests.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/Samples/SampleManager_Tests.cs new file mode 100644 index 0000000000..18757e02ee --- /dev/null +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/Samples/SampleManager_Tests.cs @@ -0,0 +1,21 @@ +using System.Threading.Tasks; +using Xunit; + +namespace MyCompanyName.MyProjectName.Samples +{ + public class SampleManager_Tests : MyProjectNameDomainTestBase + { + //private readonly SampleManager _sampleManager; + + public SampleManager_Tests() + { + //_sampleManager = GetRequiredService(); + } + + [Fact] + public async Task Method1Async() + { + + } + } +} diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestBase.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestBase.cs new file mode 100644 index 0000000000..66920011c2 --- /dev/null +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestBase.cs @@ -0,0 +1,7 @@ +namespace MyCompanyName.MyProjectName.EntityFrameworkCore +{ + public abstract class MyProjectNameEntityFrameworkCoreTestBase : MyProjectNameTestBase + { + + } +} \ No newline at end of file diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs similarity index 96% rename from templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs index 9c555de7a6..9944306812 100644 --- a/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs @@ -2,7 +2,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage; -using Microsoft.Extensions.DependencyInjection; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Modularity; diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs new file mode 100644 index 0000000000..007c46a6ed --- /dev/null +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs @@ -0,0 +1,9 @@ +using MyCompanyName.MyProjectName.Samples; + +namespace MyCompanyName.MyProjectName.EntityFrameworkCore.Samples +{ + public class SampleRepository_Tests : SampleRepository_Tests + { + + } +} diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj b/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj index 07fb1b020e..093567c430 100644 --- a/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj @@ -4,7 +4,7 @@ netcoreapp2.2 - + MyCompanyName.MyProjectName diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyEntityRepository_Tests.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyEntityRepository_Tests.cs deleted file mode 100644 index 09111d2f39..0000000000 --- a/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyEntityRepository_Tests.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace MyCompanyName.MyProjectName.EntityFrameworkCore -{ - public class MyEntityRepository_Tests : MyEntityRepository_Tests - { - - } -} diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestBase.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestBase.cs new file mode 100644 index 0000000000..fde63712f6 --- /dev/null +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestBase.cs @@ -0,0 +1,7 @@ +namespace MyCompanyName.MyProjectName.MongoDB +{ + public abstract class MyProjectNameMongoDbTestBase : MyProjectNameTestBase + { + + } +} \ No newline at end of file diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbTestModule.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs similarity index 92% rename from templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbTestModule.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs index e1cc8a627a..00bdedc999 100644 --- a/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbTestModule.cs +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs @@ -1,5 +1,4 @@ -using Microsoft.Extensions.DependencyInjection; -using Mongo2Go; +using Mongo2Go; using Volo.Abp; using Volo.Abp.Data; using Volo.Abp.Modularity; diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs new file mode 100644 index 0000000000..e4aeb3f36f --- /dev/null +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs @@ -0,0 +1,9 @@ +using MyCompanyName.MyProjectName.Samples; + +namespace MyCompanyName.MyProjectName.MongoDB.Samples +{ + public class SampleRepository_Tests : SampleRepository_Tests + { + + } +} diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj b/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj index 2592dd9973..6e94bf289a 100644 --- a/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj @@ -4,7 +4,7 @@ netcoreapp2.2 - + MyCompanyName.MyProjectName diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyEntityRepository_Tests.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyEntityRepository_Tests.cs deleted file mode 100644 index f797ff7067..0000000000 --- a/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyEntityRepository_Tests.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace MyCompanyName.MyProjectName.MongoDB -{ - public class MyEntityRepository_Tests : MyEntityRepository_Tests - { - - } -} diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj index 5c4d2085f9..445896bbe4 100644 --- a/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj @@ -4,7 +4,7 @@ netcoreapp2.2 - + MyCompanyName.MyProjectName diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyEntityRepository_Tests.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyEntityRepository_Tests.cs deleted file mode 100644 index b3dfbda4ad..0000000000 --- a/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyEntityRepository_Tests.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Modularity; -using Xunit; - -namespace MyCompanyName.MyProjectName -{ - public abstract class MyEntityRepository_Tests : MyProjectNameTestBase - where TStartupModule : IAbpModule - { - [Fact] - public async Task Test1() - { - - } - } -} diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBase.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs similarity index 100% rename from templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBase.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBaseModule.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBaseModule.cs similarity index 100% rename from templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBaseModule.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBaseModule.cs diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestData.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestData.cs similarity index 100% rename from templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestData.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestData.cs diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestDataBuilder.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestDataBuilder.cs similarity index 100% rename from templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestDataBuilder.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestDataBuilder.cs diff --git a/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/Samples/SampleRepository_Tests.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/Samples/SampleRepository_Tests.cs new file mode 100644 index 0000000000..5c61f24fff --- /dev/null +++ b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/Samples/SampleRepository_Tests.cs @@ -0,0 +1,23 @@ +using System.Threading.Tasks; +using Volo.Abp.Modularity; +using Xunit; + +namespace MyCompanyName.MyProjectName.Samples +{ + public abstract class SampleRepository_Tests : MyProjectNameTestBase + where TStartupModule : IAbpModule + { + //private readonly ISampleRepository _sampleRepository; + + protected SampleRepository_Tests() + { + //_sampleRepository = GetRequiredService(); + } + + [Fact] + public async Task Method1Async() + { + + } + } +}