activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r727556 - in /activemq/activemq-dotnet: Apache.NMS.ActiveMQ/trunk/ Apache.NMS.EMS/trunk/ Apache.NMS.MSMQ/trunk/ Apache.NMS.WCF/trunk/ Apache.NMS/trunk/
Date Wed, 17 Dec 2008 22:35:11 GMT
Author: jgomes
Date: Wed Dec 17 14:35:11 2008
New Revision: 727556

URL: http://svn.apache.org/viewvc?rev=727556&view=rev
Log:
Set build options to always build with a keyfile for strong naming.

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems-test.csproj
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems.csproj
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj
    activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.WCF/trunk/vs2008-nms-wcf.csproj
    activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj
    activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj

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=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml Wed Dec 17 14:35:11
2008
@@ -62,7 +62,7 @@
   <fail message="The USERPROFILE environment variable is not defined.  Please set it to
your home directory."
             unless="${property::exists('user.home')}" if="${platform::is-win32()}"/>
 
-  <!-- Figure out the NANT repositories-->
+  <!-- Figure out the NANT repositories -->
   <property name="nant.remote.repo" value="${environment::get-variable('NANT_REMOTE_REPO')}"
             if="${environment::variable-exists('NANT_REMOTE_REPO')}"
             unless="${property::exists('nant.remote.repo')}"/>
@@ -72,17 +72,16 @@
   <property name="nant.local.repo" value="${user.home}/.nant/repository"
             unless="${property::exists('nant.local.repo')}"/>
 			
+  <!-- Figure out the keyfile location -->
+  <property name="snk.file"  value="${environment::get-variable('ACTIVEMQ_DOTNET_SNK')}"
+            if="${environment::variable-exists('ACTIVEMQ_DOTNET_SNK')}"
+            unless="${property::exists('snk.file')}"/>
+  <property name="snk.file"  value="${basedir}/keyfile/NMSKey.snk" if="${not property::exists('snk.file')}"/>
+
   <!-- ============================================================================================
-->
   <!--      I N I T I A L I Z A T I O N     T A R G E T S                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="release-init" description="Initializes release build properties">
-    <property name="snk.file"  value="${environment::get-variable('ACTIVEMQ_DOTNET_SNK')}"
-            if="${environment::variable-exists('ACTIVEMQ_DOTNET_SNK')}"
-            unless="${property::exists('snk.file')}"/>
-    <property name="snk.file"  value="${basedir}/activemq-dotnet.snk" if="${not property::exists('snk.file')}"/>
-  </target>
-
   <target name="init" description="Initializes build properties">
     <!-- enabled the release or debug configuration -->
     <call target="set-${current.build.config}-configuration"/>
@@ -95,8 +94,6 @@
 
     <!-- Check to see current platform supports the target framework -->
     <if test="${framework::exists(current.build.framework)}">
-       <!-- Make sure that the activemq-dotnet.snk exists for release builds -->
-       <call target="release-init"/>
        <property name="build.skip" value="false"/>
     </if>
     <if test="${not framework::exists(current.build.framework)}">
@@ -117,7 +114,7 @@
       </if>
     </if>
 
-   <property name="current.build.keysign" value="${current.build.config=='release' and
file::exists(snk.file) and current.build.framework.sign}"/>
+   <property name="current.build.keysign" value="${current.build.framework.sign}"/>
    <property name="build.bin.dir" value="${basedir}/build/${nant.settings.currentframework}/${current.build.config}"
/>
     <if test="${not(build.skip)}">
        <echo message="Doing ${if(current.build.keysign,'a signed','an unsigned')} ${current.build.config}
build for the ${current.build.framework.name} framework" />
@@ -239,7 +236,7 @@
   <!--     C O M P I L E    T A R G E T S                                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="compile-all" depends="release-init" description="Compile all build configurations
for all runtime configurations">
+  <target name="compile-all" description="Compile all build configurations for all runtime
configurations">
     <echo message="Compiling all build configurations for all runtime configurations."
/>
       <foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
       <foreach item="String" in="${build.config.strings}" delim="," property="current.build.config">
