Refactored.

src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionAbpExtensions.cs → src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionApplicationExtensions.cs

@@ -5,7 +5,7 @@ using Volo.Abp.Modularity;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
-    public static class ServiceCollectionAbpExtensions
+    public static class ServiceCollectionApplicationExtensions
     {
         public static AbpApplication AddApplication<TStartupModule>(
             [NotNull] this IServiceCollection services)

src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
 using Volo.DependencyInjection;
 
 namespace Microsoft.Extensions.DependencyInjection
@@ -27,5 +29,40 @@ namespace Microsoft.Extensions.DependencyInjection
 
             return conventionalRegistrars;
         }
+
+        public static IServiceCollection AddAssemblyOf<T>(this IServiceCollection services)
+        {
+            return services.AddAssembly(typeof(T).GetTypeInfo().Assembly);
+        }
+
+        public static IServiceCollection AddAssembly(this IServiceCollection services, Assembly assembly)
+        {
+            foreach (var registrar in services.GetConventionalRegistrars())
+            {
+                registrar.AddAssembly(services, assembly);
+            }
+
+            return services;
+        }
+
+        public static IServiceCollection AddTypes(this IServiceCollection services, params Type[] types)
+        {
+            foreach (var registrar in services.GetConventionalRegistrars())
+            {
+                registrar.AddTypes(services, types);
+            }
+
+            return services;
+        }
+
+        public static IServiceCollection AddType(this IServiceCollection services, Type type)
+        {
+            foreach (var registrar in services.GetConventionalRegistrars())
+            {
+                registrar.AddType(services, type);
+            }
+
+            return services;
+        }
     }
 }

src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Reflection;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    public static class ServiceCollectionRegistrationExtensions
-    {
-        public static IServiceCollection AddAssemblyOf<T>(this IServiceCollection services)
-        {
-            return services.AddAssembly(typeof(T).GetTypeInfo().Assembly);
-        }
-
-        public static IServiceCollection AddAssembly(this IServiceCollection services, Assembly assembly)
-        {
-            foreach (var registrar in services.GetConventionalRegistrars())
-            {
-                registrar.AddAssembly(services, assembly);
-            }
-
-            return services;
-        }
-
-        public static IServiceCollection AddTypes(this IServiceCollection services, params Type[] types)
-        {
-            foreach (var registrar in services.GetConventionalRegistrars())
-            {
-                registrar.AddTypes(services, types);
-            }
-
-            return services;
-        }
-
-        public static IServiceCollection AddType(this IServiceCollection services, Type type)
-        {
-            foreach (var registrar in services.GetConventionalRegistrars())
-            {
-                registrar.AddType(services, type);
-            }
-
-            return services;
-        }
-    }
-}

src/Volo.Abp/System/TypeExtensions.cs

@@ -0,0 +1,12 @@
+using System.Reflection;
+
+namespace System
+{
+    public static class TypeExtensions
+    {
+        public static Assembly GetAssembly(this Type type)
+        {
+            return type.GetTypeInfo().Assembly;
+        }
+    }
+}