From a2d100fd452b9e4268188fc1d5a4b5ac8027ec3c Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Sat, 5 May 2012 12:42:44 -0400
Subject: [PATCH] SPRNET-1508 adding -D:nuget.version.suffix=... support to
 main build file params

---
 Spring.build | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Spring.build b/Spring.build
index 84f46b28..d5e94f1b 100644
--- a/Spring.build
+++ b/Spring.build
@@ -396,7 +396,7 @@ Commandline Examples:
     <nant buildfile="src/Spring/Spring.Aop/Spring.Aop.build" target="build" if="${build-aop}"/>
     <nant buildfile="src/Spring/Spring.Web/Spring.Web.build" target="build" if="${build-web}"/>
     <nant buildfile="src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build" target="build" if="${build-web and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
-    <nant buildfile="src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build" target="build" if="${nant.settings.currentframework == 'net-4.0'}"/>
+    <nant buildfile="src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build" target="build" if="${nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0'}"/>
     <nant buildfile="src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build" target="build" if="${nant.settings.currentframework == 'net-4.0'}"/>
 	<nant buildfile="src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build" target="build" if="${nant.settings.currentframework == 'net-4.0'}"/>
     <nant buildfile="src/Spring/Spring.Data/Spring.Data.build" target="build" if="${build-data}"/>
@@ -410,7 +410,7 @@ Commandline Examples:
     <nant buildfile="src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build" target="build" if="${build-ems and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' )}"/>
     <nant buildfile="src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build" target="build" if="${build-nms}"/>
     <nant buildfile="src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.build" target="build" if="${build-quartz}"/>
-    <!--
+	<!--
 	<nant buildfile="src/Spring/Spring.Scheduling.Quartz20/Spring.Scheduling.Quartz20.build" target="build" if="${build-quartz}"/>
 	-->
     <nant buildfile="src/Spring/Spring.Messaging/Spring.Messaging.build" target="build" if="${build-msmq}"/>
@@ -430,7 +430,7 @@ Commandline Examples:
 	
     <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
     <nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web}"/>
-	<nant buildfile="test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.0'}"/>
+	<nant buildfile="test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build" target="test" if="${build-web and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0')}"/>
 	<nant buildfile="test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.0'}"/>
 	<nant buildfile="test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.0'}"/>
     <nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test" if="${build-testing-nunit}"/>
@@ -440,7 +440,7 @@ Commandline Examples:
     <nant buildfile="test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build" target="test" if="${build-nms}"/>
     <nant buildfile="test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build" target="test" if="${build-nms}"/>
     <nant buildfile="test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build" target="test" if="${build-quartz}"/>
-    <!--
+	<!--
 	<nant buildfile="test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.build" target="test" if="${build-quartz}"/>
 	-->
     <nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-msmq}"/>
@@ -1607,6 +1607,9 @@ Commandline Examples:
 
 	<property name="nuget.package.dir" value="${spring.basedir}\nuget-packages" />
 	
+	<!-- ensure that we have an empty suffix if none is specified on the command-line -->
+	<property name="nuget.version.suffix" value="" overwrite="false" />
+	
 	<call target="clean-nuget-package-dir" />
 	<call target="check-package-version" />
 	
@@ -1614,6 +1617,9 @@ Commandline Examples:
 		<in>
 			<items basedir="${spring.basedir}/src/spring">
 				<include name="**/*.nuspec" />
+				<exclude name="**/Spring.Messaging.Ems.nuspec" />
+				<exclude name="**/Spring.Scheduling.Quartz20.nuspec" />
+				<exclude name="**/Spring.Web.Mvc4.nuspec" />
 			</items>
 		</in>
 		<do>
@@ -1625,7 +1631,7 @@ Commandline Examples:
       <arg value="pack" />
       <arg value="${filename}" />
 	  <arg value="-Version" />
-	  <arg value="${package.version}" />
+	  <arg value="${package.version + '-' + nuget.version.suffix}" />
 	  <arg value="-basepath" />
 	  <arg value="${spring.basedir}" />
 	  <arg value="-OutputDirectory" />