@@ -338,7 +335,7 @@
   <!--      I N S T A L L     T A R G E T S                                          
              -->
   <!-- ============================================================================================
-->
 
-  <target name="install-all" depends="release-init" description="Install all build configurations
for all runtime configurations">
+  <target name="install-all" description="Install all build configurations for all runtime
configurations">
     <echo message="Installing all build configurations for all runtime configurations."
/>
     <foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
       <foreach item="String" in="${build.config.strings}" delim="," property="current.build.config">
@@ -373,7 +370,7 @@
   <!--      R E P O    D O W N L O A D     T A R G E T S                             
              -->
   <!-- ============================================================================================
-->
 
-  <target name="download-vendor-all" depends="release-init" description="Download vendor
files for all runtime configurations">
+  <target name="download-vendor-all" description="Download vendor files for all runtime
configurations">
     <echo message="Downloading vendor files for all runtime configurations." />
     <property name="vendor.build.config" value="release" />
     <foreach item="String" in="${build.framework.strings}" delim="," property="vendor.build.framework">
@@ -422,7 +419,7 @@
   <!--      D E P L O Y     T A R G E T S                                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="deploy-all" depends="release-init" description="Deploy all build configurations
for all runtime configurations">
+  <target name="deploy-all" description="Deploy all build configurations for all runtime
configurations">
     <echo message="Deploying release configurations for all runtime configurations." />
 
     <call target="set-release-configuration" />

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj?rev=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj Wed Dec
17 14:35:11 2008
@@ -16,9 +16,8 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile>
     <SccProjectName>Svn</SccProjectName>
     <SccLocalPath>Svn</SccLocalPath>
     <SccAuxPath>Svn</SccAuxPath>
@@ -95,6 +94,7 @@
     <None Include="Apache.NMS.ActiveMQ.Test.nunit">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="keyfile\NMSKey.snk" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj?rev=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj Wed Dec 17 14:35:11
2008
@@ -9,9 +9,8 @@
     <RootNamespace>Apache.NMS.ActiveMQ</RootNamespace>
     <AssemblyName>Apache.NMS.ActiveMQ</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
@@ -789,6 +788,9 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="keyfile\NMSKey.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>cd $(ProjectDir)

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=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml Wed Dec 17 14:35:11 2008
@@ -62,7 +62,7 @@
   <fail message="The USERPROFILE environment variable is not defined.  Please set it to
your home directory."
             unless="${property::exists('user.home')}" if="${platform::is-win32()}"/>
 
-  <!-- Figure out the NANT repositories-->
+  <!-- Figure out the NANT repositories -->
   <property name="nant.remote.repo" value="${environment::get-variable('NANT_REMOTE_REPO')}"
             if="${environment::variable-exists('NANT_REMOTE_REPO')}"
             unless="${property::exists('nant.remote.repo')}"/>
@@ -72,17 +72,16 @@
   <property name="nant.local.repo" value="${user.home}/.nant/repository"
             unless="${property::exists('nant.local.repo')}"/>
 			
+  <!-- Figure out the keyfile location -->
+  <property name="snk.file"  value="${environment::get-variable('ACTIVEMQ_DOTNET_SNK')}"
+            if="${environment::variable-exists('ACTIVEMQ_DOTNET_SNK')}"
+            unless="${property::exists('snk.file')}"/>
+  <property name="snk.file"  value="${basedir}/keyfile/NMSKey.snk" if="${not property::exists('snk.file')}"/>
+
   <!-- ============================================================================================
-->
   <!--      I N I T I A L I Z A T I O N     T A R G E T S                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="release-init" description="Initializes release build properties">
-    <property name="snk.file"  value="${environment::get-variable('ACTIVEMQ_DOTNET_SNK')}"
-            if="${environment::variable-exists('ACTIVEMQ_DOTNET_SNK')}"
-            unless="${property::exists('snk.file')}"/>
-    <property name="snk.file"  value="${basedir}/activemq-dotnet.snk" if="${not property::exists('snk.file')}"/>
-  </target>
-
   <target name="init" description="Initializes build properties">
     <!-- enabled the release or debug configuration -->
     <call target="set-${current.build.config}-configuration"/>
