You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jg...@apache.org on 2011/02/23 21:50:19 UTC
svn commit: r1073941 - in /activemq/activemq-dotnet:
Apache.NMS.ActiveMQ/trunk/ Apache.NMS.EMS/trunk/ Apache.NMS.MSMQ/trunk/
Apache.NMS.Stomp/trunk/ Apache.NMS.WCF/trunk/ Apache.NMS/trunk/
Author: jgomes
Date: Wed Feb 23 20:50:19 2011
New Revision: 1073941
URL: http://svn.apache.org/viewvc?rev=1073941&view=rev
Log:
Synchronize common build file. Put back building of .NET 4.0 assemblies that was removed.
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml?rev=1073941&r1=1073940&r2=1073941&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml Wed Feb 23 20:50:19 2011
@@ -44,7 +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}" />
- <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" />
@@ -401,7 +401,6 @@
</foreach>
</target>
-
<!-- ============================================================================================ -->
<!-- R E P O D O W N L O A D T A R G E T S -->
<!-- ============================================================================================ -->
Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml?rev=1073941&r1=1073940&r2=1073941&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml Wed Feb 23 20:50:19 2011
@@ -468,6 +468,7 @@
<exec program="nunit-console" failonerror="true" workingdir="build/${current.build.framework}/${current.build.config}">
<arg value="${NUnit.Projectfile}" />
<arg value="-labels" />
+ <arg value="-exclude=Manual" />
<arg value="-xml=Nunit.TestOutput.xml" />
</exec>
</if>
Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml?rev=1073941&r1=1073940&r2=1073941&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml Wed Feb 23 20:50:19 2011
@@ -468,6 +468,7 @@
<exec program="nunit-console" failonerror="true" workingdir="build/${current.build.framework}/${current.build.config}">
<arg value="${NUnit.Projectfile}" />
<arg value="-labels" />
+ <arg value="-exclude=Manual" />
<arg value="-xml=Nunit.TestOutput.xml" />
</exec>
</if>
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml?rev=1073941&r1=1073940&r2=1073941&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml Wed Feb 23 20:50:19 2011
@@ -44,7 +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}" />
- <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" />
@@ -468,7 +468,7 @@
<exec program="nunit-console" failonerror="true" workingdir="build/${current.build.framework}/${current.build.config}">
<arg value="${NUnit.Projectfile}" />
<arg value="-labels" />
- <arg value="-exclude=LongRunning" />
+ <arg value="-exclude=Manual" />
<arg value="-xml=Nunit.TestOutput.xml" />
</exec>
</if>
Modified: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml?rev=1073941&r1=1073940&r2=1073941&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml Wed Feb 23 20:50:19 2011
@@ -468,6 +468,7 @@
<exec program="nunit-console" failonerror="true" workingdir="build/${current.build.framework}/${current.build.config}">
<arg value="${NUnit.Projectfile}" />
<arg value="-labels" />
+ <arg value="-exclude=Manual" />
<arg value="-xml=Nunit.TestOutput.xml" />
</exec>
</if>
Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml?rev=1073941&r1=1073940&r2=1073941&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml Wed Feb 23 20:50:19 2011
@@ -468,6 +468,7 @@
<exec program="nunit-console" failonerror="true" workingdir="build/${current.build.framework}/${current.build.config}">
<arg value="${NUnit.Projectfile}" />
<arg value="-labels" />
+ <arg value="-exclude=Manual" />
<arg value="-xml=Nunit.TestOutput.xml" />
</exec>
</if>