Return-Path: <commits-return-45964-archive-asf-public=cust-asf.ponee.io@activemq.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id E134F200C53
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue,  7 Mar 2017 00:29:27 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id DF96C160B93; Mon,  6 Mar 2017 23:29:27 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 43BF8160B88
	for <archive-asf-public@cust-asf.ponee.io>; Tue,  7 Mar 2017 00:29:27 +0100 (CET)
Received: (qmail 19938 invoked by uid 500); 6 Mar 2017 23:29:25 -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 19826 invoked by uid 99); 6 Mar 2017 23:29:25 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Mar 2017 23:29:25 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 96B6CDFDE6; Mon,  6 Mar 2017 23:29:25 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tabish@apache.org
To: commits@activemq.apache.org
Date: Mon, 06 Mar 2017 23:29:26 -0000
Message-Id: <d345fb928df74d07af5add9cf9030cde@git.apache.org>
In-Reply-To: <4eb312cf45504de28dfef7461a3790f9@git.apache.org>
References: <4eb312cf45504de28dfef7461a3790f9@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [02/50] [abbrv] activemq-nms-stomp git commit: Revert unintended
 merge.
archived-at: Mon, 06 Mar 2017 23:29:28 -0000

Revert unintended merge.


Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/commit/7d932d29
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/tree/7d932d29
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/diff/7d932d29

Branch: refs/heads/1.2.x
Commit: 7d932d29ac90687fbdfc4dbf263d84bd5d7a2faf
Parents: ecfa000
Author: Jim Gomes <jgomes@apache.org>
Authored: Tue Feb 9 22:39:24 2010 +0000
Committer: Jim Gomes <jgomes@apache.org>
Committed: Tue Feb 9 22:39:24 2010 +0000

----------------------------------------------------------------------
 nant-common.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/7d932d29/nant-common.xml
----------------------------------------------------------------------
diff --git a/nant-common.xml b/nant-common.xml
index 4099f39..1be2614 100644
--- a/nant-common.xml
+++ b/nant-common.xml
@@ -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" />