@@ -95,8 +94,6 @@
 
     <!-- Check to see current platform supports the target framework -->
     <if test="${framework::exists(current.build.framework)}">
-       <!-- Make sure that the activemq-dotnet.snk exists for release builds -->
-       <call target="release-init"/>
        <property name="build.skip" value="false"/>
     </if>
     <if test="${not framework::exists(current.build.framework)}">
@@ -117,7 +114,7 @@
       </if>
     </if>
 
-   <property name="current.build.keysign" value="${current.build.config=='release' and
file::exists(snk.file) and current.build.framework.sign}"/>
+   <property name="current.build.keysign" value="${current.build.framework.sign}"/>
    <property name="build.bin.dir" value="${basedir}/build/${nant.settings.currentframework}/${current.build.config}"
/>
     <if test="${not(build.skip)}">
        <echo message="Doing ${if(current.build.keysign,'a signed','an unsigned')} ${current.build.config}
build for the ${current.build.framework.name} framework" />
@@ -239,7 +236,7 @@
   <!--     C O M P I L E    T A R G E T S                                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="compile-all" depends="release-init" description="Compile all build configurations
for all runtime configurations">
+  <target name="compile-all" description="Compile all build configurations for all runtime
configurations">
     <echo message="Compiling all build configurations for all runtime configurations."
/>
       <foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
       <foreach item="String" in="${build.config.strings}" delim="," property="current.build.config">
@@ -338,7 +335,7 @@
   <!--      I N S T A L L     T A R G E T S                                          
              -->
   <!-- ============================================================================================
-->
 
-  <target name="install-all" depends="release-init" description="Install all build configurations
for all runtime configurations">
+  <target name="install-all" description="Install all build configurations for all runtime
configurations">
     <echo message="Installing all build configurations for all runtime configurations."
/>
     <foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
       <foreach item="String" in="${build.config.strings}" delim="," property="current.build.config">
@@ -373,7 +370,7 @@
   <!--      R E P O    D O W N L O A D     T A R G E T S                             
              -->
   <!-- ============================================================================================
-->
 
-  <target name="download-vendor-all" depends="release-init" description="Download vendor
files for all runtime configurations">
+  <target name="download-vendor-all" description="Download vendor files for all runtime
configurations">
     <echo message="Downloading vendor files for all runtime configurations." />
     <property name="vendor.build.config" value="release" />
     <foreach item="String" in="${build.framework.strings}" delim="," property="vendor.build.framework">
@@ -422,7 +419,7 @@
   <!--      D E P L O Y     T A R G E T S                                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="deploy-all" depends="release-init" description="Deploy all build configurations
for all runtime configurations">
+  <target name="deploy-all" description="Deploy all build configurations for all runtime
configurations">
     <echo message="Deploying release configurations for all runtime configurations." />
 
     <call target="set-release-configuration" />

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems-test.csproj?rev=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems-test.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems-test.csproj Wed Dec 17 14:35:11
2008
@@ -31,9 +31,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile>
     <SccProjectName>Svn</SccProjectName>
     <SccLocalPath>Svn</SccLocalPath>
     <SccAuxPath>Svn</SccAuxPath>
@@ -106,6 +105,7 @@
     <None Include="Apache.NMS.EMS.Test.nunit">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="keyfile\NMSKey.snk" />
     <Content Include="nmsprovider-test.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems.csproj?rev=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems.csproj Wed Dec 17 14:35:11 2008
@@ -28,9 +28,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile>
     <SccProjectName>Svn</SccProjectName>
     <SccLocalPath>Svn</SccLocalPath>
     <SccAuxPath>Svn</SccAuxPath>
@@ -91,6 +90,7 @@
     <Compile Include="src\main\csharp\Topic.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="keyfile\NMSKey.snk" />
     <None Include="nmsprovider-ems.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

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=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml Wed Dec 17 14:35:11 2008
@@ -62,7 +62,7 @@
   <fail message="The USERPROFILE environment variable is not defined.  Please set it to
your home directory."
             unless="${property::exists('user.home')}" if="${platform::is-win32()}"/>
 
