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 <jgo...@apache.org> Authored: Tue Feb 9 22:39:24 2010 +0000 Committer: Jim Gomes <jgo...@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" />
