Fixes unitycontainer/unity#306

Author: ENikS

src/Extensions/Diagnostic.cs

@@ -1,6 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.Reflection;
 using Unity.Extension;
+using Unity.Factories;
+using Unity.Policy;
 
 namespace Unity
 {
@@ -44,6 +48,12 @@ protected override void Initialize()
         {
             ((UnityContainer)Container).SetDefaultPolicies = UnityContainer.SetDiagnosticPolicies;
             ((UnityContainer)Container).SetDefaultPolicies((UnityContainer)Container);
+
+            EnumerableResolver.EnumerableMethod = typeof(EnumerableResolver).GetTypeInfo()
+                                      .GetDeclaredMethod(nameof(EnumerableResolver.DiagnosticResolver));
+
+            EnumerableResolver.EnumerableFactory = typeof(EnumerableResolver).GetTypeInfo()
+                                      .GetDeclaredMethod(nameof(EnumerableResolver.DiagnosticResolverFactory));
         }
     }
 

src/Factories/EnumerableResolver.cs

@@ -11,11 +11,11 @@ public class EnumerableResolver
     {
         #region Fields
 
-        private static readonly MethodInfo EnumerableMethod =
+        internal static MethodInfo EnumerableMethod =
             typeof(EnumerableResolver).GetTypeInfo()
                                       .GetDeclaredMethod(nameof(EnumerableResolver.Resolver));
 
-        private static readonly MethodInfo EnumerableFactory =
+        internal static MethodInfo EnumerableFactory =
             typeof(EnumerableResolver).GetTypeInfo()
                                       .GetDeclaredMethod(nameof(EnumerableResolver.ResolverFactory));
 
@@ -64,6 +64,19 @@ private static ResolveDelegate<BuilderContext> ResolverFactory<TElement>()
             return (ref BuilderContext c) => ((UnityContainer)c.Container).ResolveEnumerable<TElement>(c.Resolve, type, c.Name);
         }
 
+
+        internal static object DiagnosticResolver<TElement>(ref BuilderContext context)
+        {
+            return ((UnityContainer)context.Container).ResolveEnumerable<TElement>(context.Resolve,
+                                                                                   context.Name).ToArray();
+        }
+
+        internal static ResolveDelegate<BuilderContext> DiagnosticResolverFactory<TElement>()
+        {
+            Type type = typeof(TElement).GetGenericTypeDefinition();
+            return (ref BuilderContext c) => ((UnityContainer)c.Container).ResolveEnumerable<TElement>(c.Resolve, type, c.Name).ToArray();
+        }
+
         #endregion