-  <!-- Figure out the NANT repositories-->
+  <!-- Figure out the NANT repositories -->
   <property name="nant.remote.repo" value="${environment::get-variable('NANT_REMOTE_REPO')}"
             if="${environment::variable-exists('NANT_REMOTE_REPO')}"
             unless="${property::exists('nant.remote.repo')}"/>
@@ -72,17 +72,16 @@
   <property name="nant.local.repo" value="${user.home}/.nant/repository"
             unless="${property::exists('nant.local.repo')}"/>
 			
+  <!-- Figure out the keyfile location -->
+  <property name="snk.file"  value="${environment::get-variable('ACTIVEMQ_DOTNET_SNK')}"
+            if="${environment::variable-exists('ACTIVEMQ_DOTNET_SNK')}"
+            unless="${property::exists('snk.file')}"/>
+  <property name="snk.file"  value="${basedir}/keyfile/NMSKey.snk" if="${not property::exists('snk.file')}"/>
+
   <!-- ============================================================================================
-->
   <!--      I N I T I A L I Z A T I O N     T A R G E T S                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="release-init" description="Initializes release build properties">
-    <property name="snk.file"  value="${environment::get-variable('ACTIVEMQ_DOTNET_SNK')}"
-            if="${environment::variable-exists('ACTIVEMQ_DOTNET_SNK')}"
-            unless="${property::exists('snk.file')}"/>
-    <property name="snk.file"  value="${basedir}/activemq-dotnet.snk" if="${not property::exists('snk.file')}"/>
-  </target>
-
   <target name="init" description="Initializes build properties">
     <!-- enabled the release or debug configuration -->
     <call target="set-${current.build.config}-configuration"/>
@@ -95,8 +94,6 @@
 
     <!-- Check to see current platform supports the target framework -->
     <if test="${framework::exists(current.build.framework)}">
-       <!-- Make sure that the activemq-dotnet.snk exists for release builds -->
-       <call target="release-init"/>
        <property name="build.skip" value="false"/>
     </if>
     <if test="${not framework::exists(current.build.framework)}">
@@ -117,7 +114,7 @@
       </if>
     </if>
 
-   <property name="current.build.keysign" value="${current.build.config=='release' and
file::exists(snk.file) and current.build.framework.sign}"/>
+   <property name="current.build.keysign" value="${current.build.framework.sign}"/>
    <property name="build.bin.dir" value="${basedir}/build/${nant.settings.currentframework}/${current.build.config}"
/>
     <if test="${not(build.skip)}">
        <echo message="Doing ${if(current.build.keysign,'a signed','an unsigned')} ${current.build.config}
build for the ${current.build.framework.name} framework" />
@@ -239,7 +236,7 @@
   <!--     C O M P I L E    T A R G E T S                                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="compile-all" depends="release-init" description="Compile all build configurations
for all runtime configurations">
+  <target name="compile-all" description="Compile all build configurations for all runtime
configurations">
     <echo message="Compiling all build configurations for all runtime configurations."
/>
       <foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
       <foreach item="String" in="${build.config.strings}" delim="," property="current.build.config">
@@ -338,7 +335,7 @@
   <!--      I N S T A L L     T A R G E T S                                          
              -->
   <!-- ============================================================================================
-->
 
-  <target name="install-all" depends="release-init" description="Install all build configurations
for all runtime configurations">
+  <target name="install-all" description="Install all build configurations for all runtime
configurations">
     <echo message="Installing all build configurations for all runtime configurations."
/>
     <foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
       <foreach item="String" in="${build.config.strings}" delim="," property="current.build.config">
@@ -373,7 +370,7 @@
   <!--      R E P O    D O W N L O A D     T A R G E T S                             
              -->
   <!-- ============================================================================================
-->
 
-  <target name="download-vendor-all" depends="release-init" description="Download vendor
files for all runtime configurations">
+  <target name="download-vendor-all" description="Download vendor files for all runtime
configurations">
     <echo message="Downloading vendor files for all runtime configurations." />
     <property name="vendor.build.config" value="release" />
     <foreach item="String" in="${build.framework.strings}" delim="," property="vendor.build.framework">
