diff --git a/src/Spring/Spring.Aop/Spring.Aop.2005.csproj b/src/Spring/Spring.Aop/Spring.Aop.2005.csproj
index 16cffad5..b9ae1df2 100644
--- a/src/Spring/Spring.Aop/Spring.Aop.2005.csproj
+++ b/src/Spring/Spring.Aop/Spring.Aop.2005.csproj
@@ -123,6 +123,7 @@
     <Compile Include="Aop\Framework\AutoProxy\AbstractFilteringAutoProxyCreator.cs" />
     <Compile Include="Aop\Framework\AutoProxy\AttributeAutoProxyCreator.cs" />
     <Compile Include="Aop\Framework\AutoProxy\InheritanceBasedAopConfigurer.cs" />
+    <Compile Include="Aop\Framework\AutoProxy\ObjectFactoryAdvisorRetrievalHelper.cs" />
     <Compile Include="Aop\Framework\AutoProxy\PointcutFilteringAutoProxyCreator.cs" />
     <Compile Include="Aop\Framework\AutoProxy\TypeNameAutoProxyCreator.cs" />
     <Compile Include="Aop\Framework\DynamicMethodInvocation.cs" />
diff --git a/src/Spring/Spring.Core/Spring.Core.2005.csproj b/src/Spring/Spring.Core/Spring.Core.2005.csproj
index 54fccae8..efc1c9ab 100644
--- a/src/Spring/Spring.Core/Spring.Core.2005.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2005.csproj
@@ -555,6 +555,7 @@
     <Compile Include="Objects\Factory\Config\ISingletonObjectRegistry.cs" />
     <Compile Include="Objects\Factory\Config\ObjectDefinitionHolder.cs" />
     <Compile Include="Objects\Factory\Config\ObjectDefinitionVisitor.cs" />
+    <Compile Include="Objects\Factory\Config\ObjectRole.cs" />
     <Compile Include="Objects\Factory\Config\ResourceHandlerConfigurer.cs" />
     <Compile Include="Objects\Factory\Config\SharedStateAwareProcessor.cs" />
     <Compile Include="Objects\Factory\Config\SmartInstantiationAwareObjectPostProcessor.cs" />
diff --git a/src/Spring/Spring.Services/Spring.Services.2005.csproj b/src/Spring/Spring.Services/Spring.Services.2005.csproj
index 6a130ca0..694fe357 100644
--- a/src/Spring/Spring.Services/Spring.Services.2005.csproj
+++ b/src/Spring/Spring.Services/Spring.Services.2005.csproj
@@ -102,6 +102,7 @@
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="EnterpriseServices\EnterpriseServicesExporter.cs" />
+    <Compile Include="EnterpriseServices\ExeConfigurationSystem.cs" />
     <Compile Include="EnterpriseServices\ServicedComponentHelper.cs" />
     <Compile Include="EnterpriseServices\ServicedComponentContextHandler.cs" />
     <Compile Include="EnterpriseServices\ServicedComponentExporter.cs" />
diff --git a/src/Spring/Spring.Web/Spring.Web.2005.csproj b/src/Spring/Spring.Web/Spring.Web.2005.csproj
index 53b766cd..995d0590 100644
--- a/src/Spring/Spring.Web/Spring.Web.2005.csproj
+++ b/src/Spring/Spring.Web/Spring.Web.2005.csproj
@@ -122,7 +122,12 @@
     <Compile Include="Globalization\AspNetResourceCache.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Objects\Factory\Support\IWebObjectNameGenerator.cs" />
+    <Compile Include="Objects\Factory\Xml\WebObjectDefinitionDocumentReader.cs" />
+    <Compile Include="Objects\Factory\Xml\WebObjectDefinitionParserHelper.cs" />
+    <Compile Include="Objects\Factory\Xml\WebObjectDefinitionReader.cs" />
     <Compile Include="Util\ISessionState.cs" />
+    <Compile Include="Util\SecurityCritical.cs" />
     <Compile Include="Web\Support\ControlAccessor.cs" />
     <Compile Include="Web\Support\ControlCollectionAccessor.cs" />
     <Compile Include="Web\Support\DefaultResultFactory.cs" />
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj
index e65ce8e6..4082c601 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj
@@ -754,6 +754,7 @@
     <EmbeddedResource Include="Context\Support\invalidType.xml" />
     <EmbeddedResource Include="Core\TypeResolution\aliasedObjects.xml" />
     <EmbeddedResource Include="Core\IO\TestResource.txt" />
+    <EmbeddedResource Include="Context\Support\innerObjectsWithPostProcessor.xml" />
     <Content Include="Data\PathMatcher\EmptyPattern.test" />
     <Content Include="Data\PathMatcher\Examples.test" />
     <Content Include="Data\PathMatcher\InBetween.test" />
@@ -827,7 +828,7 @@
     <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithAllRequiredPropertiesProvided.xml" />
     <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithCustomAttribute.xml" />
     <Content Include="Spring.Core.Tests.dll.config" />
-    <Content Include="Util\ConfigXmlDocumentTests_SampleConfig.xml" />
+    <EmbeddedResource Include="Util\ConfigXmlDocumentTests_SampleConfig.xml" />
     <EmbeddedResource Include="Context\contextlifecycle.xml" />
     <EmbeddedResource Include="Context\Support\objects.xml" />
     <EmbeddedResource Include="Objects\Factory\TestResource.txt" />
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2005.csproj b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2005.csproj
index 894e6d76..fdfcfd96 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2005.csproj
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2005.csproj
@@ -45,14 +45,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.Log4Net.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
diff --git a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2005.csproj b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2005.csproj
index f8623c19..27f79066 100644
--- a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2005.csproj
+++ b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2005.csproj
@@ -32,14 +32,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.Log4Net.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2005.csproj b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2005.csproj
index db5a2831..69e81d39 100644
--- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2005.csproj
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2005.csproj
@@ -78,6 +78,10 @@
       <Name>nunit.framework</Name>
       <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="Rhino.Mocks, Version=3.4.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
+    </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2005.csproj b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2005.csproj
index 5be50049..9f04c659 100644
--- a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2005.csproj
+++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2005.csproj
@@ -82,7 +82,6 @@
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Globalization\Resolvers\DefaultWebCultureResolverTests.cs" />
-    <Compile Include="MyNUnitAddinHelper.cs" />
     <Compile Include="Objects\Factory\Support\WebObjectDefinitionFactoryTests.cs" />
     <Compile Include="Objects\Factory\Support\WebObjectFactoryTests.cs">
       <SubType>Code</SubType>
@@ -100,6 +99,7 @@
     <Compile Include="TestSupport\TestWebContextTests.cs" />
     <Compile Include="TestSupport\VirtualEnvironmentMock.cs" />
     <Compile Include="TestSupport\VoidDelegate.cs" />
+    <Compile Include="TestSupport\WebApplicationTests.cs" />
     <Compile Include="Threading\HttpContextStorageTests.cs" />
     <Compile Include="Threading\HybridContextStorageTests.cs" />
     <Compile Include="Util\WebDIPerformanceTests.cs" />