From 5722a6515fcda92e99ff4d3006525b123c53a567 Mon Sep 17 00:00:00 2001
From: markpollack <mark.pollack@springsource.com>
Date: Wed, 13 Aug 2008 21:28:10 +0000
Subject: [PATCH] fix build Add .NET 3.0 framework to the build.
 Spring.Services.ServiceModel compiles under .NET 3.0 (i.e. no .NET 3.5
 language features used anymore)

---
 Spring.include                                                | 3 ++-
 src/Spring/Spring.Services/Spring.Services.build              | 2 +-
 test/Spring/Spring.Services.Tests/Spring.Services.Tests.build | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Spring.include b/Spring.include
index fe55a776..be60b869 100644
--- a/Spring.include
+++ b/Spring.include
@@ -17,7 +17,7 @@
               value="${spring.basedir}/bin/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"
               dynamic="true"/>
 
-
+        <property name="net-3.0" value="false"/>
 	<property name="registry.net-3.0.installed" value="0" overwrite="false"/>
 
 	<readregistry property="registry.net-3.0.installed"
@@ -384,6 +384,7 @@
             depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
         <property name="nant.settings.currentframework" value="net-2.0"/>
         <property name="nant.settings.currentframework.number" value="2.0"/>
+	<!-- revision number used when generating assembly info -->
         <property name="nant.settings.currentframework.revisionnumber" value="3"/>
         <property name="net-2.0" value="true"/>
         <property name="net-3.0" value="true"/>
diff --git a/src/Spring/Spring.Services/Spring.Services.build b/src/Spring/Spring.Services/Spring.Services.build
index 49b11328..0c1e6e90 100644
--- a/src/Spring/Spring.Services/Spring.Services.build
+++ b/src/Spring/Spring.Services/Spring.Services.build
@@ -38,7 +38,7 @@
         <include name="Spring.Aop.dll" />
         <include name="Spring.Web.dll" />
         <include name="System.Web.Services.dll" />
-        <include if="${net-3.0.installed}" name="${net-3.0.ReferenceInstallPath}\System.ServiceModel.dll" />-->
+        <include if="${net-3.0.installed and net-3.0}" name="${net-3.0.ReferenceInstallPath}\System.ServiceModel.dll" />-->
         
       </references>
     </csc>
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
index b40e3928..c3064546 100644
--- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
@@ -28,7 +28,7 @@
       </resources>
       <references basedir="${current.bin.dir}">
         <include name="*.dll" />
-        <include if="${net-3.0.installed}" name="${net-3.0.ReferenceInstallPath}\System.ServiceModel.dll" />-->
+        <include if="${net-3.0.installed and net-3.0}" name="${net-3.0.ReferenceInstallPath}\System.ServiceModel.dll" />-->
         <exclude name="${project::get-name()}.dll" />
 	<exclude name="CloverRuntime.dll" />
       </references>