Move DI classes to the right namespace.

9 years ago · fa6cba7aa0
99 changed files with 101 additions and 93 deletions
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
--- 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
--- 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
 {
--- 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
 {
--- a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll
+++ b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll
--- 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
 <nav class="navbar navbar-toggleable-md navbar-inverse bg-inverse fixed-top">
    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
        <span class="navbar-toggler-icon"></span>
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/_AppLayout.cshtml
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/_AppLayout.cshtml
@ -1,4 +1,4 @@
-@using Volo.Abp.UI.Navigation
+@using Volo.Abp.Ui.Navigation
@{
    Layout = null;
 }
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
@ -2,7 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.EmbeddedFiles;
 using Volo.Abp.Modularity;
-using Volo.Abp.UI.Navigation;
+using Volo.Abp.Ui.Navigation;

 namespace Volo.Abp.AspNetCore.Mvc
 {
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/Bundling/BundleManager.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Bundling/BundleManager.cs
@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.AspNetCore.Mvc.Bundling
 {
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/EmbeddedDemoMainMenuContributor.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/EmbeddedDemoMainMenuContributor.cs
@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Volo.Abp.UI.Navigation;
+using Volo.Abp.Ui.Navigation;

 namespace Volo.Abp.AspNetCore.Mvc
 {
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs
@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.UI.Navigation;
+using Volo.Abp.Ui.Navigation;

 namespace Volo.Abp.AspNetCore.Mvc.Views.Shared.Components.AbpMenu
 {
--- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
@ -6,8 +6,8 @@ using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.EmbeddedFiles;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Modularity;
-using Volo.DependencyInjection;

 namespace Volo.Abp.AspNetCore.Mvc
 {
--- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpController.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpController.cs
@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.AspNetCore.Mvc
 {
--- a/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
+++ b/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
@ -2,7 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo;
 using Volo.Abp;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Microsoft.AspNetCore.Builder
 {
--- a/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/EmbeddedFiles/EmbeddedResourceFileProvider.cs
+++ b/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/EmbeddedFiles/EmbeddedResourceFileProvider.cs
@ -3,8 +3,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.EmbeddedFiles;
-using Volo.DependencyInjection;

 namespace Volo.Abp.AspNetCore.EmbeddedFiles
 {
--- a/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/EmbeddedFiles/EmbeddedResourceViewFileProvider.cs
+++ b/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/EmbeddedFiles/EmbeddedResourceViewFileProvider.cs
@ -1,6 +1,6 @@
 using System;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.EmbeddedFiles;
-using Volo.DependencyInjection;

 namespace Volo.Abp.AspNetCore.EmbeddedFiles
 {
--- a/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Modularity/ApplicationInitializationContextExtensions.cs
+++ b/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Modularity/ApplicationInitializationContextExtensions.cs
@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.AspNetCore.Modularity
 {
--- a/src/Volo.Abp.AspNetCore/Volo/Abp/ServiceProviderAccessorExtensions.cs
+++ b/src/Volo.Abp.AspNetCore/Volo/Abp/ServiceProviderAccessorExtensions.cs
@ -1,7 +1,7 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp
 {
--- a/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapperObjectMapper.cs
+++ b/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapperObjectMapper.cs
@ -1,8 +1,8 @@
 using System;
 using AutoMapper;
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.ObjectMapping;
-using Volo.DependencyInjection;

 namespace Volo.Abp.AutoMapper
 {
--- a/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs
+++ b/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs
@ -5,6 +5,7 @@ using Autofac.Core;
 using Autofac.Extras.DynamicProxy;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Castle.DynamicProxy;
+using Volo.Abp.DependencyInjection;

 namespace Autofac.Builder
 {
--- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextConfigurationContext.cs
+++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextConfigurationContext.cs
@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.EntityFrameworkCore.DependencyInjection
 {
--- a/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
+++ b/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
@ -4,7 +4,7 @@ using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.EmbeddedFiles;
 using Volo.Abp.Identity.Web.Navigation;
 using Volo.Abp.Modularity;
-using Volo.Abp.UI.Navigation;
+using Volo.Abp.Ui.Navigation;

 namespace Volo.Abp.Identity.Web
 {
--- a/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
+++ b/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Volo.Abp.UI.Navigation;
+using Volo.Abp.Ui.Navigation;

 namespace Volo.Abp.Identity.Web.Navigation
 {
--- a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleStore.cs
+++ b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleStore.cs
@ -7,9 +7,9 @@ using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Guids;
 using Volo.Abp.Uow;
-using Volo.DependencyInjection;

 namespace Volo.Abp.Identity
 {
--- a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserStore.cs
+++ b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserStore.cs
@ -8,9 +8,9 @@ using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Guids;
 using Volo.Abp.Uow;
-using Volo.DependencyInjection;

 namespace Volo.Abp.Identity
 {
--- a/src/Volo.Abp.MultiTenancy/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver.cs
+++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver.cs
@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
-using Volo.DependencyInjection;

 namespace Volo.Abp.Data.MultiTenancy
 {
--- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs
+++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs
@ -1,6 +1,6 @@
 using System;
 using System.Threading;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.MultiTenancy
 {
--- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStore.cs
+++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStore.cs
@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.MultiTenancy.ConfigurationStore
 {
--- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveContext.cs
+++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveContext.cs
@ -1,5 +1,5 @@
 using JetBrains.Annotations;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.MultiTenancy
 {
--- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs
+++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs
@ -4,7 +4,7 @@ using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.MultiTenancy
 {
--- a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs
+++ b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs
@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Microsoft.Extensions.DependencyInjection
 {
--- a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs
+++ b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs
@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Microsoft.Extensions.DependencyInjection
 {
--- a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs
+++ b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs
@ -1,5 +1,5 @@
 using System;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Microsoft.Extensions.DependencyInjection
 {
--- a/src/Volo.Abp/System/AbpStringExtensions.cs
+++ b/src/Volo.Abp/System/AbpStringExtensions.cs
@ -3,6 +3,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 using Volo;
+using Volo.Abp;

 namespace System
 {
--- a/src/Volo.Abp/System/Collections/Generic/AbpCollectionExtensions.cs
+++ b/src/Volo.Abp/System/Collections/Generic/AbpCollectionExtensions.cs
@ -1,6 +1,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 using Volo;
+using Volo.Abp;

 namespace System.Collections.Generic
 {
--- a/src/Volo.Abp/System/Collections/Generic/AbpListExtensions.cs
+++ b/src/Volo.Abp/System/Collections/Generic/AbpListExtensions.cs
@ -1,6 +1,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 using Volo;
+using Volo.Abp;

 namespace System.Collections.Generic
 {
--- a/src/Volo.Abp/Volo/Abp/AbpKernelModule.cs
+++ b/src/Volo.Abp/Volo/Abp/AbpKernelModule.cs
@ -1,10 +1,10 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Reflection;
 using Volo.Abp.Uow;
-using Volo.DependencyInjection;

 namespace Volo.Abp
 {
--- a/src/Volo.Abp/Volo/Abp/Application/Services/IApplicationService.cs
+++ b/src/Volo.Abp/Volo/Abp/Application/Services/IApplicationService.cs
@ -1,4 +1,4 @@
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Application.Services
 {
--- a/src/Volo.Abp/Volo/Abp/Check.cs
+++ b/src/Volo.Abp/Volo/Abp/Check.cs
@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;

-namespace Volo
+namespace Volo.Abp
 {
    [DebuggerStepThrough]
    public static class Check
--- a/src/Volo.Abp/Volo/Abp/Data/DefaultConnectionStringResolver.cs
+++ b/src/Volo.Abp/Volo/Abp/Data/DefaultConnectionStringResolver.cs
@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Data
 {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/AutoRegistrationHelper.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/AutoRegistrationHelper.cs
@ -4,7 +4,7 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public static class AutoRegistrationHelper
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs
@ -4,7 +4,7 @@ using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Reflection;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public abstract class ConventionalRegistrarBase : IConventionalRegistrar
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarList.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarList.cs
@ -1,7 +1,6 @@
 using System.Collections.Generic;
-using Volo.DependencyInjection;

-namespace Microsoft.Extensions.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    internal class ConventionalRegistrarList : List<IConventionalRegistrar>
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/DefaultConventionalRegistrar.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/DefaultConventionalRegistrar.cs
@ -3,7 +3,7 @@ using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public class DefaultConventionalRegistrar : ConventionalRegistrarBase
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/DependencyAttribute.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/DependencyAttribute.cs
@ -1,7 +1,7 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public class DependencyAttribute : Attribute
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/DisableConventionalRegistrationAttribute.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/DisableConventionalRegistrationAttribute.cs
@ -1,6 +1,6 @@
 using System;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public class DisableConventionalRegistrationAttribute : Attribute
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs
@ -1,6 +1,6 @@
 using System;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public class ExposeServicesAttribute : Attribute, IExposedServiceTypesProvider
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IConventionalRegistrar.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IConventionalRegistrar.cs
@ -2,7 +2,7 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public interface IConventionalRegistrar
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IExposedServiceTypesProvider.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IExposedServiceTypesProvider.cs
@ -1,6 +1,6 @@
 using System;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public interface IExposedServiceTypesProvider
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IObjectAccessor.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IObjectAccessor.cs
@ -1,6 +1,6 @@
 using JetBrains.Annotations;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public interface IObjectAccessor<out T>
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IOnServiceRegistredContext.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IOnServiceRegistredContext.cs
@ -2,7 +2,7 @@ using System;
 using Volo.Abp.Collections;
 using Volo.Abp.DynamicProxy;

-namespace Microsoft.Extensions.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public interface IOnServiceRegistredContext
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IScopedDependency.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IScopedDependency.cs
@ -1,4 +1,4 @@
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public interface IScopedDependency
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceExposingArgs.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceExposingArgs.cs
@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public interface IOnServiceExposingContext
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceProviderAccessor.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceProviderAccessor.cs
@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public interface IServiceProviderAccessor
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ISingletonDependency.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ISingletonDependency.cs
@ -1,4 +1,4 @@
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public interface ISingletonDependency
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ITransientDependency.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ITransientDependency.cs
@ -1,4 +1,4 @@
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public interface ITransientDependency
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ObjectAccessor.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ObjectAccessor.cs
@ -1,6 +1,6 @@
 using JetBrains.Annotations;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public class ObjectAccessor<T> : IObjectAccessor<T>
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceExposingArgs.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceExposingArgs.cs
@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public class OnServiceExposingContext : IOnServiceExposingContext
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceRegistredContext.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceRegistredContext.cs
@ -1,10 +1,9 @@
 using System;
 using JetBrains.Annotations;
-using Volo;
 using Volo.Abp.Collections;
 using Volo.Abp.DynamicProxy;

-namespace Microsoft.Extensions.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public class OnServiceRegistredContext : IOnServiceRegistredContext
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceExposingActionList.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceExposingActionList.cs
@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public class ServiceExposingActionList : List<Action<IOnServiceExposingContext>>
    {
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs
@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;

-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
    public class ServiceRegistrationActionList : List<Action<IOnServiceRegistredContext>>
    {
--- a/src/Volo.Abp/Volo/Abp/Domain/Repositories/IRepository.cs
+++ b/src/Volo.Abp/Volo/Abp/Domain/Repositories/IRepository.cs
@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities;
-using Volo.DependencyInjection;

 namespace Volo.Abp.Domain.Repositories
 {
--- a/src/Volo.Abp/Volo/Abp/Domain/Services/IDomainService.cs
+++ b/src/Volo.Abp/Volo/Abp/Domain/Services/IDomainService.cs
@ -1,4 +1,4 @@
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Domain.Services
 {
--- a/src/Volo.Abp/Volo/Abp/EmbeddedFiles/EmbeddedFileManager.cs
+++ b/src/Volo.Abp/Volo/Abp/EmbeddedFiles/EmbeddedFileManager.cs
@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.EmbeddedFiles
 {
--- a/src/Volo.Abp/Volo/Abp/Guids/SequentialGuidGenerator.cs
+++ b/src/Volo.Abp/Volo/Abp/Guids/SequentialGuidGenerator.cs
@ -1,8 +1,8 @@
 using System;
 using System.Security.Cryptography;
 using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Threading;
-using Volo.DependencyInjection;

 namespace Volo.Abp.Guids
 {
--- a/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/AbpJsonIsoDateTimeConverter.cs
+++ b/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/AbpJsonIsoDateTimeConverter.cs
@ -1,8 +1,8 @@
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Timing;
-using Volo.DependencyInjection;

 namespace Volo.Abp.Json.Newtonsoft
 {
--- a/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/NewtonsoftJsonSerializer.cs
+++ b/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/NewtonsoftJsonSerializer.cs
@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Json.Newtonsoft
 {
--- a/src/Volo.Abp/Volo/Abp/Linq/DefaultAsyncQueryableExecuter.cs
+++ b/src/Volo.Abp/Volo/Abp/Linq/DefaultAsyncQueryableExecuter.cs
@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Linq
 {
--- a/src/Volo.Abp/Volo/Abp/Modularity/IAbpModule.cs
+++ b/src/Volo.Abp/Volo/Abp/Modularity/IAbpModule.cs
@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Modularity
 {
--- a/src/Volo.Abp/Volo/Abp/Modularity/IModuleLifecycleContributer.cs
+++ b/src/Volo.Abp/Volo/Abp/Modularity/IModuleLifecycleContributer.cs
@ -1,5 +1,5 @@
 using JetBrains.Annotations;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Modularity
 {
--- a/src/Volo.Abp/Volo/Abp/Modularity/ModuleManager.cs
+++ b/src/Volo.Abp/Volo/Abp/Modularity/ModuleManager.cs
@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Modularity
 {
--- a/src/Volo.Abp/Volo/Abp/ObjectMapping/DefaultObjectMapper.cs
+++ b/src/Volo.Abp/Volo/Abp/ObjectMapping/DefaultObjectMapper.cs
@ -1,6 +1,6 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.ObjectMapping
 {
--- a/src/Volo.Abp/Volo/Abp/Reflection/AssemblyFinder.cs
+++ b/src/Volo.Abp/Volo/Abp/Reflection/AssemblyFinder.cs
@ -4,8 +4,8 @@ using System.Collections.Immutable;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Modularity;
-using Volo.DependencyInjection;

 namespace Volo.Abp.Reflection
 {
--- a/src/Volo.Abp/Volo/Abp/Reflection/TypeFinder.cs
+++ b/src/Volo.Abp/Volo/Abp/Reflection/TypeFinder.cs
@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Microsoft.Extensions.Logging;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Reflection
 {
--- a/src/Volo.Abp/Volo/Abp/Timing/Clock.cs
+++ b/src/Volo.Abp/Volo/Abp/Timing/Clock.cs
@ -1,6 +1,6 @@
 using System;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Timing
 {
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenu.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenu.cs
@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;

-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
    public class ApplicationMenu : IHasMenuItems
    {
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;

-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
    public class ApplicationMenuItem : IHasMenuItems
    {
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IHasMenuItems.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IHasMenuItems.cs
@ -1,6 +1,6 @@
 using System.Collections.Generic;

-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
    public interface IHasMenuItems
    {
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs
@ -1,6 +1,6 @@
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
    public interface IMenuConfigurationContext : IServiceProviderAccessor
    {
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuContributor.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuContributor.cs
@ -1,6 +1,6 @@
 using System.Threading.Tasks;

-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
    public interface IMenuContributor
    {
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuManager.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuManager.cs
@ -1,6 +1,6 @@
 using System.Threading.Tasks;

-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
    public interface IMenuManager
    {
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs
@ -1,6 +1,6 @@
 using System;

-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
    public class MenuConfigurationContext : IMenuConfigurationContext
    {
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuManager.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuManager.cs
@ -2,9 +2,9 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
    //TODO: We can move Navigation to a dedicated dll, or to a Volo.Abp.Ui dll.
    public class MenuManager : IMenuManager, ITransientDependency
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/NavigationOptions.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/NavigationOptions.cs
@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;

-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
    public class NavigationOptions
    {
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/StandardMenus.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/StandardMenus.cs
@ -1,4 +1,4 @@
-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
    public static class StandardMenus
    {
--- a/src/Volo.Abp/Volo/Abp/Uow/AmbientUnitOfWork.cs
+++ b/src/Volo.Abp/Volo/Abp/Uow/AmbientUnitOfWork.cs
@ -1,5 +1,5 @@
 using System.Threading;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Uow
 {
--- a/src/Volo.Abp/Volo/Abp/Uow/IDatabaseApiContainer.cs
+++ b/src/Volo.Abp/Volo/Abp/Uow/IDatabaseApiContainer.cs
@ -1,6 +1,6 @@
 using System;
 using JetBrains.Annotations;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Uow
 {
--- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs
+++ b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs
@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Uow
 {
--- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
+++ b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
@ -1,6 +1,6 @@
 using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.DynamicProxy;
-using Volo.DependencyInjection;

 namespace Volo.Abp.Uow
 {
--- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs
+++ b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs
@ -2,6 +2,7 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Application.Services;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;

 namespace Volo.Abp.Uow
--- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManager.cs
+++ b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManager.cs
@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.Abp.Uow
 {
--- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityToMyEntityDto2Mapper.cs
+++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityToMyEntityDto2Mapper.cs
@ -1,5 +1,5 @@
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.ObjectMapping;
-using Volo.DependencyInjection;

 namespace Volo.Abp.AutoMapper.SampleClasses
 {
--- a/test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs
+++ b/test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs
@ -1,7 +1,7 @@
 using System.Linq;
 using Shouldly;
-using Volo.DependencyInjection;
 using Xunit;
+using Volo.Abp.DependencyInjection;

 namespace Microsoft.Extensions.DependencyInjection
 {
--- a/test/Volo.Abp.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
+++ b/test/Volo.Abp.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
@ -5,6 +5,7 @@ using Volo.Abp.Modularity;
 using Volo.Abp.TestBase;
 using System.Collections.Generic;
 using Xunit;
+using Volo.Abp.Ui.Navigation;

 namespace Volo.Abp.UI.Navigation
 {
--- a/test/Volo.Abp.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs
+++ b/test/Volo.Abp.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs
@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using Xunit;
+using Volo.Abp.DependencyInjection;

 namespace Volo.DependencyInjection
 {
--- a/test/Volo.Abp.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs
+++ b/test/Volo.Abp.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs
@ -1,5 +1,6 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;

 namespace Volo.DependencyInjection
 {