diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll index 51f4fc4b06..71f0a62b45 100644 Binary files a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll and b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll differ diff --git a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionAbpExtensions.cs b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionApplicationExtensions.cs similarity index 95% rename from src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionAbpExtensions.cs rename to src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionApplicationExtensions.cs index 6d3638b8bc..bdd2139d42 100644 --- a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionAbpExtensions.cs +++ b/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( [NotNull] this IServiceCollection services) diff --git a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs index d8066fa21e..5cf620e8c6 100644 --- a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs +++ b/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(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; + } } } \ No newline at end of file diff --git a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs deleted file mode 100644 index 1eb3661534..0000000000 --- a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Reflection; - -namespace Microsoft.Extensions.DependencyInjection -{ - public static class ServiceCollectionRegistrationExtensions - { - public static IServiceCollection AddAssemblyOf(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; - } - } -} \ No newline at end of file diff --git a/src/Volo.Abp/System/TypeExtensions.cs b/src/Volo.Abp/System/TypeExtensions.cs new file mode 100644 index 0000000000..f24dfb562b --- /dev/null +++ b/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; + } + } +}