Strong named assemblies (if not .NET 1.1)

Author: Emile Joubert

default.build

@@ -15,7 +15,6 @@
   <property name="gensrc.dir" value="${build.dir}/gensrc" />
   <property name="apigen.exename" value="${bin.dir}/rabbitmq-dotnet-apigen.exe" />
   <property name="target.dllname.base" value="RabbitMQ.Client" />
-  <property name="target.dllname.module" value="${bin.dir}/${target.dllname.base}.netmodule" />
   <property name="target.dllname" value="${bin.dir}/${target.dllname.base}.dll" />
   <property name="bootstrap.dllname" value="${bin.dir}/apigen-bootstrap.dll" />
   <property name="existence.test.probe" value="${gensrc.dir}/autogenerated-api-0-9.cs"/>
@@ -81,10 +80,15 @@
 
   <target name="build" description="compiles the source code"
 	      depends="generate-api">
+    <property name="keyfile.ok"
+              value="${(property::exists('keyfile') and file::exists(property::get-value('keyfile')) and property::get-value('config.name') != 'dotnet-1.1')}" />
     <mkdir dir="${bin.dir}" />
     <mkdir dir="${doc.dir}" />
-    <csc target="module"
-	     output="${target.dllname.module}"
+    <property name="gen.assemblyinfo.src" value="${core.assemblyinfo.src}"/>
+    <property name="gen.assemblyinfo.target" value="${core.assemblyinfo.target}"/>
+    <call target="generate-assemblyinfo"/>
+    <csc target="library"
+	     output="${target.dllname}"
 	     doc="${bin.dir}/${target.dllname.base}.xml"
 	     debug="${debug}">
       <sources>
@@ -95,25 +99,8 @@
       <nowarn>
 	    <warning number="1591"/>
       </nowarn>
+      <arg value="/keyfile:${keyfile}" if="${keyfile.ok}" />
     </csc>
-    <call target="build-link-assembly"/>
-  </target>  
-
-  <target name="build-link-assembly" description="Link the assembly">
-    <property name="keyfile.ok"
-              value="${(property::exists('keyfile') and file::exists(property::get-value('keyfile')))}" />
-      <echo message="Linking assembly" unless="${file::exists(target.dllname)}"/>
-      <echo message="Signing assembly" if="${keyfile.ok}" unless="${file::exists(target.dllname)}"/>
-      <al output="${target.dllname}"
-          target="lib" 
-          title="RabbitMQ Client Library for .Net"
-          description="Open Source Enterprise Messaging"
-          company="LShift Ltd."
-          copyright="Copyright © 2007, 2008 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd."
-          version="${version.assembly}">
-          <arg value="/keyfile:${keyfile}" if="${keyfile.ok}" />
-          <arg path="${target.dllname.module}" />
-      </al>
   </target>
 
   <target name="build-wcf" description="Builds the WCF component. Requires .NET 3.0."