From cc204b6f79469d8ab35dfc7fd586de58aa39d693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Sun, 11 Mar 2018 01:04:27 +0300 Subject: [PATCH] Created Volo.Abp.Ddd.Application module. --- Volo.Abp.sln | 20 +++++++++--------- .../AbpDesk.Application.Contracts.csproj | 2 +- .../AbpDesk.Domain/AbpDesk.Domain.csproj | 2 +- .../AbpDesk/AbpDeskDomainModule.cs | 4 ++-- src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll | Bin 13824 -> 13824 bytes .../Volo.Abp.AspNetCore.Mvc.csproj | 2 +- .../AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs | 2 +- .../Linq/AbpPagingQueryableExtensions.cs | 0 .../Volo.Abp.Ddd.Application.csproj} | 4 ++-- .../Application/AbpDddApplicationModule.cs | 0 .../Volo/Abp/Application/Dtos/EntityDto.cs | 0 .../Volo/Abp/Application/Dtos/IEntityDto.cs | 0 .../Abp/Application/Dtos/IHasTotalCount.cs | 0 .../Application/Dtos/ILimitedResultRequest.cs | 0 .../Volo/Abp/Application/Dtos/IListResult.cs | 0 .../Dtos/IPagedAndSortedResultRequest.cs | 0 .../Volo/Abp/Application/Dtos/IPagedResult.cs | 0 .../Application/Dtos/IPagedResultRequest.cs | 0 .../Application/Dtos/ISortedResultRequest.cs | 0 .../Dtos/LimitedResultRequestDto.cs | 0 .../Abp/Application/Dtos/ListResultDto.cs | 0 .../Dtos/PagedAndSortedResultRequestDto.cs | 0 .../Abp/Application/Dtos/PagedResultDto.cs | 0 .../Application/Dtos/PagedResultRequestDto.cs | 0 .../Services/ApplicationService.cs | 0 .../Services/AsyncCrudAppService.cs | 0 .../Application/Services/CrudAppService.cs | 0 .../Services/CrudAppServiceBase.cs | 0 .../Services/IApplicationService.cs | 0 .../Services/IAsyncCrudAppService.cs | 0 .../Application/Services/ICrudAppService.cs | 0 .../Volo.Abp.Ddd.csproj.DotSettings | 2 -- .../Volo.Abp.EntityFrameworkCore.csproj | 3 +-- .../AbpEntityFrameworkCoreModule.cs | 5 ++--- ....Abp.Identity.Application.Contracts.csproj | 2 +- .../Volo.Abp.Identity.Domain.csproj | 2 +- .../Abp/Identity/AbpIdentityDomainModule.cs | 4 ++-- ...dentityServer.Application.Contracts.csproj | 2 +- .../Volo.Abp.IdentityServer.Domain.csproj | 1 - .../AbpIdentityServerDomainModule.cs | 5 ++--- .../Volo.Abp.MemoryDb.csproj | 3 +-- .../Volo/Abp/MemoryDb/AbpMemoryDbModule.cs | 5 ++--- src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj | 5 ++--- .../Volo/Abp/MongoDB/AbpMongoDbModule.cs | 5 ++--- ....MultiTenancy.Application.Contracts.csproj | 2 +- .../Volo.Abp.MultiTenancy.Domain.csproj | 2 +- .../AbpMultiTenancyDomainModule.cs | 4 ++-- ...p.Permissions.Application.Contracts.csproj | 2 +- .../Volo.Abp.Permissions.Domain.csproj | 2 +- .../Permissions/AbpPermissionsDomainModule.cs | 4 ++-- .../Volo.Abp.Settings.Domain.csproj | 2 +- .../Abp/Settings/AbpSettingsDomainModule.cs | 4 ++-- .../Volo.Abp.AutoMapper.Tests.csproj | 1 - .../AbpAutoMapperModule_Basic_Tests.cs | 1 - ...apperModule_Specific_ObjectMapper_Tests.cs | 1 - ...utoMapper_ConfigurationValidation_Tests.cs | 1 - .../Volo/Abp/AutoMapper/AutofacTestModule.cs | 2 -- .../Abp/AutoMapper/SampleClasses/MyEntity.cs | 5 +++-- .../AutoMapper/SampleClasses/MyEntityDto.cs | 5 +++-- .../AutoMapper/SampleClasses/MyEntityDto2.cs | 5 +++-- .../SampleClasses/MyNotMappedDto.cs | 5 +++-- .../Volo.Abp.Ddd.Tests.csproj | 2 +- .../Volo.Abp.EventBus.Tests.csproj | 2 +- .../Identity/AbpIdentityTestDataBuilder.cs | 1 - .../Volo.Abp.Permissions.Tests.csproj | 1 + .../Volo.Abp.Settings.Tests.csproj | 1 + test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj | 2 +- 67 files changed, 63 insertions(+), 74 deletions(-) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/System/Linq/AbpPagingQueryableExtensions.cs (100%) rename src/{Volo.Abp.Ddd/Volo.Abp.Ddd.csproj => Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.csproj} (91%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/AbpDddApplicationModule.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/EntityDto.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/IEntityDto.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/IHasTotalCount.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/ILimitedResultRequest.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/IListResult.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/IPagedAndSortedResultRequest.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/IPagedResult.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/IPagedResultRequest.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/ISortedResultRequest.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/ListResultDto.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/PagedAndSortedResultRequestDto.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/PagedResultDto.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Dtos/PagedResultRequestDto.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Services/ApplicationService.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Services/AsyncCrudAppService.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Services/CrudAppService.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Services/CrudAppServiceBase.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Services/IApplicationService.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Services/IAsyncCrudAppService.cs (100%) rename src/{Volo.Abp.Ddd => Volo.Abp.Ddd.Application}/Volo/Abp/Application/Services/ICrudAppService.cs (100%) delete mode 100644 src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj.DotSettings diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 06d52df3c0..583cb2a2bf 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -174,8 +174,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Security", "src\Vo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Session", "src\Volo.Abp.Session\Volo.Abp.Session.csproj", "{2FCC8412-8558-465A-A659-025A7BB88F2C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Ddd", "src\Volo.Abp.Ddd\Volo.Abp.Ddd.csproj", "{020D0322-A427-406C-988A-C65196EC6DA2}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Guids", "src\Volo.Abp.Guids\Volo.Abp.Guids.csproj", "{75C24B75-7B8A-4FC5-9DE4-91BF6168BCC0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Threading", "src\Volo.Abp.Threading\Volo.Abp.Threading.csproj", "{B17BAA37-27E8-4421-A18B-DDF6D146EA06}" @@ -302,11 +300,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Authent EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Authentication.OAuth.Tests", "test\Volo.Abp.AspNetCore.Authentication.OAuth.Tests\Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj", "{627B88DB-BDCF-4D92-8454-EFE95F4AFB7A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Uow", "src\Volo.Abp.Uow\Volo.Abp.Uow.csproj", "{23C5849D-4C09-4588-AE32-E31F03B7ED63}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Uow", "src\Volo.Abp.Uow\Volo.Abp.Uow.csproj", "{23C5849D-4C09-4588-AE32-E31F03B7ED63}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Uow.Tests", "test\Volo.Abp.Uow.Tests\Volo.Abp.Uow.Tests.csproj", "{9FC49D82-04E5-4170-8618-682BD3350910}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Uow.Tests", "test\Volo.Abp.Uow.Tests\Volo.Abp.Uow.Tests.csproj", "{9FC49D82-04E5-4170-8618-682BD3350910}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Ddd.Domain", "src\Volo.Abp.Ddd.Domain\Volo.Abp.Ddd.Domain.csproj", "{D1318094-7907-4826-B5F3-CFFC741F235F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Ddd.Domain", "src\Volo.Abp.Ddd.Domain\Volo.Abp.Ddd.Domain.csproj", "{D1318094-7907-4826-B5F3-CFFC741F235F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Ddd.Application", "src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj", "{5AB7E368-1CC8-401D-9952-6CA6779305E7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -590,10 +590,6 @@ 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 @@ -814,6 +810,10 @@ Global {D1318094-7907-4826-B5F3-CFFC741F235F}.Debug|Any CPU.Build.0 = Debug|Any CPU {D1318094-7907-4826-B5F3-CFFC741F235F}.Release|Any CPU.ActiveCfg = Release|Any CPU {D1318094-7907-4826-B5F3-CFFC741F235F}.Release|Any CPU.Build.0 = Release|Any CPU + {5AB7E368-1CC8-401D-9952-6CA6779305E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5AB7E368-1CC8-401D-9952-6CA6779305E7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5AB7E368-1CC8-401D-9952-6CA6779305E7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5AB7E368-1CC8-401D-9952-6CA6779305E7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -897,7 +897,6 @@ 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} @@ -964,6 +963,7 @@ Global {23C5849D-4C09-4588-AE32-E31F03B7ED63} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {9FC49D82-04E5-4170-8618-682BD3350910} = {37087D1B-3693-4E96-983D-A69F210BDE53} {D1318094-7907-4826-B5F3-CFFC741F235F} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} + {5AB7E368-1CC8-401D-9952-6CA6779305E7} = {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 8274f74bbd..b498f5377e 100644 --- a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj +++ b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj b/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj index a78c2ecd3a..cae66a59a4 100644 --- a/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj +++ b/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs b/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs index 3ed7a44381..96e01ec6a9 100644 --- a/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs +++ b/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs @@ -1,12 +1,12 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp; -using Volo.Abp.Application; +using Volo.Abp.Domain; using Volo.Abp.Modularity; namespace AbpDesk { [DependsOn(typeof(AbpCommonModule))] - [DependsOn(typeof(AbpDddApplicationModule))] + [DependsOn(typeof(AbpDddDomainModule))] 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 245d0e900878db06b7e59e72e4b5a66de97ca172..c82217c5bb6036ff6de68e5e7bb06bb97b45904c 100644 GIT binary patch delta 2025 zcmZXVdu)wo9LK-E=RNQ9zUQ2`?c0m0Ug!l?mlLdL%|fkl8OyAq(quEmLNnB*hD4mA zliCb*><=@msGpV(qaU!h^5#^h=#sEd3n}Ob;3d*P3p=A`LqahN>al^6! zLi8CM&Jh`ApT2QG-uRk%RkNqhS4Le&;Hts73F9$218_N)H*&)0QvRG1svUbZy4cKTE#u5U%&^BXJ--!H+J;!4oG{ zl-Kq&vPC~Mc=H5d3uQBtgyKUgV1B1FKWny9f6jaq8sy9BwcIY_cv`kjWm?obq*X&&yMTli70)p2CVP2}MFsPd*6O8uzSF>j9H!ok^?H;OCca4F`MNf&Xr9`hQl z;5HGDwwSrk+QsUA%pA!lOu)mKH=ego0CiQTh&IaYXr&tcmfa$)qOGOiidNBYEd_1Q zDkb0deXUmT95jbIIvs-C5l=*K{{1KHa-MUysp1#8oTo(KqyP`tU%FDoFW0lPbl;B!$!B`lWk6saC_#3H$ZQc%UOmFi52p11;W%Gs(n z*uk!QD48-RP&#c|ptO2cW!3C(ue3=rT;KVs;T8w; zmdv@n;*E7n$8AJn#Jg%v%^$6t*%Z9iVCov-rD;N@Wj{bu+eC3rS^a^Pt>>J3HLaKJbD!_?ecp4P zbI$|Rl+~1N+2Cj^=WbcKFC;>-aQ@23-&pxPhH?^mA|Gqi|E4l zS}}{kOf!$g;|wO#`t>X`Ri6|=Q`BOP_<(1)W)G+HB3W`=3|sR#>!Up0Av>uwpZq)ZZ==3U{(ba#^& zi{*~Lkc0~B1~F0Gpo4vYAuJG&&8Vc;KGP1S*MJDu)-o8yImc6I-W3PyW`A8YdGp$jh4XMYRx5} zl><1XdLJpmA|40TR}|p#1n&})F-6qV2ERFFW~VM|E*j~EAET@$I$4veNyuxyB0;kt ze{4K!mbnY=D~HyrzW@$Rc?+#xeJ3eHseEfuFWs91E+tJeU1WKorP&xngRv2A3`H9H ztt39bX1wO(Ie5#N!5I!PA8{y`)Oj}XOO^Ri@fI6PnXSR`t|5=CG3QXc%qLr1hvU|B zoMV$x?fA}IO6q1*T@D6ZDSd4;Y`2x*av2q7%lVKk6-^?PI})$x}ocrFN8(jUFL4PpL?2UUVrH`PRJX zxnC*hzHckFmgb-}IKWB_+_B_1Wzz3I!-p!4utk@d2l)<73CDR38n9ccQpOM0JXk+N zll5iXwl$Or+jiiHA?ug9BXnYo$pVO@4}n2M7qW>qaug>h7AO`G6ER!G3lvKfOBE{> zS1Yy>li_4?%^aeQ5@I%LDKD^^Wm;3PksYuWU@&D$5!lA2S>+g}#2&UotH*x!g}xU* z;gr#V7PeSBM=ao7Xk|XnO`K$BML#Yp_cA*zOm?09ZVe_5v_>$-uefvB9URp1*(ju1 zGuR|lu%)aIr!|2%{xR{SYGs0IasLYJ<5jGHL^Vy3>@khMDb_MCO6j#imGP>H%jRv? zF15i&$N1$y3Y}(YBF9bBo7%Eh|7X2V^?S8(4QL;_n(XGQ6(kr<$G8~&|_z@s$iO(5S(Uv z6F1YH|Le=RhxG?5?S#plE~y^&8fl9Dn+u!&&ou>G?W~ErX+|G@zlZs0mLiY*-?o9? zZKmdATu=Qssu>2>hBD%sm}`D{S-HR9`3iqw=-c?2dT89hMIzLY+NIg=uiukDrZ{uT z=U3WRZP__1E>xXf?bf|B0B`W_=&kXGD7yEYl(DZNEr}fsHT&nYhB0O+X3QTN@17Kj J%e_U~_y-5`a-skL 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 ea57014bf9..045ec6a2a2 100644 --- a/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj +++ b/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj @@ -15,7 +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 85b8e1075e..5eb716085b 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 @@ -27,7 +27,7 @@ using Volo.Abp.Ui; namespace Volo.Abp.AspNetCore.Mvc { [DependsOn(typeof(AbpHttpModule))] - [DependsOn(typeof(AbpDddApplicationModule))] //TODO: Ideally, AbpAspNetCoreMvcModule should not depend on Ddd module...? + [DependsOn(typeof(AbpDddApplicationModule))] [DependsOn(typeof(AbpAspNetCoreModule))] [DependsOn(typeof(AbpUiModule))] public class AbpAspNetCoreMvcModule : AbpModule diff --git a/src/Volo.Abp.Ddd/System/Linq/AbpPagingQueryableExtensions.cs b/src/Volo.Abp.Ddd.Application/System/Linq/AbpPagingQueryableExtensions.cs similarity index 100% rename from src/Volo.Abp.Ddd/System/Linq/AbpPagingQueryableExtensions.cs rename to src/Volo.Abp.Ddd.Application/System/Linq/AbpPagingQueryableExtensions.cs diff --git a/src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj b/src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.csproj similarity index 91% rename from src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj rename to src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.csproj index 9c94ebe7b8..feeac28946 100644 --- a/src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj +++ b/src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.csproj @@ -4,8 +4,8 @@ netstandard2.0 - Volo.Abp.Ddd - Volo.Abp.Ddd + Volo.Abp.Ddd.Application + Volo.Abp.Ddd.Application $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; false false diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/AbpDddApplicationModule.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/AbpDddApplicationModule.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/AbpDddApplicationModule.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/AbpDddApplicationModule.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/EntityDto.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/EntityDto.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/EntityDto.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/EntityDto.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IEntityDto.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/IEntityDto.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IEntityDto.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/IEntityDto.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IHasTotalCount.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/IHasTotalCount.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IHasTotalCount.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/IHasTotalCount.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/ILimitedResultRequest.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/ILimitedResultRequest.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/ILimitedResultRequest.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/ILimitedResultRequest.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IListResult.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/IListResult.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IListResult.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/IListResult.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IPagedAndSortedResultRequest.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/IPagedAndSortedResultRequest.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IPagedAndSortedResultRequest.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/IPagedAndSortedResultRequest.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IPagedResult.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/IPagedResult.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IPagedResult.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/IPagedResult.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IPagedResultRequest.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/IPagedResultRequest.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/IPagedResultRequest.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/IPagedResultRequest.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/ISortedResultRequest.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/ISortedResultRequest.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/ISortedResultRequest.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/ISortedResultRequest.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/ListResultDto.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/ListResultDto.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/ListResultDto.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/ListResultDto.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/PagedAndSortedResultRequestDto.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/PagedAndSortedResultRequestDto.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/PagedAndSortedResultRequestDto.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/PagedAndSortedResultRequestDto.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/PagedResultDto.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/PagedResultDto.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/PagedResultDto.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/PagedResultDto.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/PagedResultRequestDto.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/PagedResultRequestDto.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Dtos/PagedResultRequestDto.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/PagedResultRequestDto.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ApplicationService.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ApplicationService.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ApplicationService.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ApplicationService.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/AsyncCrudAppService.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Services/AsyncCrudAppService.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/CrudAppService.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Services/CrudAppService.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/CrudAppServiceBase.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Services/CrudAppServiceBase.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/IApplicationService.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/IApplicationService.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Services/IApplicationService.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/IApplicationService.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/IAsyncCrudAppService.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/IAsyncCrudAppService.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Services/IAsyncCrudAppService.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/IAsyncCrudAppService.cs diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ICrudAppService.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ICrudAppService.cs similarity index 100% rename from src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ICrudAppService.cs rename to src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ICrudAppService.cs diff --git a/src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj.DotSettings b/src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj.DotSettings deleted file mode 100644 index 58ad6c8854..0000000000 --- a/src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - CSharp71 \ No newline at end of file diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj b/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj index 55a5fecd0b..d15c550d2b 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj +++ b/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj @@ -14,8 +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 976f66eaa1..c83289d2a4 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreModule.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreModule.cs @@ -1,13 +1,12 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Volo.Abp.Application; +using Volo.Abp.Domain; using Volo.Abp.Modularity; using Volo.Abp.Uow.EntityFrameworkCore; namespace Volo.Abp.EntityFrameworkCore { - [DependsOn(typeof(AbpCommonModule))] - [DependsOn(typeof(AbpDddApplicationModule))] //TODO: Is it possible to not depend DDD and seperate to another module? + [DependsOn(typeof(AbpDddDomainModule))] public class AbpEntityFrameworkCoreModule : AbpModule { public override void ConfigureServices(IServiceCollection services) 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 bbf7d8a214..42ae0d8a47 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 @@ -15,7 +15,7 @@ - + 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 9ae6d06bde..2a303fdef1 100644 --- a/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj +++ b/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj @@ -14,7 +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 f50d0f4a27..9025e5fe93 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs +++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs @@ -1,12 +1,12 @@ using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Application; +using Volo.Abp.Domain; using Volo.Abp.Modularity; using Volo.Abp.Permissions; namespace Volo.Abp.Identity { [DependsOn(typeof(AbpPermissionsDomainModule))] - [DependsOn(typeof(AbpDddApplicationModule))] + [DependsOn(typeof(AbpDddDomainModule))] [DependsOn(typeof(AbpIdentityDomainSharedModule))] public class AbpIdentityDomainModule : AbpModule { diff --git a/src/Volo.Abp.IdentityServer.Application.Contracts/Volo.Abp.IdentityServer.Application.Contracts.csproj b/src/Volo.Abp.IdentityServer.Application.Contracts/Volo.Abp.IdentityServer.Application.Contracts.csproj index 9c5066f53f..a67c0894f7 100644 --- a/src/Volo.Abp.IdentityServer.Application.Contracts/Volo.Abp.IdentityServer.Application.Contracts.csproj +++ b/src/Volo.Abp.IdentityServer.Application.Contracts/Volo.Abp.IdentityServer.Application.Contracts.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj b/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj index ad8d93ed4d..ff1c42bdb5 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj +++ b/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj @@ -15,7 +15,6 @@ - diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs index 1989e7e252..70e6eefbd9 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs @@ -1,8 +1,7 @@ using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Application; using Volo.Abp.AutoMapper; +using Volo.Abp.Domain; using Volo.Abp.Identity; -using Volo.Abp.IdentityServer.AspNetIdentity; using Volo.Abp.IdentityServer.Clients; using Volo.Abp.Modularity; using Volo.Abp.Security; @@ -10,7 +9,7 @@ using Volo.Abp.Security; namespace Volo.Abp.IdentityServer { [DependsOn(typeof(AbpIdentityServerDomainSharedModule))] - [DependsOn(typeof(AbpDddApplicationModule))] + [DependsOn(typeof(AbpDddDomainModule))] [DependsOn(typeof(AbpAutoMapperModule))] [DependsOn(typeof(AbpIdentityDomainModule))] [DependsOn(typeof(AbpSecurityModule))] diff --git a/src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.csproj b/src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.csproj index 34c25fef97..365406115e 100644 --- a/src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.csproj +++ b/src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.csproj @@ -14,8 +14,7 @@ - - + \ No newline at end of file diff --git a/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/AbpMemoryDbModule.cs b/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/AbpMemoryDbModule.cs index 2567c61e5a..341d4d1e27 100644 --- a/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/AbpMemoryDbModule.cs +++ b/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/AbpMemoryDbModule.cs @@ -1,13 +1,12 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Volo.Abp.Application; +using Volo.Abp.Domain; using Volo.Abp.Modularity; using Volo.Abp.Uow.MemoryDb; namespace Volo.Abp.MemoryDb { - [DependsOn(typeof(AbpCommonModule))] - [DependsOn(typeof(AbpDddApplicationModule))] //TODO: Is it possible to not depend DDD and seperate to another module? + [DependsOn(typeof(AbpDddDomainModule))] 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 b59ddb6118..fbf60e2a57 100644 --- a/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj +++ b/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj @@ -14,12 +14,11 @@ - - + - + diff --git a/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs b/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs index 50b34d43d7..1125d178b2 100644 --- a/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs +++ b/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs @@ -1,13 +1,12 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Volo.Abp.Application; +using Volo.Abp.Domain; using Volo.Abp.Modularity; using Volo.Abp.Uow.MongoDB; namespace Volo.Abp.MongoDB { - [DependsOn(typeof(AbpCommonModule))] - [DependsOn(typeof(AbpDddApplicationModule))] + [DependsOn(typeof(AbpDddDomainModule))] public class AbpMongoDbModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp.MultiTenancy.Application.Contracts/Volo.Abp.MultiTenancy.Application.Contracts.csproj b/src/Volo.Abp.MultiTenancy.Application.Contracts/Volo.Abp.MultiTenancy.Application.Contracts.csproj index caac0f1dfa..7a27e4868b 100644 --- a/src/Volo.Abp.MultiTenancy.Application.Contracts/Volo.Abp.MultiTenancy.Application.Contracts.csproj +++ b/src/Volo.Abp.MultiTenancy.Application.Contracts/Volo.Abp.MultiTenancy.Application.Contracts.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo.Abp.MultiTenancy.Domain.csproj b/src/Volo.Abp.MultiTenancy.Domain/Volo.Abp.MultiTenancy.Domain.csproj index 9395d1e888..a5f9ab113d 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo.Abp.MultiTenancy.Domain.csproj +++ b/src/Volo.Abp.MultiTenancy.Domain/Volo.Abp.MultiTenancy.Domain.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/AbpMultiTenancyDomainModule.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/AbpMultiTenancyDomainModule.cs index 49c41bfd64..8356754468 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/AbpMultiTenancyDomainModule.cs +++ b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/AbpMultiTenancyDomainModule.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Application; using Volo.Abp.AutoMapper; using Volo.Abp.Data; +using Volo.Abp.Domain; using Volo.Abp.Modularity; using Volo.Abp.Ui; @@ -10,7 +10,7 @@ namespace Volo.Abp.MultiTenancy [DependsOn(typeof(AbpMultiTenancyAbstractionsModule))] [DependsOn(typeof(AbpMultiTenancyDomainSharedModule))] [DependsOn(typeof(AbpDataModule))] - [DependsOn(typeof(AbpDddApplicationModule))] + [DependsOn(typeof(AbpDddDomainModule))] [DependsOn(typeof(AbpAutoMapperModule))] [DependsOn(typeof(AbpUiModule))] //TODO: It's not good to depend on the UI module. However, UserFriendlyException is inside it! public class AbpMultiTenancyDomainModule : AbpModule diff --git a/src/Volo.Abp.Permissions.Application.Contracts/Volo.Abp.Permissions.Application.Contracts.csproj b/src/Volo.Abp.Permissions.Application.Contracts/Volo.Abp.Permissions.Application.Contracts.csproj index 4ecbbf92c1..646c154703 100644 --- a/src/Volo.Abp.Permissions.Application.Contracts/Volo.Abp.Permissions.Application.Contracts.csproj +++ b/src/Volo.Abp.Permissions.Application.Contracts/Volo.Abp.Permissions.Application.Contracts.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Volo.Abp.Permissions.Domain/Volo.Abp.Permissions.Domain.csproj b/src/Volo.Abp.Permissions.Domain/Volo.Abp.Permissions.Domain.csproj index efd91d47a7..a17e68dfba 100644 --- a/src/Volo.Abp.Permissions.Domain/Volo.Abp.Permissions.Domain.csproj +++ b/src/Volo.Abp.Permissions.Domain/Volo.Abp.Permissions.Domain.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Volo.Abp.Permissions.Domain/Volo/Abp/Permissions/AbpPermissionsDomainModule.cs b/src/Volo.Abp.Permissions.Domain/Volo/Abp/Permissions/AbpPermissionsDomainModule.cs index 88d9e89007..ea3456f41a 100644 --- a/src/Volo.Abp.Permissions.Domain/Volo/Abp/Permissions/AbpPermissionsDomainModule.cs +++ b/src/Volo.Abp.Permissions.Domain/Volo/Abp/Permissions/AbpPermissionsDomainModule.cs @@ -1,14 +1,14 @@ using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Application; using Volo.Abp.Authorization; using Volo.Abp.Caching; +using Volo.Abp.Domain; using Volo.Abp.Json; using Volo.Abp.Modularity; namespace Volo.Abp.Permissions { [DependsOn(typeof(AbpAuthorizationModule))] - [DependsOn(typeof(AbpDddApplicationModule))] + [DependsOn(typeof(AbpDddDomainModule))] [DependsOn(typeof(AbpPermissionsDomainSharedModule))] [DependsOn(typeof(AbpCachingModule))] [DependsOn(typeof(AbpJsonModule))] diff --git a/src/Volo.Abp.Settings.Domain/Volo.Abp.Settings.Domain.csproj b/src/Volo.Abp.Settings.Domain/Volo.Abp.Settings.Domain.csproj index b980a78f55..6d5e501a3b 100644 --- a/src/Volo.Abp.Settings.Domain/Volo.Abp.Settings.Domain.csproj +++ b/src/Volo.Abp.Settings.Domain/Volo.Abp.Settings.Domain.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Volo.Abp.Settings.Domain/Volo/Abp/Settings/AbpSettingsDomainModule.cs b/src/Volo.Abp.Settings.Domain/Volo/Abp/Settings/AbpSettingsDomainModule.cs index 5a0e7a812f..d0c765f348 100644 --- a/src/Volo.Abp.Settings.Domain/Volo/Abp/Settings/AbpSettingsDomainModule.cs +++ b/src/Volo.Abp.Settings.Domain/Volo/Abp/Settings/AbpSettingsDomainModule.cs @@ -1,11 +1,11 @@ using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Application; +using Volo.Abp.Domain; using Volo.Abp.Modularity; namespace Volo.Abp.Settings { [DependsOn(typeof(AbpSettingsModule))] - [DependsOn(typeof(AbpDddApplicationModule))] + [DependsOn(typeof(AbpDddDomainModule))] [DependsOn(typeof(AbpSettingsDomainSharedModule))] public class AbpSettingsDomainModule : AbpModule { 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 66a9238950..acdcf18df4 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj +++ b/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj @@ -13,7 +13,6 @@ - diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AbpAutoMapperModule_Basic_Tests.cs b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AbpAutoMapperModule_Basic_Tests.cs index eb50cdd3ae..a75db5189b 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AbpAutoMapperModule_Basic_Tests.cs +++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AbpAutoMapperModule_Basic_Tests.cs @@ -3,7 +3,6 @@ using Microsoft.Extensions.DependencyInjection; using Shouldly; using Volo.Abp.AutoMapper.SampleClasses; using Volo.Abp.ObjectMapping; -using Volo.Abp.TestBase; using Xunit; namespace Volo.Abp.AutoMapper diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AbpAutoMapperModule_Specific_ObjectMapper_Tests.cs b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AbpAutoMapperModule_Specific_ObjectMapper_Tests.cs index 96c3c05eb1..c647abb57c 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AbpAutoMapperModule_Specific_ObjectMapper_Tests.cs +++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AbpAutoMapperModule_Specific_ObjectMapper_Tests.cs @@ -2,7 +2,6 @@ using Microsoft.Extensions.DependencyInjection; using Shouldly; using Volo.Abp.AutoMapper.SampleClasses; using Volo.Abp.ObjectMapping; -using Volo.Abp.TestBase; using Xunit; namespace Volo.Abp.AutoMapper 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 7ed42ef5f7..6e67d4a546 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 @@ -2,7 +2,6 @@ using Microsoft.Extensions.DependencyInjection; using Shouldly; using Volo.Abp.Modularity; -using Volo.Abp.TestBase; using Xunit; using IObjectMapper = Volo.Abp.ObjectMapping.IObjectMapper; 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 90fa128495..4a06c6d771 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutofacTestModule.cs +++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutofacTestModule.cs @@ -1,10 +1,8 @@ using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Application; using Volo.Abp.Modularity; namespace Volo.Abp.AutoMapper { - [DependsOn(typeof(AbpDddApplicationModule))] [DependsOn(typeof(AbpAutoMapperModule))] [DependsOn(typeof(AbpCommonModule))] public class AutoMapperTestModule : AbpModule diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntity.cs b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntity.cs index 8f24cb0966..ac8286cbb1 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntity.cs +++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntity.cs @@ -1,10 +1,11 @@ using System; -using Volo.Abp.Domain.Entities; namespace Volo.Abp.AutoMapper.SampleClasses { - public class MyEntity : Entity + public class MyEntity { + public Guid Id { get; set; } + public int Number { get; set; } } } diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityDto.cs b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityDto.cs index 1d34d6858a..68b57144db 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityDto.cs +++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityDto.cs @@ -1,11 +1,12 @@ using System; -using Volo.Abp.Application.Dtos; namespace Volo.Abp.AutoMapper.SampleClasses { [AutoMap(typeof(MyEntity))] - public class MyEntityDto : EntityDto + public class MyEntityDto { + public Guid Id { get; set; } + public int Number { get; set; } } } \ No newline at end of file diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityDto2.cs b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityDto2.cs index ba67552ca0..fb24c83a13 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityDto2.cs +++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityDto2.cs @@ -1,10 +1,11 @@ using System; -using Volo.Abp.Application.Dtos; namespace Volo.Abp.AutoMapper.SampleClasses { - public class MyEntityDto2 : EntityDto + public class MyEntityDto2 { + public Guid Id { get; set; } + public int Number { get; set; } } } \ No newline at end of file diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyNotMappedDto.cs b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyNotMappedDto.cs index 096da7799c..a6d33f1460 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyNotMappedDto.cs +++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyNotMappedDto.cs @@ -1,10 +1,11 @@ using System; -using Volo.Abp.Application.Dtos; namespace Volo.Abp.AutoMapper.SampleClasses { - public class MyNotMappedDto : EntityDto + public class MyNotMappedDto { + public Guid Id { get; set; } + public int Number { get; set; } } } \ No newline at end of file diff --git a/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj b/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj index 288f1cbde1..c87f48f7a4 100644 --- a/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj +++ b/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj @@ -13,8 +13,8 @@ + - diff --git a/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.csproj b/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.csproj index 87d8359990..21639175d7 100644 --- a/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.csproj +++ b/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.csproj @@ -14,8 +14,8 @@ + - diff --git a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs b/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs index acb33422ed..2b362d2f6f 100644 --- a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs +++ b/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs @@ -2,7 +2,6 @@ using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; using Volo.Abp.Permissions; -using Volo.Abp.Session; namespace Volo.Abp.Identity { diff --git a/test/Volo.Abp.Permissions.Tests/Volo.Abp.Permissions.Tests.csproj b/test/Volo.Abp.Permissions.Tests/Volo.Abp.Permissions.Tests.csproj index a22d3bc8a4..4ef6ebf992 100644 --- a/test/Volo.Abp.Permissions.Tests/Volo.Abp.Permissions.Tests.csproj +++ b/test/Volo.Abp.Permissions.Tests/Volo.Abp.Permissions.Tests.csproj @@ -14,6 +14,7 @@ + diff --git a/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.csproj b/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.csproj index d0eab4b37c..081e8358c7 100644 --- a/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.csproj +++ b/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.csproj @@ -13,6 +13,7 @@ + diff --git a/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj b/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj index 1cf8c18a2e..a073e551ec 100644 --- a/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj +++ b/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj @@ -13,7 +13,7 @@ - +