merge bug20564 into default

Author: Matthias Radestock

default.build

@@ -80,6 +80,8 @@
 
   <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}" />
     <property name="gen.assemblyinfo.src" value="${core.assemblyinfo.src}"/>
@@ -97,6 +99,7 @@
       <nowarn>
 	    <warning number="1591"/>
       </nowarn>
+      <arg value="/keyfile:${keyfile}" if="${keyfile.ok}" />
     </csc>
   </target>