From e498eb7b9d58d77f99f3aa48f7d8d23e99df3ae8 Mon Sep 17 00:00:00 2001
From: markpollack <mark.pollack@springsource.com>
Date: Wed, 4 Nov 2009 23:17:17 +0000
Subject: [PATCH] enable ncover, fix 2003 build, modify solutions.build.nant to
 exclude Calculator and add ${root} prefix to build 2003 solution.

---
 build-support/solutions.build.nant            |  7 +++---
 common-project.include                        |  1 -
 src/Spring/Spring.Aop/Spring.Aop.2003.csproj  | 23 +++++++++++++++----
 .../Spring.Data/Spring.Data.2003.csproj       | 10 ++++++++
 .../Spring.Services.Tests.2003.csproj         |  5 ++++
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/build-support/solutions.build.nant b/build-support/solutions.build.nant
index 5a5e8463..58b01bef 100644
--- a/build-support/solutions.build.nant
+++ b/build-support/solutions.build.nant
@@ -66,6 +66,7 @@ Rebuilding Solutions using Nant and "solutions.build":
             <items basedir="${root.dir}/examples">
                 <include name="**/*.2003.sln" />
                 <exclude name="**/SpringAir.2003.sln" />  <!-- unfort. doesn't work -->
+		<exclude name="**/Spring.Calculator.2003.sln" />  <!-- need virtual directory to be setup in IIS -->
             </items>
         </in>
         <do>
@@ -76,7 +77,7 @@ Rebuilding Solutions using Nant and "solutions.build":
     </foreach>
 
     <!-- build "main" solution (extra call because of configuration 'debug-1.1') -->
-    <property name="solutionfile" value="Spring.NET.2003.sln" />
+    <property name="solutionfile" value="${root.dir}/Spring.NET.2003.sln" />
     <property name="solutionconfiguration" value="${buildconfiguration}-1.1" />
     <call target="RebuildSolution-1.1" />
 
@@ -117,7 +118,7 @@ Rebuilding Solutions using Nant and "solutions.build":
   <target name="RebuildSolution-1.1" description="rebuilds a given VS2003 solution file">
   <!-- "c:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\devenv.exe" Spring.NET.2003.sln /rebuild Debug-1.1 /out solutions.build-1.1.log -->
     <echo message="Rebuilding VS2003 Solution ${solutionfile}" />
-    <exec program="${devenv11.exe}" basedir="${devenv11.exe}">
+    <exec program="${devenv11.exe}" basedir="${devenv11.exe}" verbose="true">
       <arg value="${solutionfile}" />
       <arg line="/rebuild ${solutionconfiguration}" />
       <arg line="/out solutions.build-1.1.log" />
@@ -144,4 +145,4 @@ Rebuilding Solutions using Nant and "solutions.build":
     </exec>
   </target>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/common-project.include b/common-project.include
index 50fc6c9d..fb72ea60 100644
--- a/common-project.include
+++ b/common-project.include
@@ -189,7 +189,6 @@ ${tool.dir}       : dir for tools
       <!--
       <call target="common.run-tests.ncover" />
       -->
-
     </target>
 
   <!--
diff --git a/src/Spring/Spring.Aop/Spring.Aop.2003.csproj b/src/Spring/Spring.Aop/Spring.Aop.2003.csproj
index ffecc1f5..3b097233 100644
--- a/src/Spring/Spring.Aop/Spring.Aop.2003.csproj
+++ b/src/Spring/Spring.Aop/Spring.Aop.2003.csproj
@@ -241,10 +241,6 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
-                <File RelPath="Aop\Framework\DynamicProxy\AbstractAopProxyFactory.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Aop\Framework\DynamicTargetSourceWrapper.cs"
                     SubType = "Code"
@@ -382,54 +378,67 @@
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\AbstractAdvisorAutoProxyCreator.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\AbstractAutoProxyCreator.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\AbstractFilteringAutoProxyCreator.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\AttributeAutoProxyCreator.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\DefaultAdvisorAutoProxyCreator.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\IAdvisorRetrievalHelper.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\InfrastructureAdvisorAutoProxyCreator.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\InheritanceBasedAopConfigurer.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\ITargetSourceCreator.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\ObjectFactoryAdvisorRetrievalHelper.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\ObjectNameAutoProxyCreator.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\PointcutFilteringAutoProxyCreator.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\TypeNameAutoProxyCreator.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
@@ -499,6 +508,7 @@
                 <Folder RelPath = "Aop\Framework\AutoProxy\.svn\tmp\text-base\" />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\Target\AbstractPrototypeTargetSourceCreator.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
@@ -518,6 +528,11 @@
                 <Folder RelPath = "Aop\Framework\AutoProxy\Target\.svn\tmp\prop-base\" />
                 <Folder RelPath = "Aop\Framework\AutoProxy\Target\.svn\tmp\props\" />
                 <Folder RelPath = "Aop\Framework\AutoProxy\Target\.svn\tmp\text-base\" />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\AbstractAopProxyFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Aop\Framework\DynamicProxy\AbstractAopProxyMethodBuilder.cs"
                     SubType = "Code"
diff --git a/src/Spring/Spring.Data/Spring.Data.2003.csproj b/src/Spring/Spring.Data/Spring.Data.2003.csproj
index f7984b5d..b58bab18 100644
--- a/src/Spring/Spring.Data/Spring.Data.2003.csproj
+++ b/src/Spring/Spring.Data/Spring.Data.2003.csproj
@@ -904,6 +904,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Transaction\Interceptor\AbstractTransactionAttributeSourcePointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Transaction\Interceptor\AttributesTransactionAttributeSource.cs"
                     SubType = "Code"
@@ -954,6 +959,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Transaction\Interceptor\ObjectFactoryTransactionAttributeSourceAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Transaction\Interceptor\RollbackRuleAttribute.cs"
                     SubType = "Code"
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2003.csproj b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2003.csproj
index 50f340c5..bf6be5a4 100644
--- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2003.csproj
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2003.csproj
@@ -129,6 +129,11 @@
                     Project = "{2111596A-0327-4C9D-8919-294FBD988A23}"
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
+                <Reference
+                    Name = "Rhino.Mocks"
+                    AssemblyName = "Rhino.Mocks"
+                    HintPath = "..\..\..\lib\Net\1.1\Rhino.Mocks.dll"
+                />
             </References>
         </Build>
         <Files>