From 6159e65a4edfbd7dce2bc796b00d9a0a7d8330b4 Mon Sep 17 00:00:00 2001
From: sbohlen <sbohlen@gmail.com>
Date: Thu, 9 Dec 2010 18:10:44 +0000
Subject: [PATCH] mods to reflect need to support both /program files/ and
 /program files (x86)/ paths for certain .NET framework references
 (MVC-related)

---
 Spring.build                                  |  3 +-
 .../Spring.Web.Mvc/Spring.Web.Mvc.build       |  9 ++++--
 .../Spring.Web.Mvc.Tests.2010.csproj          |  1 +
 .../Spring.Web.Mvc.Tests.build                | 31 ++++++++++++-------
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/Spring.build b/Spring.build
index 14191a75..1d6213ba 100644
--- a/Spring.build
+++ b/Spring.build
@@ -1798,7 +1798,8 @@ Commandline Examples:
       <include name="examples/Spring/Spring.Calculator/**"/>
       <include name="examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/*.refresh"/>
       <include name="examples/Spring/Spring.WebQuickStart/**"/>
-      <include name="examples/Spring/Spring.Web.Extensions.Example/**"/>
+      <include name="examples/Spring/Spring.MvcQuickStart/**"/>
+	  <include name="examples/Spring/Spring.Web.Extensions.Example/**"/>
       <include name="examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/*.refresh"/>
       <include name="examples/Spring/SpringAir/**"/>
       <include name="examples/SpringAir/src/SpringAir.Web.2005/bin/*.refresh"/>
diff --git a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build
index ee991791..0ac71048 100644
--- a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build
+++ b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build
@@ -34,12 +34,15 @@
 				<include name="Spring.Aop.dll" />
 				<include name="System.Configuration.dll" />
  				<include name="System.Web.dll" />
-				<include name="C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
-				<include name="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Routing.dll" if="${nant.settings.currentframework=='net-3.5'}" />
 				<include name="System.Web.Routing.dll" if="${nant.settings.currentframework=='net-4.0'}" />
-				<include name="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-3.5'}" />
 				<include name="System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-4.0'}" />
  				<include name="System.Web.Services.dll" />
+			
+				<include name="C:\Program Files\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
+				<include name="C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
+				<include name="C:\Program Files\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Routing.dll" if="${nant.settings.currentframework=='net-3.5'}" />
+				<include name="C:\Program Files\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-3.5'}" />
+				
 				<include if="${net-4.0.installed and net-4.0}" name="System.Web.ApplicationServices.dll" />        
 			</references>
 		</csc>
diff --git a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj
index d4946bb0..466a5941 100644
--- a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj
@@ -39,6 +39,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Web.Abstractions" />
     <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Web.Routing" />
diff --git a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build
index 45e392b3..f7993018 100644
--- a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build
+++ b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build
@@ -35,19 +35,26 @@
             </resources>
             <references basedir="${current.bin.dir}">
                 <include name="*.dll" />
-		<include name="System.Configuration.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-		<include name="System.Drawing.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-		<include name="System.Xml.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-		<include name="System.Web.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-		<include name="System.Web.Services.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-		<include name="System.Data.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-		<include name="C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
-		<include name="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Routing.dll" if="${nant.settings.currentframework=='net-3.5'}" />
-		<include name="System.Web.Routing.dll" if="${nant.settings.currentframework=='net-4.0'}" />
-		<include name="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-3.5'}" />
-		<include name="System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-4.0'}" />
+				<include name="System.Configuration.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+				<include name="System.Drawing.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+				<include name="System.Xml.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+				<include name="System.Web.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+				<include name="System.Web.Services.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+				<include name="System.Data.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+				
+				<include name="System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-4.0'}" />
+				<include name="System.Web.Routing.dll" if="${nant.settings.currentframework=='net-4.0'}" />
+
+				<include name="C:\Program Files\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
+				<include name="C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
+				<include name="C:\Program Files\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Routing.dll" if="${nant.settings.currentframework=='net-3.5'}" />
+				<include name="C:\Program Files\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-3.5'}" />
+					
+			
+
+				
                 <exclude name="${project::get-name()}.dll" />
-                <exclude name="CloverRuntime.dll" />
+            
                 <include name="${lib.dir}/nunit.core.interfaces.dll" />
 				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
             </references>