From 71f4ac0110962e77f33e86a59ce1ddf01db2a459 Mon Sep 17 00:00:00 2001
From: Alexey Diyan <alexey.diyan@teamdev.com>
Date: Thu, 2 Jun 2011 14:04:18 +0300
Subject: [PATCH] Trying figure out how to fix issue with ILMerge. ILMerge task
 wont work because of some changes in UppercuT script.

---
 build.custom/ilmergeDLL.build | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.custom/ilmergeDLL.build b/build.custom/ilmergeDLL.build
index e11f6d23..102ea756 100644
--- a/build.custom/ilmergeDLL.build
+++ b/build.custom/ilmergeDLL.build
@@ -56,6 +56,7 @@
           <include name="${dirs.merge.from}\*.exe" />
           <include name="${dirs.merge.from}\NHibernate.JetDriver.dll" />
           <include name="${dirs.merge.from}\StructureMap.dll" />
+		  <include name="${dirs.merge.from}\MySql.Data.dll" />
         </items>
       </in>
       <do>
@@ -93,6 +94,7 @@
         <include name="NHibernate.JetDriver.dll" />
         <include name="StructureMap.dll" />
         <include name="Microsoft.Build.Framework.*" />
+		<include name="MySql.Data.dll" />
       </fileset>
     </delete>
   </target>