@@ -422,7 +419,7 @@
   <!--      D E P L O Y     T A R G E T S                                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="deploy-all" depends="release-init" description="Deploy all build configurations
for all runtime configurations">
+  <target name="deploy-all" description="Deploy all build configurations for all runtime
configurations">
     <echo message="Deploying release configurations for all runtime configurations." />
 
     <call target="set-release-configuration" />

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj?rev=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj Wed Dec 17 14:35:11
2008
@@ -31,9 +31,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile>
     <SccProjectName>Svn</SccProjectName>
     <SccLocalPath>Svn</SccLocalPath>
     <SccAuxPath>Svn</SccAuxPath>
@@ -111,6 +110,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="keyfile\NMSKey.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>cd $(ProjectDir)

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj?rev=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj Wed Dec 17 14:35:11
2008
@@ -11,9 +11,8 @@
     <WarningLevel>4</WarningLevel>
     <StartupObject>
     </StartupObject>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
@@ -85,6 +84,7 @@
     <Compile Include="src\main\csharp\TextMessage.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="keyfile\NMSKey.snk" />
     <None Include="nmsprovider-msmq.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

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=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml Wed Dec 17 14:35:11 2008
@@ -62,7 +62,7 @@
   <fail message="The USERPROFILE environment variable is not defined.  Please set it to
your home directory."
             unless="${property::exists('user.home')}" if="${platform::is-win32()}"/>
 
-  <!-- Figure out the NANT repositories-->
+  <!-- Figure out the NANT repositories -->
   <property name="nant.remote.repo" value="${environment::get-variable('NANT_REMOTE_REPO')}"
             if="${environment::variable-exists('NANT_REMOTE_REPO')}"
             unless="${property::exists('nant.remote.repo')}"/>
@@ -72,17 +72,16 @@
   <property name="nant.local.repo" value="${user.home}/.nant/repository"
             unless="${property::exists('nant.local.repo')}"/>
 			
+  <!-- Figure out the keyfile location -->
+  <property name="snk.file"  value="${environment::get-variable('ACTIVEMQ_DOTNET_SNK')}"
+            if="${environment::variable-exists('ACTIVEMQ_DOTNET_SNK')}"
+            unless="${property::exists('snk.file')}"/>
+  <property name="snk.file"  value="${basedir}/keyfile/NMSKey.snk" if="${not property::exists('snk.file')}"/>
+
   <!-- ============================================================================================
-->
   <!--      I N I T I A L I Z A T I O N     T A R G E T S                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="release-init" description="Initializes release build properties">
-    <property name="snk.file"  value="${environment::get-variable('ACTIVEMQ_DOTNET_SNK')}"
-            if="${environment::variable-exists('ACTIVEMQ_DOTNET_SNK')}"
-            unless="${property::exists('snk.file')}"/>
-    <property name="snk.file"  value="${basedir}/activemq-dotnet.snk" if="${not property::exists('snk.file')}"/>
-  </target>
-
   <target name="init" description="Initializes build properties">
     <!-- enabled the release or debug configuration -->
     <call target="set-${current.build.config}-configuration"/>
@@ -95,8 +94,6 @@
 
     <!-- Check to see current platform supports the target framework -->
     <if test="${framework::exists(current.build.framework)}">
-       <!-- Make sure that the activemq-dotnet.snk exists for release builds -->
-       <call target="release-init"/>
        <property name="build.skip" value="false"/>
     </if>
     <if test="${not framework::exists(current.build.framework)}">
@@ -117,7 +114,7 @@
       </if>
     </if>
 
-   <property name="current.build.keysign" value="${current.build.config=='release' and
file::exists(snk.file) and current.build.framework.sign}"/>
+   <property name="current.build.keysign" value="${current.build.framework.sign}"/>
    <property name="build.bin.dir" value="${basedir}/build/${nant.settings.currentframework}/${current.build.config}"
/>
     <if test="${not(build.skip)}">
        <echo message="Doing ${if(current.build.keysign,'a signed','an unsigned')} ${current.build.config}
