commit e6ff44978ba126d4964936c36cabc884395af362
author Jim Gomes <jgomes@apache.org> Mon Sep 27 19:35:01 2010 +0000
committer Jim Gomes <jgomes@apache.org> Mon Sep 27 19:35:01 2010 +0000
tree b8a80a127ecd6162390880de13e816c1f46ff5c9
parent b935f25bcd9e3c36f9f13fcc33012444e4d4c592

Add support for building .NET 4.0 assemblies.  Dependent vendor assemblies are currently only copies of the .NET 3.5 versions.  Once actual .NET 4.0 versions are available, they can be checked in.
Fixes [AMQNET-286]. (See https://issues.apache.org/activemq/browse/AMQNET-286)

nant-common.xml

diff --git a/nant-common.xml b/nant-common.xml
index c962d83..02c4d14 100644
--- a/nant-common.xml
+++ b/nant-common.xml
@@ -44,8 +44,7 @@
     <property name="current.build.config"    value="${if(project.release.type == 'release', 'release', 'debug')}" overwrite="false" />

     <property name="current.build.framework" value="${framework::get-target-framework()}" overwrite="false" />

     <property name="current.build.defines"   value="${build.defines}" />

-    <!-- TODO: Add net-4.0 once NAnt supports it. -->

-    <property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0,netcf-3.5" unless="${property::exists('build.framework.strings')}"/>

+    <property name="build.framework.strings" value="net-2.0,net-3.5,net-4.0,mono-2.0,netcf-2.0,netcf-3.5" unless="${property::exists('build.framework.strings')}"/>

     <property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}" dynamic="true" />

 

     <property name="build.config.strings"    value="${if(property::exists('configuration'), configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true" />

@@ -228,7 +227,7 @@
         <property name="current.build.framework.name" value=".NET 4.0" />

         <property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5,NET_4_0" dynamic="true" />

         <property name="current.build.framework.sign" value="true" />

-        <property name="link.sdkdoc.version" value="SDK_v6_1" />

+        <property name="link.sdkdoc.version" value="SDK_v7_0" />

         <property name="link.sdkdoc.web" value="true" />

         <property name="nant.settings.currentframework" value="${current.build.framework}" />

     </target>

package.ps1

diff --git a/package.ps1 b/package.ps1
index 12f8d23..c780a02 100644
--- a/package.ps1
+++ b/package.ps1
@@ -16,7 +16,7 @@
 $pkgname = "Apache.NMS.MSMQ"

 $pkgver = "1.5-SNAPSHOT"

 $configurations = "release", "debug"

-$frameworks = "net-2.0", "net-3.5"

+$frameworks = "net-2.0", "net-3.5", "net-4.0"

 

 write-progress "Creating package directory." "Initializing..."

 if(!(test-path package))