diff --git a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacRegistration.cs b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacRegistration.cs
index e0f7ec50ad..f1a6264683 100644
--- a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacRegistration.cs
+++ b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacRegistration.cs
@@ -1,6 +1,6 @@
 // This software is part of the Autofac IoC container
 // Copyright © 2015 Autofac Contributors
-// http://autofac.org
+// https://autofac.org
 //
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
@@ -24,10 +24,13 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using Autofac.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Autofac;
+using Volo.Abp;
 using Volo.Abp.Modularity;
 
 namespace Autofac.Extensions.DependencyInjection
@@ -46,16 +49,62 @@ namespace Autofac.Extensions.DependencyInjection
         /// The <see cref="ContainerBuilder"/> into which the registrations should be made.
         /// </param>
         /// <param name="services">
-        /// The set of service descriptors to register in the container.
+        /// A container builder that can be used to create an <see cref="IServiceProvider" />.
         /// </param>
         public static void Populate(
-                this ContainerBuilder builder,
-                IServiceCollection services)
+            this ContainerBuilder builder,
+            IServiceCollection services)
         {
-            builder.RegisterType<AutofacServiceProvider>().As<IServiceProvider>();
-            builder.RegisterType<AutofacServiceScopeFactory>().As<IServiceScopeFactory>();
+            Populate(builder, services, null);
+        }
+
+        /// <summary>
+        /// Populates the Autofac container builder with the set of registered service descriptors
+        /// and makes <see cref="IServiceProvider"/> and <see cref="IServiceScopeFactory"/>
+        /// available in the container. Using this overload is incompatible with the ASP.NET Core
+        /// support for <see cref="IServiceProviderFactory{TContainerBuilder}"/>.
+        /// </summary>
+        /// <param name="builder">
+        /// The <see cref="ContainerBuilder"/> into which the registrations should be made.
+        /// </param>
+        /// <param name="services">
+        /// A container builder that can be used to create an <see cref="IServiceProvider" />.
+        /// </param>
+        /// <param name="lifetimeScopeTagForSingletons">
+        /// If provided and not <see langword="null"/> then all registrations with lifetime <see cref="ServiceLifetime.Singleton" /> are registered
+        /// using <see cref="IRegistrationBuilder{TLimit,TActivatorData,TRegistrationStyle}.InstancePerMatchingLifetimeScope" />
+        /// with provided <paramref name="lifetimeScopeTagForSingletons"/>
+        /// instead of using <see cref="IRegistrationBuilder{TLimit,TActivatorData,TRegistrationStyle}.SingleInstance"/>.
+        /// </param>
+        /// <remarks>
+        /// <para>
+        /// Specifying a <paramref name="lifetimeScopeTagForSingletons"/> addresses a specific case where you have
+        /// an application that uses Autofac but where you need to isolate a set of services in a child scope. For example,
+        /// if you have a large application that self-hosts ASP.NET Core items, you may want to isolate the ASP.NET
+        /// Core registrations in a child lifetime scope so they don't show up for the rest of the application.
+        /// This overload allows that. Note it is the developer's responsibility to execute this and create an
+        /// <see cref="AutofacServiceProvider"/> using the child lifetime scope.
+        /// </para>
+        /// </remarks>
+        public static void Populate(
+            this ContainerBuilder builder,
+            IServiceCollection services,
+            object lifetimeScopeTagForSingletons)
+        {
+            if (services == null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
 
-            Register(builder, services);
+            builder.RegisterType<AutofacServiceProvider>().As<IServiceProvider>().ExternallyOwned();
+            var autofacServiceScopeFactory = typeof(AutofacServiceProvider).Assembly.GetType("Autofac.Extensions.DependencyInjection.AutofacServiceScopeFactory");
+            if (autofacServiceScopeFactory == null)
+            {
+                throw new AbpException("Unable get type of Autofac.Extensions.DependencyInjection.AutofacServiceScopeFactory!");
+            }
+            builder.RegisterType(autofacServiceScopeFactory).As<IServiceScopeFactory>();
+
+            Register(builder, services, lifetimeScopeTagForSingletons);
         }
 
         /// <summary>
@@ -65,18 +114,33 @@ namespace Autofac.Extensions.DependencyInjection
         /// <typeparam name="TRegistrationStyle">The object registration style.</typeparam>
         /// <param name="registrationBuilder">The registration being built.</param>
         /// <param name="lifecycleKind">The lifecycle specified on the service registration.</param>
+        /// <param name="lifetimeScopeTagForSingleton">
+        /// If not <see langword="null"/> then all registrations with lifetime <see cref="ServiceLifetime.Singleton" /> are registered
+        /// using <see cref="IRegistrationBuilder{TLimit,TActivatorData,TRegistrationStyle}.InstancePerMatchingLifetimeScope" />
+        /// with provided <paramref name="lifetimeScopeTagForSingleton"/>
+        /// instead of using <see cref="IRegistrationBuilder{TLimit,TActivatorData,TRegistrationStyle}.SingleInstance"/>.
+        /// </param>
         /// <returns>
         /// The <paramref name="registrationBuilder" />, configured with the proper lifetime scope,
         /// and available for additional configuration.
         /// </returns>
         private static IRegistrationBuilder<object, TActivatorData, TRegistrationStyle> ConfigureLifecycle<TActivatorData, TRegistrationStyle>(
-                this IRegistrationBuilder<object, TActivatorData, TRegistrationStyle> registrationBuilder,
-                ServiceLifetime lifecycleKind)
+            this IRegistrationBuilder<object, TActivatorData, TRegistrationStyle> registrationBuilder,
+            ServiceLifetime lifecycleKind,
+            object lifetimeScopeTagForSingleton)
         {
             switch (lifecycleKind)
             {
                 case ServiceLifetime.Singleton:
-                    registrationBuilder.SingleInstance();
+                    if (lifetimeScopeTagForSingleton == null)
+                    {
+                        registrationBuilder.SingleInstance();
+                    }
+                    else
+                    {
+                        registrationBuilder.InstancePerMatchingLifetimeScope(lifetimeScopeTagForSingleton);
+                    }
+
                     break;
                 case ServiceLifetime.Scoped:
                     registrationBuilder.InstancePerLifetimeScope();
@@ -96,59 +160,67 @@ namespace Autofac.Extensions.DependencyInjection
         /// The <see cref="ContainerBuilder"/> into which the registrations should be made.
         /// </param>
         /// <param name="services">
-        /// The set of service descriptors to register in the container.
+        /// A container builder that can be used to create an <see cref="IServiceProvider" />.
+        /// </param>
+        /// <param name="lifetimeScopeTagForSingletons">
+        /// If not <see langword="null"/> then all registrations with lifetime <see cref="ServiceLifetime.Singleton" /> are registered
+        /// using <see cref="IRegistrationBuilder{TLimit,TActivatorData,TRegistrationStyle}.InstancePerMatchingLifetimeScope" />
+        /// with provided <paramref name="lifetimeScopeTagForSingletons"/>
+        /// instead of using <see cref="IRegistrationBuilder{TLimit,TActivatorData,TRegistrationStyle}.SingleInstance"/>.
         /// </param>
+        [SuppressMessage("CA2000", "CA2000", Justification = "Registrations created here are disposed when the built container is disposed.")]
         private static void Register(
-                ContainerBuilder builder,
-                IServiceCollection services)
+            ContainerBuilder builder,
+            IServiceCollection services,
+            object lifetimeScopeTagForSingletons)
         {
             var moduleContainer = services.GetSingletonInstance<IModuleContainer>();
             var registrationActionList = services.GetRegistrationActionList();
 
-            foreach (var service in services)
+            foreach (var descriptor in services)
             {
-                if (service.ImplementationType != null)
+                if (descriptor.ImplementationType != null)
                 {
                     // Test if the an open generic type is being registered
-                    var serviceTypeInfo = service.ServiceType.GetTypeInfo();
+                    var serviceTypeInfo = descriptor.ServiceType.GetTypeInfo();
                     if (serviceTypeInfo.IsGenericTypeDefinition)
                     {
                         builder
-                            .RegisterGeneric(service.ImplementationType)
-                            .As(service.ServiceType)
-                            .ConfigureLifecycle(service.Lifetime)
+                            .RegisterGeneric(descriptor.ImplementationType)
+                            .As(descriptor.ServiceType)
+                            .ConfigureLifecycle(descriptor.Lifetime, lifetimeScopeTagForSingletons)
                             .FindConstructorsWith(new AbpAutofacConstructorFinder())
                             .ConfigureAbpConventions(moduleContainer, registrationActionList);
                     }
                     else
                     {
                         builder
-                            .RegisterType(service.ImplementationType)
-                            .As(service.ServiceType)
-                            .ConfigureLifecycle(service.Lifetime)
+                            .RegisterType(descriptor.ImplementationType)
+                            .As(descriptor.ServiceType)
+                            .ConfigureLifecycle(descriptor.Lifetime, lifetimeScopeTagForSingletons)
                             .FindConstructorsWith(new AbpAutofacConstructorFinder())
                             .ConfigureAbpConventions(moduleContainer, registrationActionList);
                     }
                 }
-                else if (service.ImplementationFactory != null)
+                else if (descriptor.ImplementationFactory != null)
                 {
-                    var registration = RegistrationBuilder.ForDelegate(service.ServiceType, (context, parameters) =>
-                    {
-                        var serviceProvider = context.Resolve<IServiceProvider>();
-                        return service.ImplementationFactory(serviceProvider);
-                    })
-                    .ConfigureLifecycle(service.Lifetime)
-                    .CreateRegistration();
-                    //TODO: ConfigureAbpConventions ?
+                    var registration = RegistrationBuilder.ForDelegate(descriptor.ServiceType, (context, parameters) =>
+                        {
+                            var serviceProvider = context.Resolve<IServiceProvider>();
+                            return descriptor.ImplementationFactory(serviceProvider);
+                        })
+                        .ConfigureLifecycle(descriptor.Lifetime, lifetimeScopeTagForSingletons)
+                        .CreateRegistration();
+                        //TODO: ConfigureAbpConventions ?
 
                     builder.RegisterComponent(registration);
                 }
                 else
                 {
                     builder
-                        .RegisterInstance(service.ImplementationInstance)
-                        .As(service.ServiceType)
-                        .ConfigureLifecycle(service.Lifetime);
+                        .RegisterInstance(descriptor.ImplementationInstance)
+                        .As(descriptor.ServiceType)
+                        .ConfigureLifecycle(descriptor.Lifetime, null);
                 }
             }
         }
diff --git a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProvider.cs b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProvider.cs
deleted file mode 100644
index 1c1a24ff66..0000000000
--- a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProvider.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-// This software is part of the Autofac IoC container
-// Copyright © 2015 Autofac Contributors
-// https://autofac.org
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-using System;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Autofac.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Autofac implementation of the ASP.NET Core <see cref="IServiceProvider"/>.
-    /// </summary>
-    /// <seealso cref="System.IServiceProvider" />
-    /// <seealso cref="Microsoft.Extensions.DependencyInjection.ISupportRequiredService" />
-    public class AutofacServiceProvider : IServiceProvider, ISupportRequiredService, IDisposable
-    {
-        private readonly ILifetimeScope _lifetimeScope;
-
-        private bool _disposed = false;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AutofacServiceProvider"/> class.
-        /// </summary>
-        /// <param name="lifetimeScope">
-        /// The lifetime scope from which services will be resolved.
-        /// </param>
-        public AutofacServiceProvider(ILifetimeScope lifetimeScope)
-        {
-            this._lifetimeScope = lifetimeScope;
-        }
-
-        /// <summary>
-        /// Gets service of type <paramref name="serviceType" /> from the
-        /// <see cref="AutofacServiceProvider" /> and requires it be present.
-        /// </summary>
-        /// <param name="serviceType">
-        /// An object that specifies the type of service object to get.
-        /// </param>
-        /// <returns>
-        /// A service object of type <paramref name="serviceType" />.
-        /// </returns>
-        /// <exception cref="Autofac.Core.Registration.ComponentNotRegisteredException">
-        /// Thrown if the <paramref name="serviceType" /> isn't registered with the container.
-        /// </exception>
-        /// <exception cref="Autofac.Core.DependencyResolutionException">
-        /// Thrown if the object can't be resolved from the container.
-        /// </exception>
-        public object GetRequiredService(Type serviceType)
-        {
-            return this._lifetimeScope.Resolve(serviceType);
-        }
-
-        /// <summary>
-        /// Gets the service object of the specified type.
-        /// </summary>
-        /// <param name="serviceType">
-        /// An object that specifies the type of service object to get.
-        /// </param>
-        /// <returns>
-        /// A service object of type <paramref name="serviceType" />; or <see langword="null" />
-        /// if there is no service object of type <paramref name="serviceType" />.
-        /// </returns>
-        public object GetService(Type serviceType)
-        {
-            return this._lifetimeScope.ResolveOptional(serviceType);
-        }
-
-        /// <summary>
-        /// Gets the underlying instance of <see cref="ILifetimeScope" />.
-        /// </summary>
-        public ILifetimeScope LifetimeScope => _lifetimeScope;
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="disposing">
-        /// <see langword="true" /> to release both managed and unmanaged resources;
-        /// <see langword="false" /> to release only unmanaged resources.
-        /// </param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!this._disposed)
-            {
-                this._disposed = true;
-                if (disposing)
-                {
-                    this._lifetimeScope.Dispose();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProviderFactory.cs b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProviderFactory.cs
deleted file mode 100644
index 21a7ca331d..0000000000
--- a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProviderFactory.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// This software is part of the Autofac IoC container
-// Copyright © 2017 Autofac Contributors
-// http://autofac.org
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-using System;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Autofac.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// A factory for creating a <see cref="ContainerBuilder"/> and an <see cref="T:System.IServiceProvider" />.
-    /// </summary>
-    public class AutofacServiceProviderFactory : IServiceProviderFactory<ContainerBuilder>
-    {
-        private readonly Action<ContainerBuilder> _configurationAction;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AutofacServiceProviderFactory"/> class.
-        /// </summary>
-        /// <param name="configurationAction">Action on a <see cref="ContainerBuilder"/> that adds component registrations to the container.</param>
-        public AutofacServiceProviderFactory(Action<ContainerBuilder> configurationAction = null)
-        {
-            _configurationAction = configurationAction ?? (builder => { });
-        }
-
-        /// <summary>
-        /// Creates a container builder from an <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" />.
-        /// </summary>
-        /// <param name="services">The collection of services</param>
-        /// <returns>A container builder that can be used to create an <see cref="T:System.IServiceProvider" />.</returns>
-        public ContainerBuilder CreateBuilder(IServiceCollection services)
-        {
-            var builder = new ContainerBuilder();
-
-            builder.Populate(services);
-
-            _configurationAction(builder);
-
-            return builder;
-        }
-
-        /// <summary>
-        /// Creates an <see cref="T:System.IServiceProvider" /> from the container builder.
-        /// </summary>
-        /// <param name="containerBuilder">The container builder</param>
-        /// <returns>An <see cref="T:System.IServiceProvider" /></returns>
-        public IServiceProvider CreateServiceProvider(ContainerBuilder containerBuilder)
-        {
-            if (containerBuilder == null) throw new ArgumentNullException(nameof(containerBuilder));
-
-            var container = containerBuilder.Build();
-
-            return new AutofacServiceProvider(container);
-        }
-    }
-}
diff --git a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceScope.cs b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceScope.cs
deleted file mode 100644
index 425c6769da..0000000000
--- a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceScope.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// This software is part of the Autofac IoC container
-// Copyright © 2015 Autofac Contributors
-// http://autofac.org
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-using System;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Autofac.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Autofac implementation of the ASP.NET Core <see cref="IServiceScope"/>.
-    /// </summary>
-    /// <seealso cref="Microsoft.Extensions.DependencyInjection.IServiceScope" />
-    internal class AutofacServiceScope : IServiceScope
-    {
-        private readonly ILifetimeScope _lifetimeScope;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AutofacServiceScope"/> class.
-        /// </summary>
-        /// <param name="lifetimeScope">
-        /// The lifetime scope from which services should be resolved for this service scope.
-        /// </param>
-        public AutofacServiceScope(ILifetimeScope lifetimeScope)
-        {
-            this._lifetimeScope = lifetimeScope;
-            this.ServiceProvider = this._lifetimeScope.Resolve<IServiceProvider>();
-        }
-
-        /// <summary>
-        /// Gets an <see cref="IServiceProvider" /> corresponding to this service scope.
-        /// </summary>
-        /// <value>
-        /// An <see cref="IServiceProvider" /> that can be used to resolve dependencies from the scope.
-        /// </value>
-        public IServiceProvider ServiceProvider { get; }
-
-        /// <summary>
-        /// Disposes of the lifetime scope and resolved disposable services.
-        /// </summary>
-        public void Dispose()
-        {
-            this._lifetimeScope.Dispose();
-        }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceScopeFactory.cs b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceScopeFactory.cs
deleted file mode 100644
index 31917fd079..0000000000
--- a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceScopeFactory.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// This software is part of the Autofac IoC container
-// Copyright © 2015 Autofac Contributors
-// http://autofac.org
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Autofac.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Autofac implementation of the ASP.NET Core <see cref="IServiceScopeFactory"/>.
-    /// </summary>
-    /// <seealso cref="Microsoft.Extensions.DependencyInjection.IServiceScopeFactory" />
-    [SuppressMessage("Microsoft.ApiDesignGuidelines", "CA2213", Justification = "The creator of the root service lifetime scope is responsible for disposal.")]
-    internal class AutofacServiceScopeFactory : IServiceScopeFactory
-    {
-        private readonly ILifetimeScope _lifetimeScope;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AutofacServiceScopeFactory"/> class.
-        /// </summary>
-        /// <param name="lifetimeScope">The lifetime scope.</param>
-        public AutofacServiceScopeFactory(ILifetimeScope lifetimeScope)
-        {
-            this._lifetimeScope = lifetimeScope;
-        }
-
-        /// <summary>
-        /// Creates an <see cref="IServiceScope" /> which contains an
-        /// <see cref="System.IServiceProvider" /> used to resolve dependencies within
-        /// the scope.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="IServiceScope" /> controlling the lifetime of the scope. Once
-        /// this is disposed, any scoped services that have been resolved
-        /// from the <see cref="IServiceScope.ServiceProvider" />
-        /// will also be disposed.
-        /// </returns>
-        public IServiceScope CreateScope()
-        {
-            return new AutofacServiceScope(this._lifetimeScope.BeginLifetimeScope());
-        }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj b/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj
index ec9e4c0364..a57ac74e62 100644
--- a/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj
+++ b/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj
@@ -15,8 +15,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.0" />
     <PackageReference Include="Autofac" Version="6.0.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftPackageVersion)" />
   </ItemGroup>