build for the ${current.build.framework.name} framework" />
@@ -239,7 +236,7 @@
   <!--     C O M P I L E    T A R G E T S                                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="compile-all" depends="release-init" description="Compile all build configurations
for all runtime configurations">
+  <target name="compile-all" description="Compile all build configurations for all runtime
configurations">
     <echo message="Compiling all build configurations for all runtime configurations."
/>
       <foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
       <foreach item="String" in="${build.config.strings}" delim="," property="current.build.config">
@@ -338,7 +335,7 @@
   <!--      I N S T A L L     T A R G E T S                                          
              -->
   <!-- ============================================================================================
-->
 
-  <target name="install-all" depends="release-init" description="Install all build configurations
for all runtime configurations">
+  <target name="install-all" description="Install all build configurations for all runtime
configurations">
     <echo message="Installing all build configurations for all runtime configurations."
/>
     <foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
       <foreach item="String" in="${build.config.strings}" delim="," property="current.build.config">
@@ -373,7 +370,7 @@
   <!--      R E P O    D O W N L O A D     T A R G E T S                             
              -->
   <!-- ============================================================================================
-->
 
-  <target name="download-vendor-all" depends="release-init" description="Download vendor
files for all runtime configurations">
+  <target name="download-vendor-all" description="Download vendor files for all runtime
configurations">
     <echo message="Downloading vendor files for all runtime configurations." />
     <property name="vendor.build.config" value="release" />
     <foreach item="String" in="${build.framework.strings}" delim="," property="vendor.build.framework">
@@ -422,7 +419,7 @@
   <!--      D E P L O Y     T A R G E T S                                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="deploy-all" depends="release-init" description="Deploy all build configurations
for all runtime configurations">
+  <target name="deploy-all" description="Deploy all build configurations for all runtime
configurations">
     <echo message="Deploying release configurations for all runtime configurations." />
 
     <call target="set-release-configuration" />

Modified: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/vs2008-nms-wcf.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/vs2008-nms-wcf.csproj?rev=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/vs2008-nms-wcf.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/vs2008-nms-wcf.csproj Wed Dec 17 14:35:11
2008
@@ -9,9 +9,8 @@
     <RootNamespace>Apache.NMS.WCF</RootNamespace>
     <AssemblyName>Apache.NMS.WCF</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
@@ -133,6 +132,9 @@
     <Compile Include="src\main\csharp\NmsOutputChannelBase.cs" />
     <Compile Include="src\main\csharp\NmsOutputSessionChannel.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="keyfile\NMSKey.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PreBuildEvent>cd $(ProjectDir)
@@ -140,4 +142,4 @@
     <PostBuildEvent>cd $(ProjectDir)
 nant -nologo -q install-all -D:compile.skip=true</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file

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=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml Wed Dec 17 14:35:11 2008
@@ -62,7 +62,7 @@
   <fail message="The USERPROFILE environment variable is not defined.  Please set it to
your home directory."
             unless="${property::exists('user.home')}" if="${platform::is-win32()}"/>
 
-  <!-- Figure out the NANT repositories-->
+  <!-- Figure out the NANT repositories -->
   <property name="nant.remote.repo" value="${environment::get-variable('NANT_REMOTE_REPO')}"
             if="${environment::variable-exists('NANT_REMOTE_REPO')}"
             unless="${property::exists('nant.remote.repo')}"/>
@@ -72,17 +72,16 @@
   <property name="nant.local.repo" value="${user.home}/.nant/repository"
             unless="${property::exists('nant.local.repo')}"/>
 			
+  <!-- Figure out the keyfile location -->
+  <property name="snk.file"  value="${environment::get-variable('ACTIVEMQ_DOTNET_SNK')}"
+            if="${environment::variable-exists('ACTIVEMQ_DOTNET_SNK')}"
+            unless="${property::exists('snk.file')}"/>
+  <property name="snk.file"  value="${basedir}/keyfile/NMSKey.snk" if="${not property::exists('snk.file')}"/>
+
   <!-- ============================================================================================
-->
   <!--      I N I T I A L I Z A T I O N     T A R G E T S                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="release-init" description="Initializes release build properties">
