From d4fff365acac702374d8e8e5c61ba151f007b11d Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Mon, 20 Aug 2012 10:16:47 -0400
Subject: [PATCH] fixing merge of csproj files

---
 src/Spring/Spring.Core/Spring.Core.2010.csproj              | 2 +-
 test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Spring/Spring.Core/Spring.Core.2010.csproj b/src/Spring/Spring.Core/Spring.Core.2010.csproj
index e6f1052e..18b82f56 100644
--- a/src/Spring/Spring.Core/Spring.Core.2010.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2010.csproj
@@ -710,7 +710,7 @@
     <Compile Include="Objects\Factory\Parsing\ObjectDefinitionParsingException.cs" />
     <Compile Include="Objects\Factory\Parsing\Problem.cs" />
     <Compile Include="Objects\Factory\Parsing\ReaderContext.cs" />
-    <Compile Include="Objects\Factory\Support\DelegatingFactoryObject.cs" />
+    <Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObject.cs" />
     <Compile Include="Objects\Factory\Support\IObjectDefinitionRegistryPostProcessor.cs" />
     <Compile Include="Objects\Factory\Support\ObjectScope.cs" />
     <Compile Include="Stereotype\ControllerAttribute.cs" />
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
index 80c70a18..d9fbeafe 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
@@ -341,6 +341,7 @@
     <Compile Include="Objects\Factory\DefaultListableObjectFactoryPerfTests.cs" />
     <Compile Include="Objects\Factory\DummyConfigurableFactory.cs" />
     <Compile Include="Objects\Factory\ObjectFactoryUtils_PreserveOrderInHierarchy_Tests.cs" />
+    <Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObjectTests.cs" />
     <Compile Include="Objects\Factory\Support\ManagedNameValueCollectionTests.cs" />
     <Compile Include="Objects\Factory\Support\ManagedListTests.cs" />
     <Compile Include="Objects\Factory\Support\ManagedDictionaryTests.cs" />
@@ -358,7 +359,6 @@
     <Compile Include="Objects\LazyTestObject.cs" />
     <Compile Include="Objects\Support\AbstractSharedStateFactoryTests.cs" />
     <Compile Include="Objects\Support\ByTypeSharedStateProviderTests.cs" />
-    <Compile Include="Objects\Factory\Support\DelegatingFactoryObjectTests.cs" />
     <Compile Include="Objects\Support\MethodInvokerTests.cs">
       <SubType>Code</SubType>
     </Compile>