Return-Path: 
 <commits-return-13027-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 46216 invoked from network); 9 Feb 2010 22:39:46 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 9 Feb 2010 22:39:46 -0000
Received: (qmail 17784 invoked by uid 500); 9 Feb 2010 22:39:46 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 17742 invoked by uid 500); 9 Feb 2010 22:39:46 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 17733 invoked by uid 99); 9 Feb 2010 22:39:46 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Feb 2010 22:39:46 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Feb 2010 22:39:45 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4DA6423888E7; Tue,  9 Feb 2010 22:39:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r908261 -
 /activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant-common.xml
Date: Tue, 09 Feb 2010 22:39:25 -0000
To: commits@activemq.apache.org
From: jgomes@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100209223925.4DA6423888E7@eris.apache.org>

Author: jgomes
Date: Tue Feb  9 22:39:24 2010
New Revision: 908261

URL: http://svn.apache.org/viewvc?rev=908261&view=rev
Log:
Revert unintended merge.

Modified:
    activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant-common.xml

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant-common.xml?rev=908261&r1=908260&r2=908261&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant-common.xml Tue Feb  9 22:39:24 2010
@@ -41,7 +41,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,mono-2.0,netcf-2.0" 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" />
@@ -194,6 +194,18 @@
 		<property name="csc.optimize" value="true" />
 	</target>
 
+	<target name="set-net-1.1-framework-configuration">
+		<property name="current.build.framework" value="net-1.1" />
+		<property name="current.build.framework.name" value=".NET 1.1" />
+		<property name="current.build.defines" value="${build.defines}NET,NET_1_1" dynamic="true" />
+		<property name="current.build.framework.sign" value="false" />
+		<property name="link.sdkdoc.version" value="SDK_v1_1" />
+		<property name="link.sdkdoc.web" value="true" />
+		<if test="${framework::exists(current.build.framework)}">
+			<property name="nant.settings.currentframework" value="${current.build.framework}" />
+		</if>
+	</target>
+
 	<target name="set-net-2.0-framework-configuration">
 		<property name="current.build.framework" value="net-2.0" />
 		<property name="current.build.framework.name" value=".NET 2.0" />
@@ -222,7 +234,7 @@
 		<property name="current.build.framework" value="netcf-2.0" />
 		<property name="current.build.framework.name" value=".NET Compact Framework 2.0" />
 		<property name="current.build.defines" value="${build.defines}PocketPC,NETCF,NETCF_2_0" dynamic="true" />
-		<property name="current.build.framework.sign" value="true" />
+		<property name="current.build.framework.sign" value="false" />
 		<property name="link.sdkdoc.version" value="SDK_v1_1" />
 		<property name="link.sdkdoc.web" value="true" />
 		<if test="${framework::exists(current.build.framework)}">
@@ -230,18 +242,6 @@
 		</if>
 	</target>
 
-	<target name="set-netcf-3.5-framework-configuration">
-		<property name="current.build.framework" value="netcf-3.5" />
-		<property name="current.build.framework.name" value=".NET Compact Framework 3.5" />
-		<property name="current.build.defines" value="${build.defines}PocketPC,NETCF,NETCF_3_5" dynamic="true" />
-		<property name="current.build.framework.sign" value="true" />
-		<property name="link.sdkdoc.version" value="SDK_v3_5" />
-		<property name="link.sdkdoc.web" value="true" />
-		<if test="${framework::exists(current.build.framework)}">
-			<property name="nant.settings.currentframework" value="${current.build.framework}" />
-		</if>
-	</target>
-
 	<target name="set-mono-2.0-framework-configuration">
 		<property name="current.build.framework" value="mono-2.0" />
 		<property name="current.build.framework.name" value="Mono 2.0" />