diff -aurN connector-net-old/Client.build connector-net/Client.build
--- connector-net-old/Client.build	2006-12-31 16:55:14.000000000 +0100
+++ connector-net/Client.build	2007-02-27 20:16:34.000000000 +0100
@@ -6,9 +6,9 @@
 	<fileset id="Source">
 		<include name="Driver/Properties/*.cs"/>
 		<include name="Driver/Source/*.cs"/>
-		<include name="Driver/Source/Common/*.cs"/>
+		<include name="Driver/Source/common/*.cs"/>
 		<include name="Driver/Source/Types/*.cs"/>
-		<include name="Driver/Source/ZLib/*.cs"/>
+		<include name="Driver/Source/zlib/*.cs"/>
 	</fileset>
 
 	<if test="${not property::exists('debug')}">
@@ -46,9 +46,9 @@
 		</resgen> 		
  		
 		<csc output="${outdir}/MySql.Data.dll" target="library" 
-			define="${defines}" debug="${debug}" optimize="${opt}" keycontainer="ConnectorNet" 
-			doc="${outdir}/MySql.Data.xml">
-			<arg value="/nowarn:0679,1591,2029"/>
+			define="${defines}" debug="${debug}" optimize="${opt}"
+			>
+			<arg value="/nowarn:0679,1591,2029,0219"/>
 			<resources prefix="MySql.Data.MySqlClient.Source">
 				<include name="Driver/Source/Resources.resources"/>
 				<include name="Driver/Source/ReservedWords.txt"/>
@@ -84,8 +84,7 @@
 	</target>
 
 	<!-- builds the client on all supported frameworks -->
-	<target name="allframeworks" depends="net-2.0">
-		<call target="Docs"/>
+	<target name="allframeworks" depends="mono-2.0">
 	</target>
 
 	<!-- core managed driver target 1.1 -->
@@ -112,14 +111,14 @@
 	<target name="mono-1.0" description="Mono 1.0 Target">
         <property name="nunit-lib" value="${framework::get-assembly-directory('mono-1.0')}"/>
 		<property name="framework" value="mono-1.0"/>
-		<call target="client"/>
+		<call target="compile-client"/>
 	</target>
 
 	<target name="mono-2.0" description="Mono 2.0 Target">
 	    <property name="defines" value="${defines},MONO,NET20"/>
-        <property name="nunit-lib" value="c:/program files/nunit/src/build/mono/2.0/debug"/>
+        <property name="nunit-lib" value="${framework::get-assembly-directory('mono-1.0')}"/>
 		<property name="framework" value="mono-2.0"/>
-		<call target="client"/>
+		<call target="compile-client"/>
 	</target>
 
 	<!-- testing targets -->
@@ -244,7 +243,7 @@
 	<target name="clean" description="Remove all generated files">
 		<delete failonerror="false">
 			<fileset>
-				<include name="bin/**" />
+				<include name="Driver/bin/**" />
             </fileset>
         </delete>
     </target>
diff -aurN connector-net-old/Driver/Properties/AssemblyInfo.cs connector-net/Driver/Properties/AssemblyInfo.cs
--- connector-net-old/Driver/Properties/AssemblyInfo.cs	2006-12-31 15:38:50.000000000 +0100
+++ connector-net/Driver/Properties/AssemblyInfo.cs	2007-02-27 20:13:29.000000000 +0100
@@ -78,8 +78,6 @@
 //       documentation for more information on this.
 //
 [assembly: AssemblyDelaySign(false)]
-#if FINAL && !NET20
 [assembly: AssemblyKeyFile("")]
-[assembly: AssemblyKeyName("ConnectorNet")]
-#endif
+[assembly: AssemblyKeyName("")]
 
diff -aurN connector-net-old/Driver/Source/Connection.cs connector-net/Driver/Source/Connection.cs
--- connector-net-old/Driver/Source/Connection.cs	2006-12-31 15:05:02.000000000 +0100
+++ connector-net/Driver/Source/Connection.cs	2007-02-27 20:15:41.000000000 +0100
@@ -27,7 +27,6 @@
 using System.Globalization;
 using MySql.Data.Common;
 using System.Diagnostics;
-using System.Windows.Forms;
 
 namespace MySql.Data.MySqlClient
 {