diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 08f4f84ac3..a02adb1d80 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -184,6 +184,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Security", "src\Vo EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Session", "src\Volo.Abp.Session\Volo.Abp.Session.csproj", "{2FCC8412-8558-465A-A659-025A7BB88F2C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Ddd", "src\Volo.Abp.Ddd\Volo.Abp.Ddd.csproj", "{020D0322-A427-406C-988A-C65196EC6DA2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Guids", "src\Volo.Abp.Guids\Volo.Abp.Guids.csproj", "{75C24B75-7B8A-4FC5-9DE4-91BF6168BCC0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Threading", "src\Volo.Abp.Threading\Volo.Abp.Threading.csproj", "{B17BAA37-27E8-4421-A18B-DDF6D146EA06}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Ddd.Tests", "test\Volo.Abp.Ddd.Tests\Volo.Abp.Ddd.Tests.csproj", "{C6CE997A-DE6F-4669-822F-5654BA72C0B0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Http.Abstractions", "src\Volo.Abp.Http.Abstractions\Volo.Abp.Http.Abstractions.csproj", "{BA4E3D59-2929-4797-A5F0-7565D76F4076}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -482,6 +492,26 @@ Global {2FCC8412-8558-465A-A659-025A7BB88F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {2FCC8412-8558-465A-A659-025A7BB88F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {2FCC8412-8558-465A-A659-025A7BB88F2C}.Release|Any CPU.Build.0 = Release|Any CPU + {020D0322-A427-406C-988A-C65196EC6DA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {020D0322-A427-406C-988A-C65196EC6DA2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {020D0322-A427-406C-988A-C65196EC6DA2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {020D0322-A427-406C-988A-C65196EC6DA2}.Release|Any CPU.Build.0 = Release|Any CPU + {75C24B75-7B8A-4FC5-9DE4-91BF6168BCC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {75C24B75-7B8A-4FC5-9DE4-91BF6168BCC0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {75C24B75-7B8A-4FC5-9DE4-91BF6168BCC0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {75C24B75-7B8A-4FC5-9DE4-91BF6168BCC0}.Release|Any CPU.Build.0 = Release|Any CPU + {B17BAA37-27E8-4421-A18B-DDF6D146EA06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B17BAA37-27E8-4421-A18B-DDF6D146EA06}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B17BAA37-27E8-4421-A18B-DDF6D146EA06}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B17BAA37-27E8-4421-A18B-DDF6D146EA06}.Release|Any CPU.Build.0 = Release|Any CPU + {C6CE997A-DE6F-4669-822F-5654BA72C0B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C6CE997A-DE6F-4669-822F-5654BA72C0B0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C6CE997A-DE6F-4669-822F-5654BA72C0B0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C6CE997A-DE6F-4669-822F-5654BA72C0B0}.Release|Any CPU.Build.0 = Release|Any CPU + {BA4E3D59-2929-4797-A5F0-7565D76F4076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BA4E3D59-2929-4797-A5F0-7565D76F4076}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BA4E3D59-2929-4797-A5F0-7565D76F4076}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BA4E3D59-2929-4797-A5F0-7565D76F4076}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -570,6 +600,11 @@ Global {87117AFB-4C87-40CB-889E-F1D97C504906} = {37087D1B-3693-4E96-983D-A69F210BDE53} {D43CC2C9-449A-4619-B5C6-CBC72BCA0512} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {2FCC8412-8558-465A-A659-025A7BB88F2C} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} + {020D0322-A427-406C-988A-C65196EC6DA2} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} + {75C24B75-7B8A-4FC5-9DE4-91BF6168BCC0} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} + {B17BAA37-27E8-4421-A18B-DDF6D146EA06} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} + {C6CE997A-DE6F-4669-822F-5654BA72C0B0} = {37087D1B-3693-4E96-983D-A69F210BDE53} + {BA4E3D59-2929-4797-A5F0-7565D76F4076} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj index b7e7872cf4..8274f74bbd 100644 --- a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj +++ b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj @@ -12,6 +12,7 @@ + diff --git a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/AbpDeskApplicationContractsModule.cs b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/AbpDeskApplicationContractsModule.cs index 7786b1df5c..c72a8b9489 100644 --- a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/AbpDeskApplicationContractsModule.cs +++ b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/AbpDeskApplicationContractsModule.cs @@ -4,6 +4,7 @@ using Volo.Abp.Modularity; namespace AbpDesk { [DependsOn(typeof(AbpCommonModule))] + [DependsOn(typeof(AbpDddModule))] public class AbpDeskApplicationContractsModule : AbpModule { diff --git a/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj b/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj index 3ee436880c..d7dcc0f7fb 100644 --- a/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj +++ b/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj @@ -12,6 +12,7 @@ + diff --git a/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs b/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs index ac0859ba17..beb05f08aa 100644 --- a/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs +++ b/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs @@ -5,6 +5,7 @@ using Volo.Abp.Modularity; namespace AbpDesk { [DependsOn(typeof(AbpCommonModule))] + [DependsOn(typeof(AbpDddModule))] public class AbpDeskDomainModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll index 11121cf4fc..e8b4663419 100644 Binary files a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll and b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll differ diff --git a/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.csproj b/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.csproj index f56ec40843..9b0906e5de 100644 --- a/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.csproj +++ b/src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.csproj @@ -14,6 +14,7 @@ + diff --git a/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs b/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs index 19ef08e8ff..eb7b505cf2 100644 --- a/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs +++ b/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs @@ -4,6 +4,7 @@ using Volo.Abp.Modularity; namespace Volo.Abp.Account { [DependsOn(typeof(AbpCommonModule))] + [DependsOn(typeof(AbpDddModule))] public class AbpAccountApplicationContractsModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj b/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj index 0eada12839..e05c8eaff1 100644 --- a/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj +++ b/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj @@ -15,6 +15,7 @@ + diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs index 0da0d28b4c..3449dffd40 100644 --- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs +++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs @@ -25,6 +25,7 @@ using Volo.Abp.Http.Modeling; namespace Volo.Abp.AspNetCore.Mvc { [DependsOn(typeof(AbpHttpModule))] + [DependsOn(typeof(AbpDddModule))] //TODO: Ideally, AbpAspNetCoreMvcModule should not depend on Ddd module...? [DependsOn(typeof(AbpAspNetCoreModule))] public class AbpAspNetCoreMvcModule : AbpModule { diff --git a/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj b/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj index d634c39cab..1ef3bbd91c 100644 --- a/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj +++ b/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj @@ -14,6 +14,7 @@ + diff --git a/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs b/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs index ef2aa5183f..aa136ba136 100644 --- a/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs +++ b/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs @@ -3,10 +3,12 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Volo.Abp.Modularity; +using Volo.Abp.Threading; namespace Volo.Abp.AspNetCore { [DependsOn(typeof(AbpCommonModule))] + [DependsOn(typeof(AbpThreadingModule))] public class AbpAspNetCoreModule : IAbpModule { public void ConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp.Core/Volo/Abp/IRemoteService.cs b/src/Volo.Abp.Core/Volo/Abp/IRemoteService.cs new file mode 100644 index 0000000000..b21ee2b6ec --- /dev/null +++ b/src/Volo.Abp.Core/Volo/Abp/IRemoteService.cs @@ -0,0 +1,6 @@ +namespace Volo.Abp.Application.Services +{ + public interface IRemoteService //TODO: Can we move this to another package? + { + } +} \ No newline at end of file diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/RemoteServiceAttribute.cs b/src/Volo.Abp.Core/Volo/Abp/RemoteServiceAttribute.cs similarity index 95% rename from src/Volo.Abp/Volo/Abp/Application/Services/RemoteServiceAttribute.cs rename to src/Volo.Abp.Core/Volo/Abp/RemoteServiceAttribute.cs index 47ad389404..c73ea3cc0b 100644 --- a/src/Volo.Abp/Volo/Abp/Application/Services/RemoteServiceAttribute.cs +++ b/src/Volo.Abp.Core/Volo/Abp/RemoteServiceAttribute.cs @@ -5,7 +5,7 @@ namespace Volo.Abp.Application.Services { [Serializable] [AttributeUsage(AttributeTargets.Interface | AttributeTargets.Class | AttributeTargets.Method)] - public class RemoteServiceAttribute : Attribute //TODO: Consider to move to another namespace (with IRemoteService)? + public class RemoteServiceAttribute : Attribute //TODO: Can we move this to another package (with IRemoteService)? { /// /// Default: true. diff --git a/src/Volo.Abp/Volo/Abp/Threading/AsyncHelper.cs b/src/Volo.Abp.Core/Volo/Abp/Threading/AsyncHelper.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Threading/AsyncHelper.cs rename to src/Volo.Abp.Core/Volo/Abp/Threading/AsyncHelper.cs diff --git a/src/Volo.Abp/Volo/Abp/Threading/InternalAsyncHelper.cs b/src/Volo.Abp.Core/Volo/Abp/Threading/InternalAsyncHelper.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Threading/InternalAsyncHelper.cs rename to src/Volo.Abp.Core/Volo/Abp/Threading/InternalAsyncHelper.cs diff --git a/src/Volo.Abp/Volo/Abp/Threading/LockExtensions.cs b/src/Volo.Abp.Core/Volo/Abp/Threading/LockExtensions.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Threading/LockExtensions.cs rename to src/Volo.Abp.Core/Volo/Abp/Threading/LockExtensions.cs diff --git a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRepositoryExtensions.cs b/src/Volo.Abp.Ddd/Microsoft/Extensions/DependencyInjection/ServiceCollectionRepositoryExtensions.cs similarity index 100% rename from src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRepositoryExtensions.cs rename to src/Volo.Abp.Ddd/Microsoft/Extensions/DependencyInjection/ServiceCollectionRepositoryExtensions.cs diff --git a/src/Volo.Abp/System/Linq/AbpPagingQueryableExtensions.cs b/src/Volo.Abp.Ddd/System/Linq/AbpPagingQueryableExtensions.cs similarity index 100% rename from src/Volo.Abp/System/Linq/AbpPagingQueryableExtensions.cs rename to src/Volo.Abp.Ddd/System/Linq/AbpPagingQueryableExtensions.cs diff --git a/src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj b/src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj new file mode 100644 index 0000000000..b2d4736906 --- /dev/null +++ b/src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj @@ -0,0 +1,27 @@ + + + + + + netstandard2.0 + Volo.Abp.Ddd + Volo.Abp.Ddd + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + + + + + + + + + + + + + + + diff --git a/src/Volo.Abp.Ddd/Volo/Abp/AbpDddModule.cs b/src/Volo.Abp.Ddd/Volo/Abp/AbpDddModule.cs new file mode 100644 index 0000000000..f9db5aa2b7 --- /dev/null +++ b/src/Volo.Abp.Ddd/Volo/Abp/AbpDddModule.cs @@ -0,0 +1,43 @@ +using System.Collections.Generic; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Application.Services; +using Volo.Abp.Data; +using Volo.Abp.Guids; +using Volo.Abp.Http; +using Volo.Abp.Http.Modeling; +using Volo.Abp.Modularity; +using Volo.Abp.MultiTenancy; +using Volo.Abp.ObjectMapping; +using Volo.Abp.Threading; +using Volo.Abp.Uow; +using Volo.Abp.Validation; + +namespace Volo.Abp +{ + [DependsOn(typeof(AbpGuidsModule))] + [DependsOn(typeof(AbpDataModule))] + [DependsOn(typeof(AbpObjectMappingModule))] + [DependsOn(typeof(AbpMultiTenancyAbstractionsModule))] + [DependsOn(typeof(AbpThreadingModule))] + [DependsOn(typeof(AbpValidationModule))] + [DependsOn(typeof(AbpHttpAbstractionsModule))] + public class AbpDddModule : AbpModule + { + public override void PreConfigureServices(IServiceCollection services) + { + services.OnRegistred(UnitOfWorkInterceptorRegistrar.RegisterIfNeeded); + services.OnRegistred(ValidationInterceptorRegistrar.RegisterIfNeeded); + } + + public override void ConfigureServices(IServiceCollection services) + { + services.Configure(options => + { + options.IgnoredInterfaces.AddIfNotContains(typeof(IRemoteService)); + options.IgnoredInterfaces.AddIfNotContains(typeof(IApplicationService)); + }); + + services.AddAssemblyOf(); + } + } +} diff --git a/src/Volo.Abp/Volo/Abp/AbpServiceBase.cs b/src/Volo.Abp.Ddd/Volo/Abp/AbpServiceBase.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/AbpServiceBase.cs rename to src/Volo.Abp.Ddd/Volo/Abp/AbpServiceBase.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/EntityDto.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/EntityDto.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/EntityDto.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/EntityDto.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/IEntityDto.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IEntityDto.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/IEntityDto.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IEntityDto.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/IHasLongTotalCount.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IHasLongTotalCount.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/IHasLongTotalCount.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IHasLongTotalCount.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/IHasTotalCount.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IHasTotalCount.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/IHasTotalCount.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IHasTotalCount.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/ILimitedResultRequest.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/ILimitedResultRequest.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/ILimitedResultRequest.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/ILimitedResultRequest.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/IListResult.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IListResult.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/IListResult.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IListResult.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/IPagedAndSortedResultRequest.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IPagedAndSortedResultRequest.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/IPagedAndSortedResultRequest.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IPagedAndSortedResultRequest.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/IPagedResult.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IPagedResult.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/IPagedResult.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IPagedResult.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/IPagedResultRequest.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IPagedResultRequest.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/IPagedResultRequest.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IPagedResultRequest.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/ISortedResultRequest.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/ISortedResultRequest.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/ISortedResultRequest.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/ISortedResultRequest.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/ListResultDto.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/ListResultDto.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/ListResultDto.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/ListResultDto.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/PagedAndSortedResultRequestDto.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/PagedAndSortedResultRequestDto.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/PagedAndSortedResultRequestDto.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/PagedAndSortedResultRequestDto.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/PagedResultDto.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/PagedResultDto.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/PagedResultDto.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/PagedResultDto.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Dtos/PagedResultRequestDto.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/PagedResultRequestDto.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Dtos/PagedResultRequestDto.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/PagedResultRequestDto.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/ApplicationService.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ApplicationService.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Services/ApplicationService.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ApplicationService.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/AsyncCrudAppService.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/AsyncCrudAppService.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Services/AsyncCrudAppService.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Services/AsyncCrudAppService.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/CrudAppService.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/CrudAppService.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Services/CrudAppService.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Services/CrudAppService.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/CrudAppServiceBase.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/CrudAppServiceBase.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Services/CrudAppServiceBase.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Services/CrudAppServiceBase.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/IApplicationService.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/IApplicationService.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Services/IApplicationService.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Services/IApplicationService.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/IAsyncCrudAppService.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/IAsyncCrudAppService.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Services/IAsyncCrudAppService.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Services/IAsyncCrudAppService.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/ICrudAppService.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ICrudAppService.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Services/ICrudAppService.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ICrudAppService.cs diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/ValidationInterceptorRegistrar.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ValidationInterceptorRegistrar.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Application/Services/ValidationInterceptorRegistrar.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ValidationInterceptorRegistrar.cs diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/CommonDbContextRegistrationOptions.cs b/src/Volo.Abp.Ddd/Volo/Abp/DependencyInjection/CommonDbContextRegistrationOptions.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/DependencyInjection/CommonDbContextRegistrationOptions.cs rename to src/Volo.Abp.Ddd/Volo/Abp/DependencyInjection/CommonDbContextRegistrationOptions.cs diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/ICommonDbContextRegistrationOptionsBuilder.cs b/src/Volo.Abp.Ddd/Volo/Abp/DependencyInjection/ICommonDbContextRegistrationOptionsBuilder.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/DependencyInjection/ICommonDbContextRegistrationOptionsBuilder.cs rename to src/Volo.Abp.Ddd/Volo/Abp/DependencyInjection/ICommonDbContextRegistrationOptionsBuilder.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Entities/AggregateRoot.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/AggregateRoot.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Entities/AggregateRoot.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/AggregateRoot.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Entities/Entity.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/Entity.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Entities/Entity.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/Entity.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Entities/EntityHelper.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/EntityHelper.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Entities/EntityHelper.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/EntityHelper.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Entities/EntityNotFoundException.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/EntityNotFoundException.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Entities/EntityNotFoundException.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/EntityNotFoundException.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Entities/IAggregateRoot.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/IAggregateRoot.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Entities/IAggregateRoot.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/IAggregateRoot.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Entities/IEntity.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/IEntity.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Entities/IEntity.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/IEntity.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Entities/IHasConcurrencyStamp.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/IHasConcurrencyStamp.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Entities/IHasConcurrencyStamp.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Entities/IHasConcurrencyStamp.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Repositories/IQueryableRepository.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/IQueryableRepository.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Repositories/IQueryableRepository.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/IQueryableRepository.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Repositories/IRepository.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/IRepository.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Repositories/IRepository.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/IRepository.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Repositories/ISupportsExplicitLoading.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/ISupportsExplicitLoading.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Repositories/ISupportsExplicitLoading.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/ISupportsExplicitLoading.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Repositories/QueryableRepositoryBase.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/QueryableRepositoryBase.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Repositories/QueryableRepositoryBase.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/QueryableRepositoryBase.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Repositories/RepositoryBase.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/RepositoryBase.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Repositories/RepositoryBase.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/RepositoryBase.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Repositories/RepositoryExtensions.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/RepositoryExtensions.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Repositories/RepositoryExtensions.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/RepositoryExtensions.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Services/DomainService.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Services/DomainService.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Services/DomainService.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Services/DomainService.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Services/IDomainService.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Services/IDomainService.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Services/IDomainService.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Services/IDomainService.cs diff --git a/src/Volo.Abp/Volo/Abp/Domain/Values/ValueObject.cs b/src/Volo.Abp.Ddd/Volo/Abp/Domain/Values/ValueObject.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Domain/Values/ValueObject.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Domain/Values/ValueObject.cs diff --git a/src/Volo.Abp/Volo/Abp/ISoftDelete.cs b/src/Volo.Abp.Ddd/Volo/Abp/ISoftDelete.cs similarity index 85% rename from src/Volo.Abp/Volo/Abp/ISoftDelete.cs rename to src/Volo.Abp.Ddd/Volo/Abp/ISoftDelete.cs index cc0d0bdef9..f1759a0bf4 100644 --- a/src/Volo.Abp/Volo/Abp/ISoftDelete.cs +++ b/src/Volo.Abp.Ddd/Volo/Abp/ISoftDelete.cs @@ -6,7 +6,7 @@ /// marked as IsDeleted = true in the database, /// but can not be retrieved to the application normally. /// - public interface ISoftDelete + public interface ISoftDelete //TODO: Move to another assembly. Data? { /// /// Used to mark an Entity as 'Deleted'. diff --git a/src/Volo.Abp/Volo/Abp/Uow/AbpDbConcurrencyException.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/AbpDbConcurrencyException.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/AbpDbConcurrencyException.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/AbpDbConcurrencyException.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/AmbientUnitOfWork.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/AmbientUnitOfWork.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/AmbientUnitOfWork.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/AmbientUnitOfWork.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/ChildUnitOfWork.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/ChildUnitOfWork.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/ChildUnitOfWork.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/ChildUnitOfWork.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/IAmbientUnitOfWork.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/IAmbientUnitOfWork.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/IAmbientUnitOfWork.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/IAmbientUnitOfWork.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/IDatabaseApi.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/IDatabaseApi.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/IDatabaseApi.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/IDatabaseApi.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/IDatabaseApiContainer.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/IDatabaseApiContainer.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/IDatabaseApiContainer.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/IDatabaseApiContainer.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/ISupportsRollback.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/ISupportsRollback.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/ISupportsRollback.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/ISupportsRollback.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/ISupportsSavingChanges.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/ISupportsSavingChanges.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/ISupportsSavingChanges.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/ISupportsSavingChanges.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/ITransactionApi.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/ITransactionApi.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/ITransactionApi.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/ITransactionApi.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/ITransactionApiContainer.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/ITransactionApiContainer.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/ITransactionApiContainer.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/ITransactionApiContainer.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWork.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/IUnitOfWork.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/IUnitOfWork.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/IUnitOfWork.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWorkAccessor.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/IUnitOfWorkAccessor.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/IUnitOfWorkAccessor.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/IUnitOfWorkAccessor.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWorkManager.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/IUnitOfWorkManager.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/IUnitOfWorkManager.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/IUnitOfWorkManager.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWorkOptions.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/IUnitOfWorkOptions.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/IUnitOfWorkOptions.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/IUnitOfWorkOptions.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWork.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWork.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkAttribute.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkAttribute.cs similarity index 97% rename from src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkAttribute.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkAttribute.cs index b54547b5fe..26a7ca51f4 100644 --- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkAttribute.cs +++ b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkAttribute.cs @@ -62,7 +62,7 @@ namespace Volo.Abp.Uow //TODO: More constructors! - internal virtual void SetOptions(UnitOfWorkOptions options) + public virtual void SetOptions(UnitOfWorkOptions options) { if (IsTransactional.HasValue) { diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs similarity index 95% rename from src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs index cb7288549d..a7f12476e0 100644 --- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs +++ b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs @@ -32,7 +32,7 @@ namespace Volo.Abp.Uow return options; } - internal bool CalculateIsTransactional(bool autoValue) + public bool CalculateIsTransactional(bool autoValue) { switch (TransactionBehavior) { diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkEventArgs.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkEventArgs.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkEventArgs.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkEventArgs.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkExtensions.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkExtensions.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkExtensions.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkExtensions.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkHelper.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkHelper.cs similarity index 98% rename from src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkHelper.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkHelper.cs index 47d42aa322..3d43dbb88e 100644 --- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkHelper.cs +++ b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkHelper.cs @@ -6,7 +6,7 @@ using Volo.Abp.Domain.Repositories; namespace Volo.Abp.Uow { - internal static class UnitOfWorkHelper + public static class UnitOfWorkHelper { public static bool IsUnitOfWorkType(TypeInfo implementationType) { diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptor.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkInterceptor.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptor.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkInterceptor.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManager.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkManager.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManager.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkManager.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkOptions.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkOptions.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkOptions.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkOptions.cs diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkTransactionBehavior.cs b/src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkTransactionBehavior.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkTransactionBehavior.cs rename to src/Volo.Abp.Ddd/Volo/Abp/Uow/UnitOfWorkTransactionBehavior.cs diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj b/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj index 9e017ac6ff..5e9abdd44d 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj +++ b/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj @@ -14,6 +14,7 @@ + diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreModule.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreModule.cs index 187f553054..013e2959b4 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreModule.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreModule.cs @@ -6,6 +6,7 @@ using Volo.Abp.Uow.EntityFrameworkCore; namespace Volo.Abp.EntityFrameworkCore { [DependsOn(typeof(AbpCommonModule))] + [DependsOn(typeof(AbpDddModule))] //TODO: Is it possible to not depend DDD and seperate to another module? public class AbpEntityFrameworkCoreModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp.Guids/Volo.Abp.Guids.csproj b/src/Volo.Abp.Guids/Volo.Abp.Guids.csproj new file mode 100644 index 0000000000..240ae4b4a6 --- /dev/null +++ b/src/Volo.Abp.Guids/Volo.Abp.Guids.csproj @@ -0,0 +1,20 @@ + + + + + + netstandard2.0 + Volo.Abp.Guids + Volo.Abp.Guids + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + + + + + + + + \ No newline at end of file diff --git a/src/Volo.Abp.Guids/Volo/Abp/Guids/AbpGuidsModule.cs b/src/Volo.Abp.Guids/Volo/Abp/Guids/AbpGuidsModule.cs new file mode 100644 index 0000000000..391d89576b --- /dev/null +++ b/src/Volo.Abp.Guids/Volo/Abp/Guids/AbpGuidsModule.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Modularity; + +namespace Volo.Abp.Guids +{ + public class AbpGuidsModule : AbpModule + { + public override void ConfigureServices(IServiceCollection services) + { + services.AddAssemblyOf(); + } + } +} diff --git a/src/Volo.Abp/Volo/Abp/Guids/IGuidGenerator.cs b/src/Volo.Abp.Guids/Volo/Abp/Guids/IGuidGenerator.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Guids/IGuidGenerator.cs rename to src/Volo.Abp.Guids/Volo/Abp/Guids/IGuidGenerator.cs diff --git a/src/Volo.Abp/Volo/Abp/Guids/SequentialGuidGenerator.cs b/src/Volo.Abp.Guids/Volo/Abp/Guids/SequentialGuidGenerator.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Guids/SequentialGuidGenerator.cs rename to src/Volo.Abp.Guids/Volo/Abp/Guids/SequentialGuidGenerator.cs diff --git a/src/Volo.Abp/Volo/Abp/Guids/SequentialGuidGeneratorOptions.cs b/src/Volo.Abp.Guids/Volo/Abp/Guids/SequentialGuidGeneratorOptions.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Guids/SequentialGuidGeneratorOptions.cs rename to src/Volo.Abp.Guids/Volo/Abp/Guids/SequentialGuidGeneratorOptions.cs diff --git a/src/Volo.Abp/Volo/Abp/Guids/SequentialGuidType.cs b/src/Volo.Abp.Guids/Volo/Abp/Guids/SequentialGuidType.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Guids/SequentialGuidType.cs rename to src/Volo.Abp.Guids/Volo/Abp/Guids/SequentialGuidType.cs diff --git a/src/Volo.Abp/Volo/Abp/Guids/SimpleGuidGenerator.cs b/src/Volo.Abp.Guids/Volo/Abp/Guids/SimpleGuidGenerator.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Guids/SimpleGuidGenerator.cs rename to src/Volo.Abp.Guids/Volo/Abp/Guids/SimpleGuidGenerator.cs diff --git a/src/Volo.Abp.Http.Abstractions/Volo.Abp.Http.Abstractions.csproj b/src/Volo.Abp.Http.Abstractions/Volo.Abp.Http.Abstractions.csproj new file mode 100644 index 0000000000..e864c8f246 --- /dev/null +++ b/src/Volo.Abp.Http.Abstractions/Volo.Abp.Http.Abstractions.csproj @@ -0,0 +1,20 @@ + + + + + + netstandard2.0 + Volo.Abp.Http.Abstractions + Volo.Abp.Http.Abstractions + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + + + + + + + + \ No newline at end of file diff --git a/src/Volo.Abp.Http.Abstractions/Volo/Abp/Http/AbpHttpAbstractionsModule.cs b/src/Volo.Abp.Http.Abstractions/Volo/Abp/Http/AbpHttpAbstractionsModule.cs new file mode 100644 index 0000000000..bc52ce811b --- /dev/null +++ b/src/Volo.Abp.Http.Abstractions/Volo/Abp/Http/AbpHttpAbstractionsModule.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Modularity; + +namespace Volo.Abp.Http +{ + public class AbpHttpAbstractionsModule : AbpModule + { + public override void ConfigureServices(IServiceCollection services) + { + services.AddAssemblyOf(); + } + } +} diff --git a/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ApiDescriptionModelOptions.cs b/src/Volo.Abp.Http.Abstractions/Volo/Abp/Http/Modeling/ApiDescriptionModelOptions.cs similarity index 82% rename from src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ApiDescriptionModelOptions.cs rename to src/Volo.Abp.Http.Abstractions/Volo/Abp/Http/Modeling/ApiDescriptionModelOptions.cs index 18b335b115..7170995c42 100644 --- a/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ApiDescriptionModelOptions.cs +++ b/src/Volo.Abp.Http.Abstractions/Volo/Abp/Http/Modeling/ApiDescriptionModelOptions.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Volo.Abp.Application.Services; using Volo.Abp.Aspects; using Volo.Abp.DependencyInjection; @@ -14,8 +13,6 @@ namespace Volo.Abp.Http.Modeling { IgnoredInterfaces = new HashSet { - typeof(IApplicationService), - typeof(IRemoteService), typeof(ITransientDependency), typeof(ISingletonDependency), typeof(IDisposable), diff --git a/src/Volo.Abp.Http/Volo.Abp.Http.csproj b/src/Volo.Abp.Http/Volo.Abp.Http.csproj index d0a34a1b8b..d7d9cb961e 100644 --- a/src/Volo.Abp.Http/Volo.Abp.Http.csproj +++ b/src/Volo.Abp.Http/Volo.Abp.Http.csproj @@ -15,6 +15,7 @@ + \ No newline at end of file diff --git a/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpModule.cs b/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpModule.cs index 84a438bb48..9cefb07a90 100644 --- a/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpModule.cs +++ b/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpModule.cs @@ -5,6 +5,7 @@ using Volo.Abp.Modularity; namespace Volo.Abp.Http { + [DependsOn(typeof(AbpHttpAbstractionsModule))] public class AbpHttpModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/JQuery/JQueryProxyScriptGenerator.cs b/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/JQuery/JQueryProxyScriptGenerator.cs index 5c399ab83a..169e9b8764 100644 --- a/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/JQuery/JQueryProxyScriptGenerator.cs +++ b/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/JQuery/JQueryProxyScriptGenerator.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Volo.Abp.Application.Services; using Volo.Abp.DependencyInjection; using Volo.Abp.Http.Modeling; @@ -12,6 +11,9 @@ namespace Volo.Abp.Http.ProxyScripting.Generators.JQuery public class JQueryProxyScriptGenerator : IProxyScriptGenerator, ITransientDependency { + //TODO: Should move this to Ddd package by adding an option to AbpHttpAbstractions module. Also duplicated of ApplicationService.CommonPostfixes + private static string[] AppServiceCommonPostfixes { get; } = { "AppService", "ApplicationService", "Service" }; + /// /// "jquery". /// @@ -189,7 +191,7 @@ namespace Volo.Abp.Http.ProxyScripting.Generators.JQuery return CamelCaseWithNamespace( typeWithAssemblyName.Split(",")[0] .Trim() - .RemovePostFix(ApplicationService.CommonPostfixes) + .RemovePostFix(AppServiceCommonPostfixes) .RemovePostFix("Controller") ); } diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj b/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj index ceadb48f32..dd7c434e4d 100644 --- a/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj +++ b/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj @@ -14,6 +14,7 @@ + diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/AbpIdentityApplicationContractsModule.cs b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/AbpIdentityApplicationContractsModule.cs index be7d5df91a..90ba1ab05d 100644 --- a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/AbpIdentityApplicationContractsModule.cs +++ b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/AbpIdentityApplicationContractsModule.cs @@ -4,6 +4,7 @@ using Volo.Abp.Modularity; namespace Volo.Abp.Identity { [DependsOn(typeof(AbpCommonModule))] + [DependsOn(typeof(AbpDddModule))] public class AbpIdentityApplicationContractsModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj b/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj index b556e486d4..4262bd1a32 100644 --- a/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj +++ b/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj @@ -14,6 +14,7 @@ + diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs index 2b2ce8be16..f3accc4ae0 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs +++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs @@ -4,6 +4,7 @@ using Volo.Abp.Modularity; namespace Volo.Abp.Identity { [DependsOn(typeof(AbpIdentityDomainSharedModule))] + [DependsOn(typeof(AbpDddModule))] public class AbpIdentityDomainModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.csproj b/src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.csproj index 784a216324..34c25fef97 100644 --- a/src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.csproj +++ b/src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.csproj @@ -14,6 +14,7 @@ + diff --git a/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/AbpMemoryDbModule.cs b/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/AbpMemoryDbModule.cs index d9a453310c..2ce9c17c9f 100644 --- a/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/AbpMemoryDbModule.cs +++ b/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/AbpMemoryDbModule.cs @@ -6,6 +6,7 @@ using Volo.Abp.Uow.MemoryDb; namespace Volo.Abp.MemoryDb { [DependsOn(typeof(AbpCommonModule))] + [DependsOn(typeof(AbpDddModule))] //TODO: Is it possible to not depend DDD and seperate to another module? public class AbpMemoryDbModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj b/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj index 66bd084d89..f205a4b071 100644 --- a/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj +++ b/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj @@ -14,6 +14,7 @@ + diff --git a/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs b/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs index 6b6e5aca36..009654e01c 100644 --- a/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs +++ b/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs @@ -6,6 +6,7 @@ using Volo.Abp.Uow.MongoDB; namespace Volo.Abp.MongoDB { [DependsOn(typeof(AbpCommonModule))] + [DependsOn(typeof(AbpDddModule))] //TODO: Is it possible to not depend DDD and seperate to another module? public class AbpMongoDbModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp.Threading/Volo.Abp.Threading.csproj b/src/Volo.Abp.Threading/Volo.Abp.Threading.csproj new file mode 100644 index 0000000000..d006d81a50 --- /dev/null +++ b/src/Volo.Abp.Threading/Volo.Abp.Threading.csproj @@ -0,0 +1,20 @@ + + + + + + netstandard2.0 + Volo.Abp.Threading + Volo.Abp.Threading + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + + + + + + + + diff --git a/src/Volo.Abp/Volo/Abp/Linq/DefaultAsyncQueryableExecuter.cs b/src/Volo.Abp.Threading/Volo/Abp/Linq/DefaultAsyncQueryableExecuter.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Linq/DefaultAsyncQueryableExecuter.cs rename to src/Volo.Abp.Threading/Volo/Abp/Linq/DefaultAsyncQueryableExecuter.cs diff --git a/src/Volo.Abp/Volo/Abp/Linq/IAsyncQueryableExecuter.cs b/src/Volo.Abp.Threading/Volo/Abp/Linq/IAsyncQueryableExecuter.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Linq/IAsyncQueryableExecuter.cs rename to src/Volo.Abp.Threading/Volo/Abp/Linq/IAsyncQueryableExecuter.cs diff --git a/src/Volo.Abp.Threading/Volo/Abp/Threading/AbpThreadingModule.cs b/src/Volo.Abp.Threading/Volo/Abp/Threading/AbpThreadingModule.cs new file mode 100644 index 0000000000..fd54f380ac --- /dev/null +++ b/src/Volo.Abp.Threading/Volo/Abp/Threading/AbpThreadingModule.cs @@ -0,0 +1,15 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Modularity; + +namespace Volo.Abp.Threading +{ + public class AbpThreadingModule : AbpModule + { + public override void ConfigureServices(IServiceCollection services) + { + services.AddSingleton(NullCancellationTokenProvider.Instance); + + services.AddAssemblyOf(); + } + } +} diff --git a/src/Volo.Abp/Volo/Abp/Threading/CancellationTokenProviderExtensions.cs b/src/Volo.Abp.Threading/Volo/Abp/Threading/CancellationTokenProviderExtensions.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Threading/CancellationTokenProviderExtensions.cs rename to src/Volo.Abp.Threading/Volo/Abp/Threading/CancellationTokenProviderExtensions.cs diff --git a/src/Volo.Abp/Volo/Abp/Threading/ICancellationTokenProvider.cs b/src/Volo.Abp.Threading/Volo/Abp/Threading/ICancellationTokenProvider.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Threading/ICancellationTokenProvider.cs rename to src/Volo.Abp.Threading/Volo/Abp/Threading/ICancellationTokenProvider.cs diff --git a/src/Volo.Abp/Volo/Abp/Threading/NullCancellationTokenProvider.cs b/src/Volo.Abp.Threading/Volo/Abp/Threading/NullCancellationTokenProvider.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Threading/NullCancellationTokenProvider.cs rename to src/Volo.Abp.Threading/Volo/Abp/Threading/NullCancellationTokenProvider.cs diff --git a/src/Volo.Abp/Volo/Abp/AbpCommonModule.cs b/src/Volo.Abp/Volo/Abp/AbpCommonModule.cs index ce8778c292..c8225ef725 100644 --- a/src/Volo.Abp/Volo/Abp/AbpCommonModule.cs +++ b/src/Volo.Abp/Volo/Abp/AbpCommonModule.cs @@ -1,6 +1,5 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.ApiVersioning; -using Volo.Abp.Application.Services; using Volo.Abp.Data; using Volo.Abp.Localization; using Volo.Abp.Modularity; @@ -8,8 +7,6 @@ using Volo.Abp.MultiTenancy; using Volo.Abp.ObjectMapping; using Volo.Abp.Security; using Volo.Abp.Session; -using Volo.Abp.Threading; -using Volo.Abp.Uow; using Volo.Abp.Validation; using Volo.Abp.VirtualFileSystem; @@ -26,16 +23,8 @@ namespace Volo.Abp [DependsOn(typeof(AbpSessionModule))] public class AbpCommonModule : AbpModule { - public override void PreConfigureServices(IServiceCollection services) - { - services.OnRegistred(UnitOfWorkInterceptorRegistrar.RegisterIfNeeded); - services.OnRegistred(ValidationInterceptorRegistrar.RegisterIfNeeded); - } - public override void ConfigureServices(IServiceCollection services) { - services.AddSingleton(NullCancellationTokenProvider.Instance); - services.AddAssemblyOf(); } } diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/IRemoteService.cs b/src/Volo.Abp/Volo/Abp/Application/Services/IRemoteService.cs deleted file mode 100644 index 4d61398a5c..0000000000 --- a/src/Volo.Abp/Volo/Abp/Application/Services/IRemoteService.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Volo.Abp.Application.Services -{ - public interface IRemoteService - { - } -} \ No newline at end of file diff --git a/test/Volo.Abp.Core.Tests/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs b/test/AbpTestBase/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs similarity index 100% rename from test/Volo.Abp.Core.Tests/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs rename to test/AbpTestBase/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj b/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj index c7cd3b2f6d..0452b7cbd9 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj +++ b/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj @@ -13,6 +13,7 @@ + diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_ConfigurationValidation_Tests.cs b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_ConfigurationValidation_Tests.cs index f9bb52dd5e..7ed42ef5f7 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_ConfigurationValidation_Tests.cs +++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_ConfigurationValidation_Tests.cs @@ -8,7 +8,7 @@ using IObjectMapper = Volo.Abp.ObjectMapping.IObjectMapper; namespace Volo.Abp.AutoMapper { - public class AutoMapper_ConfigurationValidation_Tests : AbpIntegratedTest + public class AutoMapper_ConfigurationValidation_Tests : AbpIntegratedTest { private readonly IObjectMapper _objectMapper; @@ -26,7 +26,7 @@ namespace Volo.Abp.AutoMapper [DependsOn(typeof(AbpCommonModule))] [DependsOn(typeof(AbpAutoMapperModule))] - public class Module : AbpModule + public class TestModule : AbpModule { public override void ConfigureServices(IServiceCollection services) { diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutofacTestModule.cs b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutofacTestModule.cs index 4a06c6d771..58adcd6116 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutofacTestModule.cs +++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutofacTestModule.cs @@ -3,6 +3,7 @@ using Volo.Abp.Modularity; namespace Volo.Abp.AutoMapper { + [DependsOn(typeof(AbpDddModule))] [DependsOn(typeof(AbpAutoMapperModule))] [DependsOn(typeof(AbpCommonModule))] public class AutoMapperTestModule : AbpModule diff --git a/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj b/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj new file mode 100644 index 0000000000..e3fd3e19f6 --- /dev/null +++ b/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj @@ -0,0 +1,23 @@ + + + + netcoreapp2.0 + Volo.Abp.Ddd.Tests + Volo.Abp.Ddd.Tests + true + false + false + false + + + + + + + + + + + + + diff --git a/test/Volo.Abp.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs b/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs similarity index 100% rename from test/Volo.Abp.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs rename to test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs diff --git a/test/Volo.Abp.Tests/Volo/Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs b/test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs similarity index 97% rename from test/Volo.Abp.Tests/Volo/Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs rename to test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs index 3d74d14675..48c236c886 100644 --- a/test/Volo.Abp.Tests/Volo/Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs +++ b/test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs @@ -1,13 +1,12 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Shouldly; -using Volo.Abp.Modularity; using Volo.Abp.TestBase; using Xunit; namespace Volo.Abp.Uow { - public class UnitOfWork_Ambient_Scope_Tests : AbpIntegratedTest + public class UnitOfWork_Ambient_Scope_Tests : AbpIntegratedTest { private readonly IUnitOfWorkManager _unitOfWorkManager; diff --git a/test/Volo.Abp.Tests/Volo/Abp/Uow/UnitOfWork_Events_Tests.cs b/test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Events_Tests.cs similarity index 99% rename from test/Volo.Abp.Tests/Volo/Abp/Uow/UnitOfWork_Events_Tests.cs rename to test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Events_Tests.cs index fe8b087107..9561b34ba4 100644 --- a/test/Volo.Abp.Tests/Volo/Abp/Uow/UnitOfWork_Events_Tests.cs +++ b/test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Events_Tests.cs @@ -1,13 +1,12 @@ using System; using Microsoft.Extensions.DependencyInjection; using Shouldly; -using Volo.Abp.Modularity; using Volo.Abp.TestBase; using Xunit; namespace Volo.Abp.Uow { - public class UnitOfWork_Events_Tests : AbpIntegratedTest + public class UnitOfWork_Events_Tests : AbpIntegratedTest { private readonly IUnitOfWorkManager _unitOfWorkManager; diff --git a/test/Volo.Abp.Tests/Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs b/test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs similarity index 97% rename from test/Volo.Abp.Tests/Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs rename to test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs index b8732b7bdd..e42092ad66 100644 --- a/test/Volo.Abp.Tests/Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs +++ b/test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs @@ -1,13 +1,12 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Shouldly; -using Volo.Abp.Modularity; using Volo.Abp.TestBase; using Xunit; namespace Volo.Abp.Uow { - public class UnitOfWork_Nested_Tests : AbpIntegratedTest + public class UnitOfWork_Nested_Tests : AbpIntegratedTest { private readonly IUnitOfWorkManager _unitOfWorkManager; diff --git a/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj b/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj index 5c04368a4b..1cf8c18a2e 100644 --- a/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj +++ b/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj @@ -13,6 +13,7 @@ + diff --git a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs index adc286b967..1714d543c4 100644 --- a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs +++ b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs @@ -8,6 +8,7 @@ namespace Volo.Abp.TestApp { [DependsOn(typeof(AbpAutoMapperModule))] [DependsOn(typeof(AbpCommonModule))] + [DependsOn(typeof(AbpDddModule))] public class TestAppModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj b/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj index 15e3cd8e67..61bc5faba5 100644 --- a/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj +++ b/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj @@ -13,6 +13,7 @@ + diff --git a/test/Volo.Abp.Validation.Tests/Volo/Abp/Validation/ApplicationService_Validation_Tests.cs b/test/Volo.Abp.Validation.Tests/Volo/Abp/Validation/ApplicationService_Validation_Tests.cs index c2e0f4715c..7328c95bd0 100644 --- a/test/Volo.Abp.Validation.Tests/Volo/Abp/Validation/ApplicationService_Validation_Tests.cs +++ b/test/Volo.Abp.Validation.Tests/Volo/Abp/Validation/ApplicationService_Validation_Tests.cs @@ -11,7 +11,7 @@ using Xunit; namespace Volo.Abp.Validation { - public class ApplicationService_Validation_Tests : AbpIntegratedTest + public class ApplicationService_Validation_Tests : AbpIntegratedTest { private readonly IMyAppService _myAppService; @@ -149,7 +149,8 @@ namespace Volo.Abp.Validation [DependsOn(typeof(AbpCommonModule))] //TODO: Do not depend on AbpCommonModule for this test project. [DependsOn(typeof(AbpAutofacModule))] [DependsOn(typeof(AbpValidationModule))] - public class ValidationTestModule : AbpModule + [DependsOn(typeof(AbpDddModule))] + public class TestModule : AbpModule { public override void ConfigureServices(IServiceCollection services) {