Merge branch 'master' of https://github.com/unitycontainer/container into v5.x

Author: ENikS

tests/Unity.Diagnostic/Cyclic.cs

@@ -0,0 +1,30 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Unity;
+
+namespace Compiled
+{
+
+    [TestClass]
+    public class Cyclic : Unity.Specification.Diagnostic.Cyclic.SpecificationTests
+    {
+        public override IUnityContainer GetContainer()
+        {
+            return new UnityContainer(UnityContainer.BuildStrategy.Compiled)
+                .AddExtension(new Diagnostic());
+        }
+    }
+}
+
+namespace Resolved
+{
+
+    [TestClass]
+    public class Cyclic : Unity.Specification.Diagnostic.Cyclic.SpecificationTests
+    {
+        public override IUnityContainer GetContainer()
+        {
+            return new UnityContainer(UnityContainer.BuildStrategy.Resolved)
+                .AddExtension(new Diagnostic());
+        }
+    }
+}

tests/Unity.Diagnostic/Field.cs

@@ -1,6 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Unity;
-using Unity.Extension;
 
 namespace Compiled
 {

tests/Unity.Diagnostic/Override.cs renamed to tests/Unity.Diagnostic/Overrides.cs

@@ -5,7 +5,7 @@ namespace Compiled
 {
 
     [TestClass]
-    public class Override : Unity.Specification.Diagnostic.Override.SpecificationTests
+    public class Override : Unity.Specification.Diagnostic.Overrides.SpecificationTests
     {
         public override IUnityContainer GetContainer()
         {
@@ -19,7 +19,7 @@ namespace Resolved
 {
 
     [TestClass]
-    public class Override : Unity.Specification.Diagnostic.Override.SpecificationTests
+    public class Override : Unity.Specification.Diagnostic.Overrides.SpecificationTests
     {
         public override IUnityContainer GetContainer()
         {