From 47ee3623aa9d49a0b695ac3b562e6cf90810f013 Mon Sep 17 00:00:00 2001
From: markpollack <mark.pollack@springsource.com>
Date: Tue, 24 Nov 2009 18:29:01 +0000
Subject: [PATCH] SPRNET-1239 - Check for package cycles with NDepend  (fix
 2005/2003 solutions)

---
 .../Factory/Config/IManagedCollection.cs      |  6 +--
 .../Support/ObjectDefinitionValueResolver.cs  |  2 +-
 .../Spring.Core/Spring.Core.2003.csproj       | 50 +++++++++----------
 .../Spring.Core/Spring.Core.2005.csproj       | 18 ++-----
 4 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs
index d6d12dd4..f3328e46 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs
@@ -47,17 +47,17 @@ namespace Spring.Objects.Factory.Config
 	/// <list type="bullet">
 	/// <item>
 	/// <description>
-	/// <see cref="Spring.Objects.Factory.Support.ManagedList"/>.
+	/// <see cref="Spring.Objects.Factory.Config.ManagedList"/>.
 	/// </description>
 	/// </item>
 	/// <item>
 	/// <description>
-	/// <see cref="Spring.Objects.Factory.Support.ManagedDictionary"/>.
+	/// <see cref="Spring.Objects.Factory.Config.ManagedDictionary"/>.
 	/// </description>
 	/// </item>
 	/// <item>
 	/// <description>
-	/// <see cref="Spring.Objects.Factory.Support.ManagedSet"/>.
+	/// <see cref="Spring.Objects.Factory.Config.ManagedSet"/>.
 	/// </description>
 	/// </item>
 	/// </list>
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValueResolver.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValueResolver.cs
index 6b4dc4b1..321e62c0 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValueResolver.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValueResolver.cs
@@ -81,7 +81,7 @@ namespace Spring.Objects.Factory.Support
         /// </item>
         /// <item>
         /// <p>
-        /// An <see cref="Spring.Objects.Factory.Support.IManagedCollection"/>. This is a
+        /// An <see cref="Spring.Objects.Factory.Config.IManagedCollection"/>. This is a
         /// special placeholder collection that may contain
         /// <see cref="Spring.Objects.Factory.Config.RuntimeObjectReference"/>s or
         /// collections that will need to be resolved.
diff --git a/src/Spring/Spring.Core/Spring.Core.2003.csproj b/src/Spring/Spring.Core/Spring.Core.2003.csproj
index e232feee..0e9cd14e 100644
--- a/src/Spring/Spring.Core/Spring.Core.2003.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2003.csproj
@@ -2160,6 +2160,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Objects\Factory\Config\IManagedCollection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Objects\Factory\Config\InstantiationAwareObjectPostProcessorAdapter.cs"
                     SubType = "Code"
@@ -2200,6 +2205,26 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Objects\Factory\Config\ManagedDictionary.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ManagedList.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ManagedNameValueCollection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ManagedSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Objects\Factory\Config\MethodInvokingFactoryObject.cs"
                     SubType = "Code"
@@ -2410,11 +2435,6 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
-                <File
-                    RelPath = "Objects\Factory\Support\IManagedCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Objects\Factory\Support\IMethodReplacer.cs"
                     SubType = "Code"
@@ -2445,26 +2465,6 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
-                <File
-                    RelPath = "Objects\Factory\Support\ManagedDictionary.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Objects\Factory\Support\ManagedList.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Objects\Factory\Support\ManagedNameValueCollection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Objects\Factory\Support\ManagedSet.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Objects\Factory\Support\MethodInjectingInstantiationStrategy.cs"
                     SubType = "Code"
diff --git a/src/Spring/Spring.Core/Spring.Core.2005.csproj b/src/Spring/Spring.Core/Spring.Core.2005.csproj
index b4012199..3cc4a29f 100644
--- a/src/Spring/Spring.Core/Spring.Core.2005.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2005.csproj
@@ -657,8 +657,13 @@
     <Compile Include="Objects\Factory\Config\DependencyDescriptor.cs" />
     <Compile Include="Objects\Factory\Config\DictionaryVariableSource.cs" />
     <Compile Include="Objects\Factory\Config\IConfigurableFactoryObject.cs" />
+    <Compile Include="Objects\Factory\Config\IManagedCollection.cs" />
     <Compile Include="Objects\Factory\Config\InstantiationAwareObjectPostProcessorAdapter.cs" />
     <Compile Include="Objects\Factory\Config\ISingletonObjectRegistry.cs" />
+    <Compile Include="Objects\Factory\Config\ManagedDictionary.cs" />
+    <Compile Include="Objects\Factory\Config\ManagedList.cs" />
+    <Compile Include="Objects\Factory\Config\ManagedNameValueCollection.cs" />
+    <Compile Include="Objects\Factory\Config\ManagedSet.cs" />
     <Compile Include="Objects\Factory\Config\ObjectDefinitionHolder.cs" />
     <Compile Include="Objects\Factory\Config\ObjectDefinitionVisitor.cs" />
     <Compile Include="Objects\Factory\Config\ObjectRole.cs" />
@@ -681,7 +686,6 @@
     <Compile Include="Objects\Factory\Support\DefaultObjectNameGenerator.cs" />
     <Compile Include="Objects\Factory\Support\IConfigurableObjectDefinition.cs" />
     <Compile Include="Objects\Factory\Support\IObjectNameGenerator.cs" />
-    <Compile Include="Objects\Factory\Support\ManagedNameValueCollection.cs" />
     <Compile Include="Objects\Factory\Support\ObjectDefinitionBuilder.cs" />
     <Compile Include="Objects\Factory\Support\ObjectDefinitionValueResolver.cs" />
     <Compile Include="Objects\Factory\Support\SimpleAutowireCandidateResolver.cs" />
@@ -906,9 +910,6 @@
     <Compile Include="Objects\Factory\Support\IInstantiationStrategy.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Objects\Factory\Support\IManagedCollection.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Objects\Factory\Support\IMethodReplacer.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -924,15 +925,6 @@
     <Compile Include="Objects\Factory\Support\LookupMethodReplacer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Objects\Factory\Support\ManagedDictionary.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\ManagedList.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\ManagedSet.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Objects\Factory\Support\MethodInjectingInstantiationStrategy.cs">
       <SubType>Code</SubType>
     </Compile>