From d2fb5acca071d142b243b585cc2c96c9f26fc71b Mon Sep 17 00:00:00 2001 From: Faraj Farook Date: Sat, 24 Aug 2019 13:19:15 +1000 Subject: [PATCH] Fix self entry assembly to service loads --- .travis.yml | 2 +- Enbiso.NLib.DependencyInjection/ServiceExtensions.cs | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39ecf02..197e800 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ env: global: - - PACKAGE_VERSION="1.2.3" + - PACKAGE_VERSION="1.2.4" - PACKAGE_ICON="https://www.enbiso.com/logo.svg" - PACKAGE_PROJECT="https://nlib.enbiso.com" - PACKAGE_REPO="https://github.com/enbiso/Enbiso.NLib" diff --git a/Enbiso.NLib.DependencyInjection/ServiceExtensions.cs b/Enbiso.NLib.DependencyInjection/ServiceExtensions.cs index db320b0..09b5744 100644 --- a/Enbiso.NLib.DependencyInjection/ServiceExtensions.cs +++ b/Enbiso.NLib.DependencyInjection/ServiceExtensions.cs @@ -9,7 +9,9 @@ namespace Enbiso.NLib.DependencyInjection public static class ServiceExtensions { public static IServiceCollection AddServices(this IServiceCollection services, params Type[] typeReferences) - => services.AddServices(typeReferences.Select(t => t.Assembly).ToArray()); + { + return services.AddServices(typeReferences.Select(t => t.Assembly).ToArray()); + } public static IServiceCollection AddServices(this IServiceCollection services, params Assembly[] assemblies) { @@ -19,8 +21,10 @@ public static IServiceCollection AddServices(this IServiceCollection services, p public static IServiceCollection AddServices(this IServiceCollection services) { - var assemblies = Assembly.GetEntryAssembly().GetReferencedAssemblies().Select(Assembly.Load).ToArray(); - return services.AddServices(assemblies); + var entry = Assembly.GetEntryAssembly(); + var assemblies = entry.GetReferencedAssemblies().Select(Assembly.Load).ToList(); + assemblies.Add(entry); + return services.AddServices(assemblies.ToArray()); } private static void AddServicesForAssembly(this IServiceCollection services, Assembly assembly)