From fa6cba7aa089d741f594744480717856c5553926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Tue, 29 Aug 2017 10:26:44 +0300 Subject: [PATCH] Move DI classes to the right namespace. --- .../AbpDesk/ConsoleDemo/BlogPostLister.cs | 2 +- .../AbpDesk/ConsoleDemo/TicketLister.cs | 2 +- .../AbpDesk/ConsoleDemo/UserLister.cs | 2 +- .../AbpDesk.Domain/AbpDesk/Tickets/Ticket.cs | 1 + .../AbpDesk/Blogging/BlogPost.cs | 1 + .../AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs | 2 +- .../Navigation/MainMenuContributor.cs | 2 +- src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll | Bin 15872 -> 15872 bytes .../Shared/Components/AbpMenu/Default.cshtml | 3 ++- .../Views/Shared/_AppLayout.cshtml | 2 +- .../AbpAspNetCoreMvcUiModule.cs | 2 +- .../Bundling/BundleManager.cs | 2 +- .../EmbeddedDemoMainMenuContributor.cs | 2 +- .../AbpMenu/AbpMenuViewComponent.cs | 2 +- .../AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs | 2 +- .../Volo/Abp/AspNetCore/Mvc/AbpController.cs | 2 +- .../AbpApplicationBuilderExtensions.cs | 2 +- .../EmbeddedResourceFileProvider.cs | 2 +- .../EmbeddedResourceViewFileProvider.cs | 2 +- ...licationInitializationContextExtensions.cs | 2 +- .../Abp/ServiceProviderAccessorExtensions.cs | 2 +- .../Abp/AutoMapper/AutoMapperObjectMapper.cs | 2 +- .../AbpRegistrationBuilderExtensions.cs | 1 + .../AbpDbContextConfigurationContext.cs | 2 +- .../AbpIdentityWebModule.cs | 2 +- .../AbpIdentityWebMainMenuContributor.cs | 2 +- .../Volo/Abp/Identity/IdentityRoleStore.cs | 2 +- .../Volo/Abp/Identity/IdentityUserStore.cs | 2 +- .../MultiTenantConnectionStringResolver.cs | 2 +- .../AsyncLocalTenantScopeProvider.cs | 2 +- .../ConfigurationTenantStore.cs | 2 +- .../Abp/MultiTenancy/ITenantResolveContext.cs | 2 +- .../Abp/MultiTenancy/MultiTenancyManager.cs | 2 +- ...ctionConventionalRegistrationExtensions.cs | 2 +- ...rviceCollectionObjectAccessorExtensions.cs | 2 +- ...eCollectionRegistrationActionExtensions.cs | 2 +- src/Volo.Abp/System/AbpStringExtensions.cs | 1 + .../Generic/AbpCollectionExtensions.cs | 1 + .../Collections/Generic/AbpListExtensions.cs | 1 + src/Volo.Abp/Volo/Abp/AbpKernelModule.cs | 2 +- .../Services/IApplicationService.cs | 2 +- src/Volo.Abp/Volo/Abp/Check.cs | 2 +- .../Data/DefaultConnectionStringResolver.cs | 2 +- .../AutoRegistrationHelper.cs | 2 +- .../ConventionalRegistrarBase.cs | 2 +- .../ConventionalRegistrarList.cs | 3 +-- .../DefaultConventionalRegistrar.cs | 2 +- .../DependencyAttribute.cs | 2 +- ...isableConventionalRegistrationAttribute.cs | 2 +- .../ExposeServicesAttribute.cs | 2 +- .../IConventionalRegistrar.cs | 2 +- .../IExposedServiceTypesProvider.cs | 2 +- .../DependencyInjection/IObjectAccessor.cs | 2 +- .../IOnServiceRegistredContext.cs | 2 +- .../DependencyInjection/IScopedDependency.cs | 2 +- .../IServiceExposingArgs.cs | 2 +- .../IServiceProviderAccessor.cs | 2 +- .../ISingletonDependency.cs | 2 +- .../ITransientDependency.cs | 2 +- .../Abp/DependencyInjection/ObjectAccessor.cs | 2 +- .../OnServiceExposingArgs.cs | 2 +- .../OnServiceRegistredContext.cs | 3 +-- .../ServiceExposingActionList.cs | 2 +- .../ServiceRegistrationActionList.cs | 3 +-- .../Abp/Domain/Repositories/IRepository.cs | 2 +- .../Abp/Domain/Services/IDomainService.cs | 2 +- .../Abp/EmbeddedFiles/EmbeddedFileManager.cs | 2 +- .../Volo/Abp/Guids/SequentialGuidGenerator.cs | 2 +- .../Newtonsoft/AbpJsonIsoDateTimeConverter.cs | 2 +- .../Newtonsoft/NewtonsoftJsonSerializer.cs | 2 +- .../Abp/Linq/DefaultAsyncQueryableExecuter.cs | 2 +- .../Volo/Abp/Modularity/IAbpModule.cs | 2 +- .../Modularity/IModuleLifecycleContributer.cs | 2 +- .../Volo/Abp/Modularity/ModuleManager.cs | 2 +- .../Abp/ObjectMapping/DefaultObjectMapper.cs | 2 +- .../Volo/Abp/Reflection/AssemblyFinder.cs | 2 +- .../Volo/Abp/Reflection/TypeFinder.cs | 2 +- src/Volo.Abp/Volo/Abp/Timing/Clock.cs | 2 +- .../Volo/Abp/Ui/Navigation/ApplicationMenu.cs | 2 +- .../Abp/Ui/Navigation/ApplicationMenuItem.cs | 2 +- .../Volo/Abp/Ui/Navigation/IHasMenuItems.cs | 2 +- .../Navigation/IMenuConfigurationContext.cs | 4 ++-- .../Abp/Ui/Navigation/IMenuContributor.cs | 2 +- .../Volo/Abp/Ui/Navigation/IMenuManager.cs | 2 +- .../Ui/Navigation/MenuConfigurationContext.cs | 2 +- .../Volo/Abp/Ui/Navigation/MenuManager.cs | 4 ++-- .../Abp/Ui/Navigation/NavigationOptions.cs | 2 +- .../Volo/Abp/Ui/Navigation/StandardMenus.cs | 2 +- .../Volo/Abp/Uow/AmbientUnitOfWork.cs | 2 +- .../Volo/Abp/Uow/IDatabaseApiContainer.cs | 2 +- src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs | 2 +- .../Volo/Abp/Uow/UnitOfWorkInterceptor.cs | 2 +- .../Abp/Uow/UnitOfWorkInterceptorRegistrar.cs | 1 + .../Volo/Abp/Uow/UnitOfWorkManager.cs | 2 +- .../MyEntityToMyEntityDto2Mapper.cs | 2 +- ...onalDependencyInjectionExtensions_Tests.cs | 2 +- .../Abp/Ui/Navigation/MenuManager_Tests.cs | 1 + .../AutoRegistrationHelper_Tests.cs | 1 + .../ConventionalRegistrar_Test.cs | 1 + 99 files changed, 101 insertions(+), 93 deletions(-) diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/BlogPostLister.cs b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/BlogPostLister.cs index 4e0d170744..f0a8ae0a0d 100644 --- a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/BlogPostLister.cs +++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/BlogPostLister.cs @@ -4,7 +4,7 @@ using AbpDesk.Blogging; using Volo.Abp.Domain.Repositories; using Volo.Abp.Guids; using Volo.Abp.Uow; -using Volo.DependencyInjection; +using Volo.Abp.DependencyInjection; namespace AbpDesk.ConsoleDemo { diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/TicketLister.cs b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/TicketLister.cs index 125d732a53..ab581b337a 100644 --- a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/TicketLister.cs +++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/TicketLister.cs @@ -2,7 +2,7 @@ using System; using AbpDesk.Tickets; using AbpDesk.Tickets.Dtos; using Volo.Abp.Threading; -using Volo.DependencyInjection; +using Volo.Abp.DependencyInjection; namespace AbpDesk.ConsoleDemo { diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/UserLister.cs b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/UserLister.cs index b5aa8698d2..51a5a8f1e0 100644 --- a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/UserLister.cs +++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/UserLister.cs @@ -1,10 +1,10 @@ using System; using System.Linq; +using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; using Volo.Abp.Identity; using Volo.Abp.Threading; using Volo.Abp.Uow; -using Volo.DependencyInjection; namespace AbpDesk.ConsoleDemo { diff --git a/src/AbpDesk/AbpDesk.Domain/AbpDesk/Tickets/Ticket.cs b/src/AbpDesk/AbpDesk.Domain/AbpDesk/Tickets/Ticket.cs index ac883c0889..2a5bc4579e 100644 --- a/src/AbpDesk/AbpDesk.Domain/AbpDesk/Tickets/Ticket.cs +++ b/src/AbpDesk/AbpDesk.Domain/AbpDesk/Tickets/Ticket.cs @@ -1,6 +1,7 @@ using System; using JetBrains.Annotations; using Volo; +using Volo.Abp; using Volo.Abp.Domain.Entities; namespace AbpDesk.Tickets diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPost.cs b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPost.cs index 3ae4b3f678..352b00d21c 100644 --- a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPost.cs +++ b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPost.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using JetBrains.Annotations; using Volo; +using Volo.Abp; using Volo.Abp.Domain.Entities; namespace AbpDesk.Blogging diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs index d4643e11e8..91562c41a0 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs @@ -14,7 +14,7 @@ using Volo.Abp.Autofac; using Volo.Abp.Identity; using Volo.Abp.Identity.Web; using Volo.Abp.Modularity; -using Volo.Abp.UI.Navigation; +using Volo.Abp.Ui.Navigation; namespace AbpDesk.Web.Mvc { diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs index 2c3efe861d..bf5945ef62 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using Volo.Abp.UI.Navigation; +using Volo.Abp.Ui.Navigation; namespace AbpDesk.Web.Mvc.Navigation { diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll index 95cabe3c2367734c63941379870bad382da4901a..961a4e684bc9ab7849434669c113291bbe2489cd 100644 GIT binary patch delta 1844 zcmZvdeQZ-z7{;G-Zg)T0-rKIQv6ZrKyKLDEB@CF3%n1k!;?NBQf`I`MrV&91%XFq2 z6L66&G#5cW78pScvW#f`Kt&A+78*5d5R@s7uLusO6A@v~CBEl?|IwtszRz>s^PczI zdv0$-eM9}0*BwWLT4!W)fcYZ_pJpd)#&Qz^mB1uBG@-zr&vIFY-N?e3L*$9i4Ek~; z;E^EEkpnR40{ziUUZEBic!2E6wJ+7IT)sw(eBcM}DCEtlL`NFnB`{z zn-ga{RfJW+J&s|+gAMjXBV7xTjyOX0Ge&N>)mX=TIEk&~{i$?mDn=!U{Ba4xhKd@@ zbUE>v*~(OGg7DWl1oxXF^KC`M?@Ip|o}ip9y70Hr++>VZ0?b00BI-9KxI8|*sJJ|S zysVe%J}k2i=zg3HE2VlG_M%tyVS%>K^5J8{OGTeVm*&GI_hpJ#QJjnt!%x!&9fd3z zPgwzCPz%tKM`&RmhRrx-PNq$&h)UMUhWeSPlkSN-lkv5yRL{Zd_Y9qC>{Ic>V& zbxW{Mj#g<0XvqtRJLyWeM1?lBOLHRK(Hdq!G+T!$^?U7GH6QIpE6c}uy5K$}8in!z zjF4n>8W`Q;-Nvwcnv8{-rwpkrbY>JeR$>jQpOez1N+A`811_nqnM3MN(2xX$dGR|P zks2DY8(co~wsnHfZFoaD#X}gh_qd9*XN`WYqRjr$l{Y44_!Wj_88ibMaoEaHI69Gb&=dqYQ(>;1jk*i!$@oSdMONr5qQ1O>kk(6)jCU@TSQ`S|cA(SmLjvMDJFSYZK zR57F8oTun`^xjyrxrEeAsa}({49t^iV@k}v>8|#i)z>K=q|-wpYW3Pn%{-4-GZ9my zC-Qcgql<-?gunwL?-I+T`$>u(FQJYo8Klyrq8^PZB^miriP;0@sMI@_cnDWH1>cnM zUEZ?Ot!(|0bn+ED!%DUnTPfjdx=1{!2;OpQcmW1t2BW4#8>vJm@`zr9B#R}>B+H3O zbneCIe93Cb8p+j?b&`#e?L><{d%_U=>w(zUptKTM%m`vN(TjFsA)2M{#stS> zaKmL)5TDl;VkG%1ag60#YY~ufoFzH7qMLoG9zq@))_0KuC}!}RR*-nxoX9eHn>mG*vk8t0mV-oVF&mFgR?EuRB8Q3)e~_3;ZK;^g z>YT5#ZVV`!SQ+1`Z)Q7i)!NF6dCb_!O606MnYjZ){3F&#@fR#2ooc>c`-)A)J7FsQ zxZK}V6l+)6YW|^hT{iIt`$VP|phH!70rsgHuj3*olW#NKyj#v{B+BT3AlL6Ni|x?#j`dbBpsq(+CcZY$ot)Y`1ho)Zd4KplFqe^>jj%NTl6hnKvneGsy{c%DZ{Xfr mjWS_W5i%l~$$Y3XI#`s%BV+ZbHR&IP2gXMeO9ohEto9!u=7Q${ delta 1843 zcmZvddu$X{6vn@EXFHGGo!RX|3oWIk?b=#wl@eMg^00tFK?FjPqBT%7fd)ZQ1W|Nb zK;AUeA%=nt&?s0-h`J2{11Je1O{J8eA`o5@i4JsUTosbajI(=Py|Pn!RF`P`Xr$jrV(;HJjjIRkD6RGf`1RWwdShW z$zB~1U2=;@cmr7N_P0`ueAd;TeD_5wGvZncD1;-ZVec=k)zHx`M%MR@5zKN-@Okl# zT}3)pK>7G9_`7d+)8prV{v=VvQEl&=`V~Uf+ z%rKJplzaHZAqc01D+lvM>WC^XQUi66>=O>O@IbA;p=KKXW`^()Q^z$k(rP4PrV=eq ztC5Uc|2aJwYb-g?ThIU$$NG}$oO+x4w~Sf#Wl62WTzw9 zuCm3(c0T2Kw0J{U>60C5^;W}+6i-!zGEn6-a_LFqsNNgftt#q`i+saFh_`ao2I!(l zyc>ug@it4?Ppep}677z@j`xhFa)r(veLpKxsh+Hw;DJx64*QON76#&=Q4m*oiCkaQsp{^>-KGAlQ9n3sWFR+PRvfa%AUb$tWwKVFAF6~E$`m!UiX&;PMZs~08;oRk-aXtFWFfEdCpi2SDvif zZ1*UTUL2Ahk#!d-gP$iWe!ZmHqxE8ytQ5~^6>IV6t(08dX?IKb*O4#bn_kIHD!#|t zZia{ zg3fs6Y@-xi*`JGp^n^1XNh)rlIL`(gr?2$}WRb8=^BudSU0`k%?P#aR0(WtZIt_zz zRhC4g-RMS^xanjt@7nz-Rn*zTsfhAD<0*`IXFB!6E?P*1G|i(US3J&4;IVW}rT4t= z(s6WZE2vOxGS^ZKt~eX0Kr~yMXpma9NLAM0j@V6=93P-+<&=q!jc;iLc0{=KGwS+A zpulLOdEzVQcQwSHv{#j8W2df(Y}Dz7SR`aks@QD%#c{Q&Qml3|#42%$vPBr>)K?Va z3u~MxMH6Ylk1wf=8I*9*spSpufxV5nS(EV+ zL-MlQ8GD`@++(54$SZ!i1BJx>W1|@M5U=SWUfn~yuD%C-n9(^&D|JHjdfF{5c;JkEV$H7gV?J%@*!at+pT3XY z%?LYjG5Ld6fyPaclgm#~DSymL-MqZ?;EJWQeqC15rEve4hUpVuIC#aKl{YQ)52qg- ivGN<&t2#AaXvNWMd2u4@47ja{aKC8mpiZjpWBd>IgL<(5 diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/Components/AbpMenu/Default.cshtml b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/Components/AbpMenu/Default.cshtml index ab61aa4618..f00fcfe765 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/Components/AbpMenu/Default.cshtml +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/Components/AbpMenu/Default.cshtml @@ -1,5 +1,6 @@ @using System.Threading.Tasks -@model Volo.Abp.UI.Navigation.ApplicationMenu +@using Volo.Abp.Ui.Navigation +@model Volo.Abp.Ui.Navigation.ApplicationMenu