Fixing MS.Ext.DI

Author: ENikS

src/Properties/AssemblyInfo.cs

@@ -1,5 +1,14 @@
 using System;
+using System.Runtime.CompilerServices;
 using System.Security;
 
 [assembly: CLSCompliant(true)]
 [assembly: AllowPartiallyTrustedCallers]
+
+
+[assembly: InternalsVisibleTo("Unity.Microsoft.DependencyInjection, PublicKey=" +
+                              "002400000480000094000000060200000024000052534131000400000100010037b16015885a7a" +
+                              "c3c63f3c10b23972ec0dfd6db643eaef45ea2297bdfdc53b1945017fc76fd038dc6e7bf9190024" +
+                              "d5435fa49630fdfd143e3149a1506b895fbcce017df1d4f0eac6f05f6d257be45c7be9a8aa8d3d" +
+                              "4164892dc75e7c379a22da0d986db393fbd09e4ba42398c80a305361553ef90eb3484d9cf12df9" +
+                              "0fc0e6e3")]

src/Registration/ContainerRegistration.cs

@@ -30,14 +30,14 @@ public ContainerRegistration(LinkedNode<Type, object> validators, Type mappedTo,
         /// The type that this registration is mapped to. If no type mapping was done, the
         /// <see cref="Type"/> property and this one will have the same value.
         /// </summary>
-        public Type Type { get; }
+        public virtual Type Type { get; }
 
         /// <summary>
         /// The lifetime manager for this registration.
         /// </summary>
         /// <remarks>
         /// This property will be null if this registration is for an open generic.</remarks>
-        public LifetimeManager LifetimeManager => (LifetimeManager)Value;
+        public virtual LifetimeManager LifetimeManager => (LifetimeManager)Value;
 
         #endregion
     }

src/Registration/InternalRegistration.cs

@@ -61,6 +61,17 @@ public virtual void Set(Type policyInterface, object policy)
             }
             else
             {
+                for (var node = (LinkedNode<Type, object>)this; node != null; node = node.Next)
+                {
+                    if (node.Key == policyInterface)
+                    {
+                        // Found it
+                        node.Value = policy;
+                        return;
+                    }
+                }
+
+                // If not found, insert after the current object
                 Next = new LinkedNode<Type, object>
                 {
                     Key = policyInterface,

src/UnityContainer.Implementation.cs

@@ -79,7 +79,9 @@ public partial class UnityContainer
         [DebuggerBrowsable(DebuggerBrowsableState.Never)] internal Func<Type, bool> IsTypeExplicitlyRegistered;
 
         private static readonly ContainerLifetimeManager _containerManager = new ContainerLifetimeManager();
-
+#if DEBUG
+        private string id = Guid.NewGuid().ToString();
+#endif
         #endregion