Fixed #72

Author: ENikS

package.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>5.7.3</Version>
+    <Version>5.7.4</Version>
     <PackageReleaseNotes>This package is distributed as .NET Standard 1.0, .NET 4.0, 4.5, 4.6, 4.7 package.</PackageReleaseNotes>
   </PropertyGroup>
 

src/Policy/BuildPlanCreator/GenericLazyBuildPlanCreatorPolicy.cs

@@ -1,6 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using Unity.Builder;
@@ -16,6 +14,7 @@ public class GenericLazyBuildPlanCreatorPolicy : IBuildPlanCreatorPolicy
     {
         private static readonly MethodInfo BuildResolveLazyMethod;
         private static readonly MethodInfo BuildResolveAllLazyMethod;
+        private static readonly MethodInfo BuildResolveLazyEnumerableMethod;
 
         static GenericLazyBuildPlanCreatorPolicy()
         {
@@ -26,6 +25,9 @@ static GenericLazyBuildPlanCreatorPolicy()
 
             BuildResolveAllLazyMethod =
                 info.GetDeclaredMethod(nameof(BuildResolveAllLazy));
+
+            BuildResolveLazyEnumerableMethod =
+                info.GetDeclaredMethod(nameof(BuildResolveLazyEnumerable));
         }
 
         /// <summary>
@@ -47,9 +49,10 @@ private static DynamicBuildPlanMethod CreateBuildPlanMethod(Type lazyType)
 
             MethodInfo lazyMethod;
 
-            if (itemType.GetTypeInfo().IsGenericType && itemType.GetGenericTypeDefinition() == typeof(IEnumerable<>))
+            var info = itemType.GetTypeInfo();
+            if (info.IsGenericType && itemType.GetGenericTypeDefinition() == typeof(IEnumerable<>))
             {
-                lazyMethod = BuildResolveAllLazyMethod.MakeGenericMethod(itemType.GetTypeInfo().GenericTypeArguments[0]);
+                lazyMethod = BuildResolveLazyEnumerableMethod.MakeGenericMethod(itemType.GetTypeInfo().GenericTypeArguments[0]);
             }
             else
             {
@@ -66,18 +69,26 @@ private static void BuildResolveLazy<T>(IBuilderContext context)
                 context.Existing = new Lazy<T>(() => context.Container.Resolve<T>(context.BuildKey.Name));
             }
 
-            // match the behavior of DynamicMethodConstructorStrategy
+            context.SetPerBuildSingleton();
+        }
+
+        private static void BuildResolveLazyEnumerable<T>(IBuilderContext context)
+        {
+            if (context.Existing == null)
+            {
+                context.Existing = new Lazy<IEnumerable<T>>(() => context.Container.Resolve<IEnumerable<T>>());
+            }
+
             context.SetPerBuildSingleton();
         }
 
         private static void BuildResolveAllLazy<T>(IBuilderContext context)
         {
             if (context.Existing == null)
             {
-                context.Existing = new Lazy<IEnumerable<T>>(() => context.Container.ResolveAll<T>());
+                context.Existing = new Lazy<T[]>(() => (T[])context.Container.ResolveAll<T>());
             }
 
-            // match the behavior of DynamicMethodConstructorStrategy
             context.SetPerBuildSingleton();
         }
     }

src/Strategies/ArrayResolveStrategy.cs

@@ -42,8 +42,8 @@ public override void PreBuildUp(IBuilderContext context)
                 var type = context.OriginalBuildKey.Type.GetElementType();
                 var info = type.GetTypeInfo();
                 var buildMethod = info.IsGenericType && typeof(Lazy<>) == info.GetGenericTypeDefinition()
-                                ? _resolveLazyMethod.MakeGenericMethod().CreateDelegate(typeof(DynamicBuildPlanMethod))
-                                : _resolveMethod.MakeGenericMethod().CreateDelegate(typeof(DynamicBuildPlanMethod));
+                                ? _resolveLazyMethod.MakeGenericMethod(type).CreateDelegate(typeof(DynamicBuildPlanMethod))
+                                : _resolveMethod.MakeGenericMethod(type).CreateDelegate(typeof(DynamicBuildPlanMethod));
 
                 plan = new DynamicMethodBuildPlan((DynamicBuildPlanMethod)buildMethod);
                 context.Registration.Set(typeof(IBuildPlanPolicy), plan);

src/Strategies/BuildKeyMappingStrategy.cs

@@ -102,7 +102,7 @@ public override bool RequiredToBuildType(IUnityContainer container, INamedType n
 
         private bool AnalysStaticRegistration(IUnityContainer container, ContainerRegistration registration, params InjectionMember[] injectionMembers)
         {
-            // Validate imput
+            // Validate input
             if (null == registration.MappedToType || registration.RegisteredType == registration.MappedToType) return false;
 
             // Require Re-Resolve if no injectors specified

src/Strategies/BuildPlanStrategy.cs

@@ -25,7 +25,7 @@ public class BuildPlanStrategy : BuilderStrategy
         public override void PreBuildUp(IBuilderContext context)
         {
             var plan = context.Registration.Get<IBuildPlanPolicy>() ??
-                       (IBuildPlanPolicy)GetExtended(context.Policies, typeof(IBuildPlanPolicy), 
+                       (IBuildPlanPolicy)GetGeneric(context.Policies, typeof(IBuildPlanPolicy), 
                                                      context.OriginalBuildKey, 
                                                      context.OriginalBuildKey.Type);
 
@@ -52,14 +52,12 @@ public override void PreBuildUp(IBuilderContext context)
 
         public static TPolicyInterface GetPolicy<TPolicyInterface>(IPolicyList list, INamedType buildKey)
         {
-            return (TPolicyInterface)(GetExtended(list, typeof(TPolicyInterface), buildKey, buildKey.Type) ??
+            return (TPolicyInterface)(GetGeneric(list, typeof(TPolicyInterface), buildKey, buildKey.Type) ??
                                       list.Get(null, null, typeof(TPolicyInterface), out _));    // Nothing! Get Default
         }
 
-        private static IBuilderPolicy GetExtended(IPolicyList list, Type policyInterface, INamedType buildKey, Type buildType)
+        private static IBuilderPolicy GetGeneric(IPolicyList list, Type policyInterface, INamedType buildKey, Type buildType)
         {
-            if (null == buildType) return null;
-
             // Check if generic
             if (buildType.GetTypeInfo().IsGenericType)
             {
@@ -68,8 +66,7 @@ private static IBuilderPolicy GetExtended(IPolicyList list, Type policyInterface
                        list.Get(newType, string.Empty, policyInterface, out _);
             }
 
-            // Check default for type
-            return list.Get(buildType, string.Empty, policyInterface, out _);
+            return null;
         }
 
         private static IBuildPlanCreatorPolicy CheckIfOpenGeneric(IPolicySet namedType)