-    <property name="snk.file"  value="${environment::get-variable('ACTIVEMQ_DOTNET_SNK')}"
-            if="${environment::variable-exists('ACTIVEMQ_DOTNET_SNK')}"
-            unless="${property::exists('snk.file')}"/>
-    <property name="snk.file"  value="${basedir}/activemq-dotnet.snk" if="${not property::exists('snk.file')}"/>
-  </target>
-
   <target name="init" description="Initializes build properties">
     <!-- enabled the release or debug configuration -->
     <call target="set-${current.build.config}-configuration"/>
@@ -95,8 +94,6 @@
 
     <!-- Check to see current platform supports the target framework -->
     <if test="${framework::exists(current.build.framework)}">
-       <!-- Make sure that the activemq-dotnet.snk exists for release builds -->
-       <call target="release-init"/>
        <property name="build.skip" value="false"/>
     </if>
     <if test="${not framework::exists(current.build.framework)}">
@@ -117,7 +114,7 @@
       </if>
     </if>
 
-   <property name="current.build.keysign" value="${current.build.config=='release' and
file::exists(snk.file) and current.build.framework.sign}"/>
+   <property name="current.build.keysign" value="${current.build.framework.sign}"/>
    <property name="build.bin.dir" value="${basedir}/build/${nant.settings.currentframework}/${current.build.config}"
/>
     <if test="${not(build.skip)}">
        <echo message="Doing ${if(current.build.keysign,'a signed','an unsigned')} ${current.build.config}
build for the ${current.build.framework.name} framework" />
@@ -239,7 +236,7 @@
   <!--     C O M P I L E    T A R G E T S                                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="compile-all" depends="release-init" description="Compile all build configurations
for all runtime configurations">
+  <target name="compile-all" description="Compile all build configurations for all runtime
configurations">
     <echo message="Compiling all build configurations for all runtime configurations."
/>
       <foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
       <foreach item="String" in="${build.config.strings}" delim="," property="current.build.config">
@@ -338,7 +335,7 @@
   <!--      I N S T A L L     T A R G E T S                                          
              -->
   <!-- ============================================================================================
-->
 
-  <target name="install-all" depends="release-init" description="Install all build configurations
for all runtime configurations">
+  <target name="install-all" description="Install all build configurations for all runtime
configurations">
     <echo message="Installing all build configurations for all runtime configurations."
/>
     <foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
       <foreach item="String" in="${build.config.strings}" delim="," property="current.build.config">
@@ -373,7 +370,7 @@
   <!--      R E P O    D O W N L O A D     T A R G E T S                             
              -->
   <!-- ============================================================================================
-->
 
-  <target name="download-vendor-all" depends="release-init" description="Download vendor
files for all runtime configurations">
+  <target name="download-vendor-all" description="Download vendor files for all runtime
configurations">
     <echo message="Downloading vendor files for all runtime configurations." />
     <property name="vendor.build.config" value="release" />
     <foreach item="String" in="${build.framework.strings}" delim="," property="vendor.build.framework">
@@ -422,7 +419,7 @@
   <!--      D E P L O Y     T A R G E T S                                            
              -->
   <!-- ============================================================================================
-->
 
-  <target name="deploy-all" depends="release-init" description="Deploy all build configurations
for all runtime configurations">
+  <target name="deploy-all" description="Deploy all build configurations for all runtime
configurations">
     <echo message="Deploying release configurations for all runtime configurations." />
 
     <call target="set-release-configuration" />

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj?rev=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj Wed Dec 17 14:35:11 2008
@@ -31,9 +31,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile>
     <SccProjectName>Svn</SccProjectName>
     <SccLocalPath>Svn</SccLocalPath>
     <SccAuxPath>Svn</SccAuxPath>
@@ -128,6 +127,9 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="keyfile\NMSKey.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>cd $(ProjectDir)

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj?rev=727556&r1=727555&r2=727556&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj Wed Dec 17 14:35:11 2008
@@ -11,9 +11,8 @@
     <WarningLevel>4</WarningLevel>
     <StartupObject>
     </StartupObject>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
@@ -93,6 +92,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="keyfile\NMSKey.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>cd $(ProjectDir)



Mime
View raw message