X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=msvc%2Fwin32.xml;h=6263590c1108efd95c39f3d7d8e55b06d367f34b;hb=30cddad5fb4c3d290906a6e6c33ecd8b07d8b48c;hp=23c0c05f0ab7050fd3256c506712da2cf1a1fb35;hpb=bed9e4b6b414de100817d81cfd9747d82b819dbd;p=mono.git

diff --git a/msvc/win32.xml b/msvc/win32.xml
index 23c0c05f0ab..6263590c110 100644
--- a/msvc/win32.xml
+++ b/msvc/win32.xml
@@ -1,23 +1,25 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Assemblies>
 	<!-- Delete previous builds -->
 	<Delete type="directory">{destdir}\bin</Delete>
 	<Delete type="directory">{destdir}\lib</Delete>
 
 	<Copy source="{monobuilddir}\mono.exe" destination="{destdir}\bin\mono.exe" />
-	<Copy source="{monobuilddir}\mono.dll" destination="{destdir}\bin\mono.dll" />
+	<Copy source="{monobuilddir}\mono-2.0.dll" destination="{destdir}\bin\mono-2.0.dll" />
 	<Copy source="{monobuilddir}\MonoPosixHelper.dll" destination="{destdir}\bin\MonoPosixHelper.dll" />
 
 	<!-- Copy Consts.cs.in and insert this revision number -->
-	<Copy source="{sourcedir}\mcs\build\common\Consts.cs.in" destination="{sourcedir}\mcs\build\common\Consts.cs" />
-	<Regex source="{sourcedir}\mcs\build\common\Consts.cs" pattern="@MONO_VERSION@" replacement="2.5.0.0" />
+	<Copy source="{sourcedir}\mono\mcs\build\common\Consts.cs.in" destination="{sourcedir}\mono\mcs\build\common\Consts.cs" />
+	<Regex source="{sourcedir}\mono\mcs\build\common\Consts.cs" pattern="@MONO_VERSION@" replacement="2.5.0.0" />
 	
 	<!-- Make the \etc directory -->
 	<Copy source="{sourcedir}\mono\data\net_2_0\machine.config" destination="{destdir}\etc\mono\2.0\machine.config" />
 	<Copy source="{sourcedir}\mono\data\net_2_0\DefaultWsdlHelpGenerator.aspx" destination="{destdir}\etc\mono\2.0\DefaultWsdlHelpGenerator.aspx" />
 	<Copy source="{sourcedir}\mono\data\net_2_0\settings.map" destination="{destdir}\etc\mono\2.0\settings.map" />
 	<Copy source="{sourcedir}\mono\data\net_2_0\web.config" destination="{destdir}\etc\mono\2.0\web.config" />
-	<Copy source="{sourcedir}\mono\data\net_2_0\Browsers\Compat.browser" destination="{destdir}\etc\mono\2.0\Browsers\Compat.browser" />
+	<Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\2.0\Browsers\Compat.browser" />
+	<Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\4.0\Browsers\Compat.browser" />
+	<Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\4.5\Browsers\Compat.browser" />
 	<Copy source="{sourcedir}\mono\data\browscap.ini" destination="{destdir}\etc\mono\browscap.ini" />
 
 	<!-- Bring in xulrunner -->
@@ -30,8 +32,8 @@
 
 	<Copy source="{sourcedir}\mono\msvc\jaystuff.bat" destination="{sourcedir}\jaystuff.bat" />
 
-	<Copy source="{sourcedir}\mcs\class\System.XML\System.Xml.XPath\Parser.jay" destination="{sourcedir}\mcs\class\System.XML\Mono.Xml.Xsl\PatternParser.jay" />
-	<Regex source="{sourcedir}\mcs\class\System.XML\Mono.Xml.Xsl\PatternParser.jay" pattern="%start Expr" replacement="%start Pattern" />
+	<Copy source="{sourcedir}\mono\mcs\class\System.XML\System.Xml.XPath\Parser.jay" destination="{sourcedir}\mono\mcs\class\System.XML\Mono.Xml.Xsl\PatternParser.jay" />
+	<Regex source="{sourcedir}\mono\mcs\class\System.XML\Mono.Xml.Xsl\PatternParser.jay" pattern="%start Expr" replacement="%start Pattern" />
 
 	<Run source="{sourcedir}\jaystuff.bat" />
 
@@ -39,7 +41,7 @@
 	<Assembly name="gmcs" destination="{destdir}\lib\mono\2.0\gmcs.exe" mono="install">
 		<OutputType>exe</OutputType>
 		<DefineConstants>GMCS_SOURCE,NET_1_1,NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\mcs</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\mcs</SourcePath>
 		<Debug>false</Debug>
 		<NoConfig>false</NoConfig>
 		<Sources>
@@ -50,7 +52,7 @@
 	<Assembly name="mscorlib" destination="{destdir}\lib\mono\2.0\mscorlib.dll" mono="install">
 		<OutputType>library</OutputType>
 		<DefineConstants>INSIDE_CORLIB,NET_1_1,NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\corlib</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\corlib</SourcePath>
 		<Debug>false</Debug>
 		<NoStandardLib>true</NoStandardLib>
 		<IgnoreWarnings>612,618</IgnoreWarnings>
@@ -78,7 +80,7 @@
 		<DefineConstants>NET_1_1;NET_2_0;CONFIGURATION_2_0;XML_DEP;SECURITY_DEP;CONFIGURATION_DEP</DefineConstants>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<IgnoreWarnings>618</IgnoreWarnings>
-		<SourcePath>{sourcedir}\mcs\class\System\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System\</SourcePath>
 		<Sources>
 			<Source type="list">System.dll.sources</Source>
 			<Source>-resource:resources/Asterisk.wav</Source>
@@ -96,7 +98,7 @@
 		<OutputType>library</OutputType>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Debug>false</Debug>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Security\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.Security\</SourcePath>
 		<Sources>
 			<Source type="list">Mono.Security.dll.sources</Source>
 		</Sources>
@@ -109,7 +111,7 @@
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<IgnoreWarnings>612,618,642</IgnoreWarnings>
-		<SourcePath>{sourcedir}\mcs\class\System.Xml</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Xml</SourcePath>
 		<Debug>false</Debug>
 		<Sources>
 			<Source type="list">System.Xml.dll.sources</Source>
@@ -130,7 +132,7 @@
 		<Debug>false</Debug>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<IgnoreWarnings>618,414</IgnoreWarnings>
-		<SourcePath>{sourcedir}\mcs\class\System.Security\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Security\</SourcePath>
 		<Sources>
 			<Source type="list">System.Security.dll.sources</Source>
 		</Sources>
@@ -147,14 +149,17 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Debug>false</Debug>
 		<IgnoreWarnings>618,414</IgnoreWarnings>
-		<SourcePath>{sourcedir}\mcs\class\System.Configuration\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Configuration\</SourcePath>
 		<Sources>
 			<Source type="list">System.Configuration.dll.sources</Source>
 		</Sources>
 	</Assembly>
 	<Assembly name="Mono.CompilerServices.SymbolWriter" destination="{destdir}\lib\mono\2.0\Mono.CompilerServices.SymbolWriter.dll" mono="install">
+		<References>
+			<Reference>System</Reference>
+		</References>
 		<OutputType>library</OutputType>
-		<SourcePath>{sourcedir}\mcs\class\Mono.CompilerServices.SymbolWriter</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.CompilerServices.SymbolWriter</SourcePath>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<Debug>false</Debug>
 		<Sources>
@@ -169,7 +174,7 @@
     </References>
     <OutputType>library</OutputType>
     <DefineConstants>NET_1_1;NET_2_0;NET_3_5;LIBC</DefineConstants>
-    <SourcePath>{sourcedir}\mcs\class\System.Core\</SourcePath>
+    <SourcePath>{sourcedir}\mono\mcs\class\System.Core\</SourcePath>
     <IgnoreWarnings>1720</IgnoreWarnings>
     <Debug>false</Debug>
     <Sources>
@@ -181,7 +186,7 @@
 	<Assembly name="gmcs" destination="{destdir}\temp\gmcs.exe">
 		<OutputType>exe</OutputType>
 		<DefineConstants>GMCS_SOURCE,NET_1_1,NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\mcs</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\mcs</SourcePath>
 		<Debug>true</Debug>
 		<NoConfig>false</NoConfig>
 		<Sources>
@@ -192,7 +197,7 @@
 	<Assembly name="mscorlib" destination="{destdir}\temp\mscorlib.dll">
 		<OutputType>library</OutputType>
 		<DefineConstants>INSIDE_CORLIB,NET_1_1,NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\corlib</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\corlib</SourcePath>
 		<Debug>true</Debug>
 		<NoStandardLib>true</NoStandardLib>
 		<IgnoreWarnings>612,618</IgnoreWarnings>
@@ -220,7 +225,7 @@
 		<DefineConstants>NET_1_1;NET_2_0;CONFIGURATION_2_0;XML_DEP;SECURITY_DEP;CONFIGURATION_DEP</DefineConstants>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<IgnoreWarnings>618</IgnoreWarnings>
-		<SourcePath>{sourcedir}\mcs\class\System\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System\</SourcePath>
 		<Sources>
 			<Source type="list">System.dll.sources</Source>
 			<Source>-resource:resources/Asterisk.wav</Source>
@@ -238,7 +243,7 @@
 		<OutputType>library</OutputType>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Debug>true</Debug>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Security\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.Security\</SourcePath>
 		<Sources>
 			<Source type="list">Mono.Security.dll.sources</Source>
 		</Sources>
@@ -251,7 +256,7 @@
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<IgnoreWarnings>612,618,642</IgnoreWarnings>
-		<SourcePath>{sourcedir}\mcs\class\System.Xml</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Xml</SourcePath>
 		<Debug>true</Debug>
 		<Sources>
 			<Source type="list">System.Xml.dll.sources</Source>
@@ -272,7 +277,7 @@
 		<Debug>true</Debug>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<IgnoreWarnings>618,414</IgnoreWarnings>
-		<SourcePath>{sourcedir}\mcs\class\System.Security\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Security\</SourcePath>
 		<Sources>
 			<Source type="list">System.Security.dll.sources</Source>
 		</Sources>
@@ -289,12 +294,40 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Debug>true</Debug>
 		<IgnoreWarnings>618,414</IgnoreWarnings>
-		<SourcePath>{sourcedir}\mcs\class\System.Configuration\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Configuration\</SourcePath>
 		<Sources>
 			<Source type="list">System.Configuration.dll.sources</Source>
 		</Sources>
 	</Assembly>
-
+  <Assembly name="Mono.Posix" destination="{destdir}\lib\mono\2.0\Mono.Posix.dll">
+    <References>
+      <Reference>mscorlib</Reference>
+      <Reference>System</Reference>
+    </References>
+    <OutputType>library</OutputType>
+    <DefineConstants>NET_1_1;NET_2_0</DefineConstants>
+    <IgnoreWarnings>618,612</IgnoreWarnings>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <SourcePath>{sourcedir}\mono\mcs\class\Mono.Posix\</SourcePath>
+    <Sources>
+      <Source type="list">Mono.Posix.dll.sources</Source>
+    </Sources>
+  </Assembly>
+  <Assembly name="System.Core" destination="{destdir}\temp\System.Core.dll">
+    <References>
+      <Reference>mscorlib</Reference>
+      <Reference>System</Reference>
+      <Reference>Mono.Posix</Reference>
+    </References>
+    <OutputType>library</OutputType>
+    <DefineConstants>NET_1_1;NET_2_0;NET_3_5;LIBC</DefineConstants>
+    <SourcePath>{sourcedir}\mono\mcs\class\System.Core\</SourcePath>
+    <IgnoreWarnings>1720</IgnoreWarnings>
+    <Sources>
+      <Source type="list">System.Core.dll.sources</Source>
+    </Sources>
+  </Assembly>
+  
 	<!-- Build some tools -->
 	<Assembly name="sn" destination="{destdir}\lib\mono\2.0\sn.exe">
 		<References>
@@ -303,7 +336,7 @@
 		<OutputType>exe</OutputType>
 		<NoConfig>true</NoConfig>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\tools\security</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\tools\security</SourcePath>
 		<Debug>true</Debug>
 		<Sources>
 			<Source>sn.cs</Source>
@@ -314,30 +347,33 @@
 	</Assembly>
 
 	<!-- Sign what we've made so far -->
-	<Sign assembly="{destdir}\temp\System.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\temp\mscorlib.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\temp\Mono.Security.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\temp\System.Xml.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\temp\System.Security.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\temp\System.Configuration.dll" key="{sourcedir}\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\temp\System.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\temp\mscorlib.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\temp\Mono.Security.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\temp\System.Xml.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\temp\System.Security.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+  <Sign assembly="{destdir}\temp\System.Configuration.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+  <Sign assembly="{destdir}\temp\System.Core.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
 
-	<!-- Copy our new assemblies to the bin/lib locations -->
+  <!-- Copy our new assemblies to the bin/lib locations -->
 	<Copy source="{destdir}\temp\gmcs.exe" destination="{destdir}\lib\mono\2.0\gmcs.exe" />
 	<Copy source="{destdir}\temp\System.dll" destination="{destdir}\lib\mono\2.0\System.dll" />
 	<Copy source="{destdir}\temp\mscorlib.dll" destination="{destdir}\lib\mono\2.0\mscorlib.dll" />
 	<Copy source="{destdir}\temp\Mono.Security.dll" destination="{destdir}\lib\mono\2.0\Mono.Security.dll" />
 	<Copy source="{destdir}\temp\System.Xml.dll" destination="{destdir}\lib\mono\2.0\System.Xml.dll" />
 	<Copy source="{destdir}\temp\System.Security.dll" destination="{destdir}\lib\mono\2.0\System.Security.dll" />
-	<Copy source="{destdir}\temp\System.Configuration.dll" destination="{destdir}\lib\mono\2.0\System.Configuration.dll" />
-	<Copy source="{destdir}\temp\gmcs.exe.mdb" destination="{destdir}\lib\mono\2.0\gmcs.exe.mdb" />
+  <Copy source="{destdir}\temp\System.Configuration.dll" destination="{destdir}\lib\mono\2.0\System.Configuration.dll" />
+  <Copy source="{destdir}\temp\System.Core.dll" destination="{destdir}\lib\mono\2.0\System.Core.dll" />
+  <Copy source="{destdir}\temp\gmcs.exe.mdb" destination="{destdir}\lib\mono\2.0\gmcs.exe.mdb" />
 	<Copy source="{destdir}\temp\System.dll.mdb" destination="{destdir}\lib\mono\2.0\System.dll.mdb" />
 	<Copy source="{destdir}\temp\mscorlib.dll.mdb" destination="{destdir}\lib\mono\2.0\mscorlib.dll.mdb" />
 	<Copy source="{destdir}\temp\Mono.Security.dll.mdb" destination="{destdir}\lib\mono\2.0\Mono.Security.dll.mdb" />
 	<Copy source="{destdir}\temp\System.Xml.dll.mdb" destination="{destdir}\lib\mono\2.0\System.Xml.dll.mdb" />
 	<Copy source="{destdir}\temp\System.Security.dll.mdb" destination="{destdir}\lib\mono\2.0\System.Security.dll.mdb" />
-	<Copy source="{destdir}\temp\System.Configuration.dll.mdb" destination="{destdir}\lib\mono\2.0\System.Configuration.dll.mdb" />
+  <Copy source="{destdir}\temp\System.Configuration.dll.mdb" destination="{destdir}\lib\mono\2.0\System.Configuration.dll.mdb" />
+  <Copy source="{destdir}\temp\System.Core.dll.mdb" destination="{destdir}\lib\mono\2.0\System.Core.dll.mdb" />
 
-	<!-- Delete our temp directory -->
+  <!-- Delete our temp directory -->
 	<Delete type="directory">{destdir}\temp</Delete>
 
 	<!-- Build some more tools -->
@@ -348,7 +384,7 @@
 		<OutputType>exe</OutputType>
 		<NoConfig>false</NoConfig>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\tools\gacutil</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\tools\gacutil</SourcePath>
 		<Debug>true</Debug>
 		<Sources>
 			<Source type="list">gacutil.exe.sources</Source>
@@ -356,7 +392,7 @@
 	</Assembly>
 	<Assembly name="resgen" destination="{destdir}\lib\mono\2.0\resgen.exe">
 		<OutputType>exe</OutputType>
-		<SourcePath>{sourcedir}\mcs\tools\resgen</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\tools\resgen</SourcePath>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<NoConfig>false</NoConfig>
 		<Debug>true</Debug>
@@ -366,7 +402,7 @@
 	</Assembly>
 	<Assembly name="culevel" destination="{destdir}\lib\mono\2.0\culevel.exe">
 		<OutputType>exe</OutputType>
-		<SourcePath>{sourcedir}\mcs\tools\culevel</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\tools\culevel</SourcePath>
 		<NoConfig>false</NoConfig>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<Debug>true</Debug>
@@ -382,7 +418,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\class\I18N\Common\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\I18N\Common\</SourcePath>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<Sources>
 			<Source type="list">I18N.dll.sources</Source>
@@ -396,7 +432,7 @@
 		<OutputType>library</OutputType>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\I18N\West\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\I18N\West\</SourcePath>
 		<Sources>
 			<Source type="list">I18N.West.dll.sources</Source>
 		</Sources>
@@ -409,7 +445,7 @@
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\class\I18N\MidEast\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\I18N\MidEast\</SourcePath>
 		<Sources>
 			<Source type="list">I18N.MidEast.dll.sources</Source>
 		</Sources>
@@ -422,7 +458,7 @@
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\class\I18N\Other\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\I18N\Other\</SourcePath>
 		<Sources>
 			<Source type="list">I18N.Other.dll.sources</Source>
 		</Sources>
@@ -435,7 +471,7 @@
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\class\I18N\Rare\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\I18N\Rare\</SourcePath>
 		<Sources>
 			<Source type="list">I18N.Rare.dll.sources</Source>
 		</Sources>
@@ -448,7 +484,7 @@
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\class\I18N\CJK\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\I18N\CJK\</SourcePath>
 		<Sources>
 			<Source type="list">I18N.CJK.dll.sources</Source>
 			<Source>/resource:jis.table</Source>
@@ -464,7 +500,7 @@
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\class\System.Drawing\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Drawing\</SourcePath>
 		<Sources>
 			<Source type="list">System.Drawing.dll.sources</Source>
 			<Source>-resource:Assembly/Mono.ico,Mono.ico</Source>
@@ -482,7 +518,7 @@
 		<OutputType>library</OutputType>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Transactions\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Transactions\</SourcePath>
 		<Sources>
 			<Source type="list">System.Transactions.dll.sources</Source>
 		</Sources>
@@ -497,7 +533,7 @@
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<IgnoreWarnings>168,162</IgnoreWarnings>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\class\System.EnterpriseServices\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.EnterpriseServices\</SourcePath>
 		<Sources>
 			<Source type="list">System.EnterpriseServices.dll.sources</Source>
 		</Sources>
@@ -511,7 +547,7 @@
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
 		<IgnoreWarnings>169</IgnoreWarnings>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\class\Mono.C5\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.C5\</SourcePath>
 		<Sources>
 			<Source type="list">Mono.C5.dll.sources</Source>
 		</Sources>
@@ -526,7 +562,7 @@
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Data.Tds\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.Data.Tds\</SourcePath>
 		<Sources>
 			<Source type="list">Mono.Data.Tds.dll.sources</Source>
 		</Sources>
@@ -545,73 +581,19 @@
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<IgnoreWarnings>649</IgnoreWarnings>
-		<SourcePath>{sourcedir}\mcs\class\System.Data\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Data\</SourcePath>
 		<Sources>
 			<Source type="list">System.Data.dll.sources</Source>
 			<Source>Mono.Data.SqlExpressions/Parser.cs</Source>
 		</Sources>
 	</Assembly>
-	<Assembly name="Mono.Data" destination="{destdir}\lib\mono\2.0\Mono.Data.dll">
-		<References>
-			<Reference>mscorlib</Reference>
-			<Reference>System</Reference>
-			<Reference>System.Xml</Reference>
-			<Reference>System.Data</Reference>
-		</References>
-		<OutputType>library</OutputType>
-		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Data\</SourcePath>
-		<Sources>
-			<Source type="list">Mono.Data.dll.sources</Source>
-		</Sources>
-	</Assembly>
-	<Assembly name="Mono.GetOptions" destination="{destdir}\lib\mono\2.0\Mono.GetOptions.dll">
-		<References>
-			<Reference>System</Reference>
-		</References>
-		<OutputType>library</OutputType>
-		<IgnoreWarnings>618</IgnoreWarnings>
-		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.GetOptions\</SourcePath>
-		<Sources>
-			<Source type="list">Mono.GetOptions.dll.sources</Source>
-		</Sources>
-	</Assembly>
-	<Assembly name="Mono.Posix" destination="{destdir}\lib\mono\2.0\Mono.Posix.dll">
-		<References>
-			<Reference>mscorlib</Reference>
-			<Reference>System</Reference>
-		</References>
-		<OutputType>library</OutputType>
-		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<IgnoreWarnings>618,612</IgnoreWarnings>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Posix\</SourcePath>
-		<Sources>
-			<Source type="list">Mono.Posix.dll.sources</Source>
-		</Sources>
-	</Assembly>
-  <Assembly name="System.Core" destination="{destdir}\lib\mono\2.0\System.Core.dll">
-    <References>
-      <Reference>mscorlib</Reference>
-      <Reference>System</Reference>
-      <Reference>Mono.Posix</Reference>
-    </References>
-    <OutputType>library</OutputType>
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_5;LIBC</DefineConstants>
-    <SourcePath>{sourcedir}\mcs\class\System.Core\</SourcePath>
-    <IgnoreWarnings>1720</IgnoreWarnings>
-    <Sources>
-      <Source type="list">System.Core.dll.sources</Source>
-    </Sources>
-  </Assembly>
   <Assembly name="Accessibility" destination="{destdir}\lib\mono\2.0\Accessibility.dll">
 		<References>
 			<Reference>mscorlib</Reference>
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Accessibility\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Accessibility\</SourcePath>
 		<Sources>
 			<Source type="list">Accessibility.dll.sources</Source>
 		</Sources>
@@ -623,13 +605,13 @@
 		<OutputType>library</OutputType>
 		<IgnoreWarnings>108</IgnoreWarnings>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.WebBrowser\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.WebBrowser\</SourcePath>
 		<Sources>
 			<Source type="list">Mono.WebBrowser.dll.sources</Source>
 		</Sources>
 	</Assembly>
 
-	<Copy source="{sourcedir}\mcs\class\Managed.Windows.Forms\resources\keyboards.resources.prebuilt" destination="{sourcedir}\mcs\class\Managed.Windows.Forms\resources\keyboards.resources" />
+	<Copy source="{sourcedir}\mono\mcs\class\Managed.Windows.Forms\resources\keyboards.resources.prebuilt" destination="{sourcedir}\mono\mcs\class\Managed.Windows.Forms\resources\keyboards.resources" />
 
 	<Assembly name="System.Windows.Forms" destination="{destdir}\lib\mono\2.0\System.Windows.Forms.dll">
 		<References>
@@ -646,7 +628,7 @@
 		<OutputType>library</OutputType>
 		<IgnoreWarnings>618,612,809</IgnoreWarnings>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Managed.Windows.Forms\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Managed.Windows.Forms\</SourcePath>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Sources>
 			<Source type="list">System.Windows.Forms.dll.sources</Source>
@@ -654,7 +636,7 @@
 		</Sources>
 	</Assembly>
 
-	<Resgen workingdir="{sourcedir}\mcs\class\Mono.Data.Sqlite">{sourcedir}\mcs\class\Mono.Data.Sqlite\resources\SR.resx</Resgen>
+	<Resgen workingdir="{sourcedir}\mono\mcs\class\Mono.Data.Sqlite">{sourcedir}\mono\mcs\class\Mono.Data.Sqlite\resources\SR.resx</Resgen>
 
 	<Assembly name="Mono.Data.Sqlite" destination="{destdir}\lib\mono\2.0\Mono.Data.Sqlite.dll">
 		<References>
@@ -664,29 +646,16 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0;MONO_BACKWARD_COMPAT</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Data.Sqlite\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.Data.Sqlite\</SourcePath>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Sources>
 			<Source type="list">Mono.Data.Sqlite.dll.sources</Source>
 			<Source>-resource:resources/SR.resources</Source>
 		</Sources>
 	</Assembly>
-	<Assembly name="Mono.Data.SqliteClient" destination="{destdir}\lib\mono\2.0\Mono.Data.SqliteClient.dll">
-		<References>
-			<Reference>System</Reference>
-			<Reference>System.Data</Reference>
-		</References>
-		<OutputType>library</OutputType>
-		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Data.SqliteClient\</SourcePath>
-		<Sources>
-			<Source type="list">Mono.Data.SqliteClient.dll.sources</Source>
-		</Sources>
-	</Assembly>
 
-	<Culevel source="{sourcedir}\mcs\class\System.Web\UplevelHelperDefinitions.xml" destination="{sourcedir}\mcs\class\System.Web\System.Web\UplevelHelper.cs" />
-	<Resgen workingdir="{sourcedir}\mcs\class\System.Web">{sourcedir}\mcs\class\System.Web\resources\TranslationResources.resx</Resgen>
+	<Culevel source="{sourcedir}\mono\mcs\class\System.Web\UplevelHelperDefinitions.xml" destination="{sourcedir}\mono\mcs\class\System.Web\System.Web\UplevelHelper.cs" />
+	<Resgen workingdir="{sourcedir}\mono\mcs\class\System.Web">{sourcedir}\mono\mcs\class\System.Web\resources\TranslationResources.resx</Resgen>
 
 	<Assembly name="System.Web" destination="{destdir}\lib\mono\2.0\System.Web.dll">
 		<References>
@@ -704,9 +673,22 @@
 		<DefineConstants>NET_1_1;NET_2_0;INSIDE_SYSTEM_WEB;SYSTEMCORE_DEP</DefineConstants>
 		<IgnoreWarnings>618,612</IgnoreWarnings>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\class\System.Web\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Web\</SourcePath>
 		<Sources>
 			<Source type="list">System.Web.dll.sources</Source>
+			<Source>System.Web.UI/KeyedList.cs</Source>
+			<Source>System.Web.UI/KeyedListEnumerator.cs</Source>
+			<Source>System.Web.Security/MembershipCreateStatus.cs</Source>
+			<Source>System.Web.Security/MembershipCreateUserException.cs</Source>
+			<Source>System.Web.Security/MembershipPasswordException.cs</Source>
+			<Source>System.Web.Security/MembershipPasswordFormat.cs</Source>
+			<Source>System.Web.Security/MembershipProviderCollection.cs</Source>
+			<Source>System.Web.Security/MembershipProvider.cs</Source>
+			<Source>System.Web.Security/MembershipUserCollection.cs</Source>
+			<Source>System.Web.Security/MembershipUser.cs</Source>
+			<Source>System.Web.Security/MembershipValidatePasswordEventHandler.cs</Source>
+			<Source>System.Web.Security/RoleProvider.cs</Source>
+			<Source>System.Web.Security/ValidatePasswordEventArgs.cs</Source>
 			<Source>System.Web/UplevelHelper.cs</Source>
 		</Sources>
 	</Assembly>
@@ -721,7 +703,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Web\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.Web\</SourcePath>
 		<Sources>
 			<Source type="list">Mono.Web.dll.sources</Source>
 		</Sources>
@@ -738,7 +720,7 @@
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
 		<IgnoreWarnings>649,169</IgnoreWarnings>
-		<SourcePath>{sourcedir}\mcs\class\System.Web.Services\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Web.Services\</SourcePath>
 		<Sources>
 			<Source type="list">System.Web.Services.dll.sources</Source>
 			<Source>-resource:System.Web.Services.Description/wsdl-1.1.xsd,wsdl-1.1.xsd</Source>
@@ -764,9 +746,22 @@
 		<DefineConstants>NET_1_1;NET_2_0;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP;MONOWEB_DEP;SYSTEMCORE_DEP</DefineConstants>
 		<IgnoreWarnings>618,612</IgnoreWarnings>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\class\System.Web\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Web\</SourcePath>
 		<Sources>
 			<Source type="list">System.Web.dll.sources</Source>
+			<Source>System.Web.UI/KeyedList.cs</Source>
+			<Source>System.Web.UI/KeyedListEnumerator.cs</Source>
+			<Source>System.Web.Security/MembershipCreateStatus.cs</Source>
+			<Source>System.Web.Security/MembershipCreateUserException.cs</Source>
+			<Source>System.Web.Security/MembershipPasswordException.cs</Source>
+			<Source>System.Web.Security/MembershipPasswordFormat.cs</Source>
+			<Source>System.Web.Security/MembershipProviderCollection.cs</Source>
+			<Source>System.Web.Security/MembershipProvider.cs</Source>
+			<Source>System.Web.Security/MembershipUserCollection.cs</Source>
+			<Source>System.Web.Security/MembershipUser.cs</Source>
+			<Source>System.Web.Security/MembershipValidatePasswordEventHandler.cs</Source>
+			<Source>System.Web.Security/RoleProvider.cs</Source>
+			<Source>System.Web.Security/ValidatePasswordEventArgs.cs</Source>
 			<Source>System.Web/UplevelHelper.cs</Source>
 			<Source>-resource:resources/TranslationResources.resources</Source>
 			<Source>-resource:resources/WebUIValidation.js</Source>
@@ -829,7 +824,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Runtime.Serialization.Formatters.Soap\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Runtime.Serialization.Formatters.Soap\</SourcePath>
 		<Sources>
 			<Source type="list">System.Runtime.Serialization.Formatters.Soap.dll.sources</Source>
 		</Sources>
@@ -844,7 +839,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Runtime.Remoting\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Runtime.Remoting\</SourcePath>
 		<Sources>
 			<Source type="list">System.Runtime.Remoting.dll.sources</Source>
 		</Sources>
@@ -857,7 +852,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Configuration.Install\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Configuration.Install\</SourcePath>
 		<Sources>
 			<Source type="list">System.Configuration.Install.dll.sources</Source>
 		</Sources>
@@ -870,43 +865,11 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Management\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Management\</SourcePath>
 		<Sources>
 			<Source type="list">System.Management.dll.sources</Source>
 		</Sources>
 	</Assembly>
-	<Assembly name="Mono.Data.SybaseClient" destination="{destdir}\lib\mono\2.0\Mono.Data.SybaseClient.dll">
-		<References>
-			<Reference>mscorlib</Reference>
-			<Reference>System</Reference>
-			<Reference>System.Xml</Reference>
-			<Reference>System.EnterpriseServices</Reference>
-			<Reference>System.Data</Reference>
-			<Reference>Mono.Data.Tds</Reference>
-		</References>
-		<OutputType>library</OutputType>
-		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Data.SybaseClient\</SourcePath>
-		<Sources>
-			<Source type="list">Mono.Data.SybaseClient.dll.sources</Source>
-		</Sources>
-	</Assembly>
-	<Assembly name="Mono.Data.TdsClient" destination="{destdir}\lib\mono\2.0\Mono.Data.TdsClient.dll">
-		<References>
-			<Reference>mscorlib</Reference>
-			<Reference>System</Reference>
-			<Reference>System.Xml</Reference>
-			<Reference>System.EnterpriseServices</Reference>
-			<Reference>System.Data</Reference>
-			<Reference>Mono.Data.Tds</Reference>
-		</References>
-		<OutputType>library</OutputType>
-		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Data.TdsClient\</SourcePath>
-		<Sources>
-			<Source type="list">Mono.Data.TdsClient.dll.sources</Source>
-		</Sources>
-	</Assembly>
 	<Assembly name="System.Data.OracleClient" destination="{destdir}\lib\mono\2.0\System.Data.OracleClient.dll">
 		<References>
 			<Reference>mscorlib</Reference>
@@ -918,7 +881,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Data.OracleClient\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Data.OracleClient\</SourcePath>
 		<Sources>
 			<Source type="list">System.Data.OracleClient.dll.sources</Source>
 		</Sources>
@@ -930,7 +893,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Microsoft.VisualC\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Microsoft.VisualC\</SourcePath>
 		<Sources>
 			<Source type="list">Microsoft.VisualC.dll.sources</Source>
 		</Sources>
@@ -942,7 +905,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Cscompmgd\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Cscompmgd\</SourcePath>
 		<Sources>
 			<Source type="list">Cscompmgd.dll.sources</Source>
 		</Sources>
@@ -961,7 +924,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Design\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Design\</SourcePath>
 		<Sources>
 			<Source type="list">System.Design.dll.sources</Source>
 		</Sources>
@@ -973,7 +936,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\PEAPI\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\PEAPI\</SourcePath>
 		<Sources>
 			<Source type="list">PEAPI.dll.sources</Source>
 		</Sources>
@@ -988,7 +951,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Npgsql\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Npgsql\</SourcePath>
 		<Sources>
 			<Source type="list">Npgsql.dll.sources</Source>
 		</Sources>
@@ -1002,33 +965,11 @@
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
 		<KeyFile>SharpZipLib.key</KeyFile>
-		<SourcePath>{sourcedir}\mcs\class\ICSharpCode.SharpZipLib\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\ICSharpCode.SharpZipLib\</SourcePath>
 		<Sources>
 			<Source type="list">ICSharpCode.SharpZipLib.dll.sources</Source>
 		</Sources>
 	</Assembly>
-	<Assembly name="ByteFX.Data" destination="{destdir}\lib\mono\2.0\ByteFX.Data.dll">
-		<References>
-			<Reference>mscorlib</Reference>
-			<Reference>System</Reference>
-			<Reference>System.Xml</Reference>
-			<Reference>System.Data</Reference>
-			<Reference>ICSharpCode.SharpZipLib</Reference>
-			<Reference>System.Design</Reference>
-			<Reference>System.Drawing</Reference>
-			<Reference>System.Windows.Forms</Reference>
-			<Reference>Mono.Posix</Reference>
-		</References>
-		<OutputType>library</OutputType>
-		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\ByteFX.Data\</SourcePath>
-		<Sources>
-			<Source type="list">ByteFX.Data.dll.sources</Source>
-			<Source>/res:mysqlclient/Designers/command.bmp</Source>
-			<Source>/res:mysqlclient/Designers/connection.bmp</Source>
-			<Source>/res:mysqlclient/Designers/dataadapter.bmp</Source>
-		</Sources>
-	</Assembly>
 	<Assembly name="Commons.Xml.Relaxng" destination="{destdir}\lib\mono\2.0\Commons.Xml.Relaxng.dll">
 		<References>
 			<Reference>mscorlib</Reference>
@@ -1037,7 +978,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Commons.Xml.Relaxng\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Commons.Xml.Relaxng\</SourcePath>
 		<Sources>
 			<Source type="list">Commons.Xml.Relaxng.dll.sources</Source>
 			<Source>/resource:resources/relaxng.rng,relaxng.rng</Source>
@@ -1045,7 +986,7 @@
 		</Sources>
 	</Assembly>
 
-	<Resgen workingdir="{sourcedir}\mcs\class\Novell.Directory.Ldap">{sourcedir}\mcs\class\Novell.Directory.Ldap\Novell.Directory.Ldap.Utilclass\ResultCodeMessages.resx</Resgen>
+	<Resgen workingdir="{sourcedir}\mono\mcs\class\Novell.Directory.Ldap">{sourcedir}\mono\mcs\class\Novell.Directory.Ldap\Novell.Directory.Ldap.Utilclass\ResultCodeMessages.resx</Resgen>
 
 	<Assembly name="Novell.Directory.Ldap" destination="{destdir}\lib\mono\2.0\Novell.Directory.Ldap.dll">
 		<References>
@@ -1056,7 +997,7 @@
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
 		<IgnoreWarnings>649,169,219,168</IgnoreWarnings>
-		<SourcePath>{sourcedir}\mcs\class\Novell.Directory.Ldap\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Novell.Directory.Ldap\</SourcePath>
 		<Sources>
 			<Source type="list">Novell.Directory.Ldap.dll.sources</Source>
 			<Source>/res:Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resources</Source>
@@ -1068,7 +1009,7 @@
 		<OutputType>library</OutputType>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Security.Win32\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.Security.Win32\</SourcePath>
 		<Sources>
 			<Source type="list">Mono.Security.Win32.dll.sources</Source>
 		</Sources>
@@ -1081,7 +1022,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.DirectoryServices\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.DirectoryServices\</SourcePath>
 		<Sources>
 			<Source type="list">System.DirectoryServices.dll.sources</Source>
 		</Sources>
@@ -1093,7 +1034,7 @@
     </References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Messaging\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.Messaging\</SourcePath>
 		<Sources>
 			<Source type="list">Mono.Messaging.dll.sources</Source>
 		</Sources>
@@ -1109,25 +1050,25 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Messaging\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Messaging\</SourcePath>
 		<Sources>
 			<Source type="list">System.Messaging.dll.sources</Source>
 			<Source>/resource:System.Messaging/MessageQueue.resx</Source>
 		</Sources>
 	</Assembly>
-	<Assembly name="RabbitMQ.Client" destination="{destdir}\lib\mono\2.0\RabbitMQ.Client.dll">
+	<Assembly enabled="false" name="RabbitMQ.Client" destination="{destdir}\lib\mono\2.0\RabbitMQ.Client.dll">
 		<References>
 			<Reference>System</Reference>
 			<Reference>System.Xml</Reference>
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\RabbitMQ.Client\src\client\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\RabbitMQ.Client\src\client\</SourcePath>
 		<Sources>
 			<Source type="list">RabbitMQ.Client.dll.sources</Source>
 		</Sources>
 	</Assembly>
-	<Assembly name="Mono.Messaging.RabbitMQ" destination="{destdir}\lib\mono\2.0\Mono.Messaging.RabbitMQ.dll">
+  <Assembly enabled="false" name="Mono.Messaging.RabbitMQ" destination="{destdir}\lib\mono\2.0\Mono.Messaging.RabbitMQ.dll">
 		<References>
 			<Reference>System</Reference>
 			<Reference>System.Messaging</Reference>
@@ -1136,7 +1077,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Messaging.RabbitMQ\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.Messaging.RabbitMQ\</SourcePath>
 		<Sources>
 			<Source type="list">Mono.Messaging.RabbitMQ.dll.sources</Source>
 		</Sources>
@@ -1150,7 +1091,7 @@
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
 		<IgnoreWarnings>618</IgnoreWarnings>
-		<SourcePath>{sourcedir}\mcs\class\System.ServiceProcess\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.ServiceProcess\</SourcePath>
 		<Sources>
 			<Source type="list">System.ServiceProcess.dll.sources</Source>
 		</Sources>
@@ -1164,7 +1105,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Drawing.Design\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Drawing.Design\</SourcePath>
 		<Sources>
 			<Source type="list">System.Drawing.Design.dll.sources</Source>
 		</Sources>
@@ -1184,7 +1125,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>DRAWING_DESIGN_DEP;NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Design\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Design\</SourcePath>
 		<Sources>
 			<Source type="list">System.Design.dll.sources</Source>
 		</Sources>
@@ -1200,28 +1141,17 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Http\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.Http\</SourcePath>
 		<Sources>
 			<Source type="list">Mono.Http.dll.sources</Source>
 		</Sources>
 	</Assembly>
-	<Assembly name="Microsoft.Vsa" destination="{destdir}\lib\mono\2.0\Microsoft.Vsa.dll">
-		<References>
-			<Reference>System</Reference>
-		</References>
-		<OutputType>library</OutputType>
-		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Microsoft.Vsa\</SourcePath>
-		<Sources>
-			<Source type="list">Microsoft.Vsa.dll.sources</Source>
-		</Sources>
-	</Assembly>
 	<Assembly name="Mono.Cairo" destination="{destdir}\lib\mono\2.0\Mono.Cairo.dll">
 		<References>
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Cairo\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.Cairo\</SourcePath>
 		<Sources>
 			<Source type="list">Mono.Cairo.dll.sources</Source>
 		</Sources>
@@ -1234,25 +1164,13 @@
 			<Reference>System.Data</Reference>
 		</References>
 		<OutputType>library</OutputType>
-		<SourcePath>{sourcedir}\mcs\class\IBM.Data.DB2\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\IBM.Data.DB2\</SourcePath>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Sources>
 			<Source type="list">IBM.Data.DB2.dll.sources</Source>
 		</Sources>
 	</Assembly>
-	<Assembly name="Microsoft.JScript" destination="{destdir}\lib\mono\2.0\Microsoft.JScript.dll">
-		<References>
-			<Reference>System</Reference>
-			<Reference>Microsoft.Vsa</Reference>
-		</References>
-		<OutputType>library</OutputType>
-		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Microsoft.JScript\</SourcePath>
-		<Sources>
-			<Source type="list">Microsoft.JScript.dll.sources</Source>
-		</Sources>
-	</Assembly>
 	<Assembly name="CustomMarshalers" destination="{destdir}\lib\mono\2.0\CustomMarshalers.dll">
 		<References>
 			<Reference>mscorlib</Reference>
@@ -1260,7 +1178,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\CustomMarshalers\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\CustomMarshalers\</SourcePath>
 		<Sources>
 			<Source type="list">CustomMarshalers.dll.sources</Source>
 		</Sources>
@@ -1270,7 +1188,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\OpenSystem.C\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\OpenSystem.C\</SourcePath>
 		<Sources>
 			<Source type="list">OpenSystem.C.dll.sources</Source>
 		</Sources>
@@ -1282,7 +1200,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Microsoft.Build.Framework\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Microsoft.Build.Framework\</SourcePath>
 		<Sources>
 			<Source type="list">Microsoft.Build.Framework.dll.sources</Source>
 		</Sources>
@@ -1295,7 +1213,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Microsoft.Build.Utilities\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Microsoft.Build.Utilities\</SourcePath>
 		<Sources>
 			<Source type="list">Microsoft.Build.Utilities.dll.sources</Source>
 		</Sources>
@@ -1304,13 +1222,14 @@
 		<References>
 			<Reference>mscorlib</Reference>
 			<Reference>System</Reference>
+			<Reference>System.Core</Reference>
 			<Reference>System.Xml</Reference>
 			<Reference>Microsoft.Build.Framework</Reference>
 			<Reference>Microsoft.Build.Utilities</Reference>
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Microsoft.Build.Engine\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Microsoft.Build.Engine\</SourcePath>
 		<Sources>
 			<Source type="list">Microsoft.Build.Engine.dll.sources</Source>
 		</Sources>
@@ -1328,7 +1247,7 @@
     </References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Microsoft.Build.Tasks\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Microsoft.Build.Tasks\</SourcePath>
 		<Sources>
 			<Source type="list">Microsoft.Build.Tasks.dll.sources</Source>
 		</Sources>
@@ -1341,7 +1260,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Xml.Linq\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Xml.Linq\</SourcePath>
 		<IgnoreWarnings>1720</IgnoreWarnings>
 		<Sources>
 			<Source type="list">System.Xml.Linq.dll.sources</Source>
@@ -1358,7 +1277,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Data.DataSetExtensions\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Data.DataSetExtensions\</SourcePath>
 		<IgnoreWarnings>1720</IgnoreWarnings>
 		<Sources>
 			<Source type="list">System.Data.DataSetExtensions.dll.sources</Source>
@@ -1374,7 +1293,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Runtime.Serialization\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Runtime.Serialization\</SourcePath>
 		<IgnoreWarnings>168,169,219,414</IgnoreWarnings>
 		<Sources>
 			<Source type="list">System.Runtime.Serialization.dll.sources</Source>
@@ -1391,7 +1310,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0;NET_3_5;MONO_STRICT;MONO_DEPLOY</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Data.Linq\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Data.Linq\</SourcePath>
 		<IgnoreWarnings>1720</IgnoreWarnings>
 		<Sources>
 			<Source type="list">System.Data.Linq.dll.sources</Source>
@@ -1405,7 +1324,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Web.Abstractions\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Web.Abstractions\</SourcePath>
 		<Sources>
 			<Source type="list">System.Web.Abstractions.dll.sources</Source>
 		</Sources>
@@ -1419,7 +1338,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Web.Routing\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Web.Routing\</SourcePath>
 		<Sources>
 			<Source type="list">System.Web.Routing.dll.sources</Source>
 		</Sources>
@@ -1435,7 +1354,7 @@
     </References>
     <OutputType>library</OutputType>
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>
-    <SourcePath>{sourcedir}\mcs\class\System.IdentityModel\</SourcePath>
+    <SourcePath>{sourcedir}\mono\mcs\class\System.IdentityModel\</SourcePath>
     <Sources>
       <Source type="list">System.IdentityModel.dll.sources</Source>
     </Sources>
@@ -1450,7 +1369,7 @@
     </References>
     <OutputType>library</OutputType>
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>
-    <SourcePath>{sourcedir}\mcs\class\System.IdentityModel.Selectors\</SourcePath>
+    <SourcePath>{sourcedir}\mono\mcs\class\System.IdentityModel.Selectors\</SourcePath>
     <Sources>
       <Source type="list">System.IdentityModel.Selectors.dll.sources</Source>
     </Sources>
@@ -1476,7 +1395,7 @@
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>
     <IgnoreWarnings>414,169,67,3005,436,219,618</IgnoreWarnings>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SourcePath>{sourcedir}\mcs\class\System.ServiceModel\</SourcePath>
+    <SourcePath>{sourcedir}\mono\mcs\class\System.ServiceModel\</SourcePath>
     <Sources>
       <Source type="list">System.ServiceModel.dll.sources</Source>
       <Source>/resource:resources/WS-Addressing.schema</Source>
@@ -1500,7 +1419,7 @@
     </References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0;NET_3_5;SYSTEM_WEB_EXTENSIONS</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Web.Extensions\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Web.Extensions\</SourcePath>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Sources>
 			<Source type="list">System.Web.Extensions.dll.sources</Source>
@@ -1513,7 +1432,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Web.Extensions.Design\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Web.Extensions.Design\</SourcePath>
 		<Sources>
 			<Source type="list">System.Web.Extensions.Design.dll.sources</Source>
 		</Sources>
@@ -1530,7 +1449,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.ServiceModel.Web\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.ServiceModel.Web\</SourcePath>
 		<Sources>
 			<Source type="list">System.ServiceModel.Web.dll.sources</Source>
 		</Sources>
@@ -1543,7 +1462,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Management\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.Management\</SourcePath>
 		<Sources>
 			<Source type="list">Mono.Management.dll.sources</Source>
 		</Sources>
@@ -1555,7 +1474,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\Mono.Simd\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\Mono.Simd\</SourcePath>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Sources>
 			<Source type="list">Mono.Simd.dll.sources</Source>
@@ -1570,7 +1489,7 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.ComponentModel.DataAnnotations\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.ComponentModel.DataAnnotations\</SourcePath>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Sources>
 			<Source type="list">System.ComponentModel.DataAnnotations.dll.sources</Source>
@@ -1591,14 +1510,14 @@
 		</References>
 		<OutputType>library</OutputType>
 		<DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>
-		<SourcePath>{sourcedir}\mcs\class\System.Web.DynamicData\</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\class\System.Web.DynamicData\</SourcePath>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Sources>
 			<Source type="list">System.Web.DynamicData.dll.sources</Source>
 		</Sources>
 	</Assembly>
   
-  <Resgen workingdir="{sourcedir}\mcs\class\System.Web.Mvc">{sourcedir}\mcs\class\System.Web.Mvc\System.Web.Mvc\Resources\MvcResources.resx</Resgen>
+  <Resgen workingdir="{sourcedir}\mono\mcs\class\System.Web.Mvc">{sourcedir}\mono\mcs\class\System.Web.Mvc\System.Web.Mvc\Resources\MvcResources.resx</Resgen>
 
   <Assembly name="System.Web.Mvc" destination="{destdir}\lib\mono\2.0\System.Web.Mvc.dll">
     <References>
@@ -1614,7 +1533,7 @@
     </References>
     <OutputType>library</OutputType>
     <DefineConstants>NET_1_1;NET_2_0;NET_3_5;MONO</DefineConstants>
-    <SourcePath>{sourcedir}\mcs\class\System.Web.Mvc\</SourcePath>
+    <SourcePath>{sourcedir}\mono\mcs\class\System.Web.Mvc\</SourcePath>
     <Sources>
       <Source type="list">System.Web.Mvc.dll.sources</Source>
       <Source>/resource:System.Web.Mvc\Resources\MvcResources.resx</Source>
@@ -1627,7 +1546,7 @@
     </References>
     <OutputType>library</OutputType>
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>
-    <SourcePath>{sourcedir}\mcs\class\WindowsBase\</SourcePath>
+    <SourcePath>{sourcedir}\mono\mcs\class\WindowsBase\</SourcePath>
     <Sources>
       <Source type="list">WindowsBase.dll.sources</Source>
     </Sources>
@@ -1637,7 +1556,7 @@
     <References>
     </References>
     <OutputType>library</OutputType>
-    <SourcePath>{sourcedir}\mcs\class\Mono.Tasklets\</SourcePath>
+    <SourcePath>{sourcedir}\mono\mcs\class\Mono.Tasklets\</SourcePath>
     <DefineConstants>NET_1_1;NET_2_0</DefineConstants>
     <Sources>
       <Source type="list">Mono.Tasklets.dll.sources</Source>
@@ -1645,7 +1564,7 @@
   </Assembly>
 
   <!-- Cecil looks for the signing key in the wrong place for our setup -->
-  <Copy source="{sourcedir}\mcs\class\mono.snk" destination="{sourcedir}\mcs\mono.snk" />
+  <Copy source="{sourcedir}\mono\mcs\class\mono.snk" destination="{sourcedir}\mono\mcs\mono.snk" />
 
   <Assembly name="Mono.Cecil" destination="{destdir}\lib\mono\2.0\Mono.Cecil.dll">
     <References>
@@ -1653,7 +1572,7 @@
     </References>
     <OutputType>library</OutputType>
     <DefineConstants>NET_1_1;NET_2_0;KEYFILE</DefineConstants>
-    <SourcePath>{sourcedir}\mcs\class\Mono.Cecil\</SourcePath>
+    <SourcePath>{sourcedir}\mono\mcs\class\Mono.Cecil\</SourcePath>
     <Sources>
       <Source type="list">Mono.Cecil.dll.sources</Source>
     </Sources>
@@ -1665,94 +1584,103 @@
     </References>
     <OutputType>library</OutputType>
     <DefineConstants>NET_1_1;NET_2_0;CECIL</DefineConstants>
-    <SourcePath>{sourcedir}\mcs\class\Mono.Cecil.Mdb\</SourcePath>
+    <SourcePath>{sourcedir}\mono\mcs\class\Mono.Cecil.Mdb\</SourcePath>
     <Sources>
       <Source type="list">Mono.Cecil.Mdb.dll.sources</Source>
     </Sources>
   </Assembly>
+  <Assembly name="Mono.Debugger.Soft" destination="{destdir}\lib\mono\2.0\Mono.Debugger.Soft.dll">
+    <References>
+      <Reference>mscorlib</Reference>
+      <Reference>System</Reference>
+      <Reference>System.Core</Reference>
+      <Reference>Mono.Cecil</Reference>
+    </References>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <OutputType>library</OutputType>
+    <KeyFile>{sourcedir}\mono\mcs\class\mono.snk</KeyFile>
+    <SourcePath>{sourcedir}\mono\mcs\class\Mono.Debugger.Soft\</SourcePath>
+    <DefineConstants>NET_1_1;NET_2_0;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>
+    <Sources>
+      <Source type="list">Mono.Debugger.Soft.dll.sources</Source>
+    </Sources>
+  </Assembly>
 
-  <Sign assembly="{destdir}\lib\mono\2.0\I18N.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\I18N.West.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\I18N.MidEast.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\I18N.Other.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\I18N.Rare.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\I18N.CJK.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Drawing.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Transactions.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.EnterpriseServices.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.C5.dll" key="{sourcedir}\mcs\class\Mono.C5\c5.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Data.Tds.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Data.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Data.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.GetOptions.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Posix.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Accessibility.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.WebBrowser.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Windows.Forms.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Data.Sqlite.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Data.SqliteClient.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Web.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Web.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Web.Services.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Runtime.Serialization.Formatters.Soap.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Runtime.Remoting.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Configuration.Install.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Management.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Data.SybaseClient.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Data.TdsClient.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Data.OracleClient.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Microsoft.VisualC.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Cscompmgd.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Design.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\PEAPI.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Npgsql.dll" key="{sourcedir}\mcs\class\Npgsql\Npgsql\Npgsql.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\ICSharpCode.SharpZipLib.dll" key="{sourcedir}\mcs\class\ICSharpCode.SharpZipLib\SharpZipLib.key" />
-	<Sign assembly="{destdir}\lib\mono\2.0\ByteFX.Data.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Commons.Xml.Relaxng.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Novell.Directory.Ldap.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Security.Win32.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.DirectoryServices.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Messaging.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.ServiceProcess.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Drawing.Design.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Design.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Http.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Vsa.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Cairo.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\IBM.Data.DB2.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Microsoft.JScript.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\CustomMarshalers.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\OpenSystem.C.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Framework.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Utilities.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Engine.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Tasks.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Core.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Xml.Linq.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Data.DataSetExtensions.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Data.Linq.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Web.Abstractions.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Web.Routing.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Web.Extensions.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Web.Extensions.Design.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.Runtime.Serialization.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.IdentityModel.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.IdentityModel.Selectors.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.ServiceModel.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.ServiceModel.Web.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Management.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Simd.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Messaging.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Messaging.RabbitMQ.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\RabbitMQ.Client.dll" key="{sourcedir}\mcs\class\mono.snk" />
-	<Sign assembly="{destdir}\lib\mono\2.0\System.ComponentModel.DataAnnotations.dll" key="{sourcedir}\mcs\class\mono.snk" />
-  <Sign assembly="{destdir}\lib\mono\2.0\System.Web.DynamicData.dll" key="{sourcedir}\mcs\class\mono.snk" />
-  <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Mvc.dll" key="{sourcedir}\mcs\class\mono.snk" />
-  <Sign assembly="{destdir}\lib\mono\2.0\WindowsBase.dll" key="{sourcedir}\mcs\class\mono.snk" />
-  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Tasklets.dll" key="{sourcedir}\mcs\class\mono.snk" />
-  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Cecil.dll" key="{sourcedir}\mcs\class\mono.snk" />
-  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Cecil.Mdb.dll" key="{sourcedir}\mcs\class\mono.snk" />
-  <Sign assembly="{destdir}\lib\mono\2.0\Mono.CompilerServices.SymbolWriter.dll" key="{sourcedir}\mcs\class\mono.snk" />
+  <Sign assembly="{destdir}\lib\mono\2.0\I18N.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\I18N.West.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\I18N.MidEast.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\I18N.Other.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\I18N.Rare.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\I18N.CJK.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Drawing.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Transactions.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.EnterpriseServices.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Mono.C5.dll" key="{sourcedir}\mono\mcs\class\Mono.C5\c5.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Data.Tds.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Data.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Posix.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Accessibility.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Mono.WebBrowser.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Windows.Forms.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Data.Sqlite.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Web.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Web.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Web.Services.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Runtime.Serialization.Formatters.Soap.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Runtime.Remoting.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Configuration.Install.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Management.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Data.OracleClient.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Microsoft.VisualC.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Cscompmgd.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Design.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\PEAPI.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Npgsql.dll" key="{sourcedir}\mono\mcs\class\Npgsql\Npgsql\Npgsql.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\ICSharpCode.SharpZipLib.dll" key="{sourcedir}\mono\mcs\class\ICSharpCode.SharpZipLib\SharpZipLib.key" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Commons.Xml.Relaxng.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Novell.Directory.Ldap.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Security.Win32.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.DirectoryServices.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Messaging.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.ServiceProcess.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Drawing.Design.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Design.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Http.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Cairo.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\IBM.Data.DB2.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\CustomMarshalers.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\OpenSystem.C.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Framework.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Utilities.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Engine.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Tasks.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Core.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Xml.Linq.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Data.DataSetExtensions.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Data.Linq.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Web.Abstractions.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Web.Routing.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Web.Extensions.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Web.Extensions.Design.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.Runtime.Serialization.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.IdentityModel.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.IdentityModel.Selectors.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.ServiceModel.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.ServiceModel.Web.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Management.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Simd.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\Mono.Messaging.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+  <Sign enabled="false" assembly="{destdir}\lib\mono\2.0\Mono.Messaging.RabbitMQ.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+  <Sign enabled="false" assembly="{destdir}\lib\mono\2.0\RabbitMQ.Client.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+	<Sign assembly="{destdir}\lib\mono\2.0\System.ComponentModel.DataAnnotations.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+  <Sign assembly="{destdir}\lib\mono\2.0\System.Web.DynamicData.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+  <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Mvc.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+  <Sign assembly="{destdir}\lib\mono\2.0\WindowsBase.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Tasklets.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Cecil.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Cecil.Mdb.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+  <Sign assembly="{destdir}\lib\mono\2.0\Mono.CompilerServices.SymbolWriter.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
+  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Debugger.Soft.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />
 
   <!-- GAC our assemblies -->
 	<Gac>{destdir}\lib\mono\2.0\System.dll</Gac>
@@ -1772,14 +1700,11 @@
 	<Gac>{destdir}\lib\mono\2.0\Mono.C5.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Mono.Data.Tds.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\System.Data.dll</Gac>
-	<Gac>{destdir}\lib\mono\2.0\Mono.Data.dll</Gac>
-	<Gac>{destdir}\lib\mono\2.0\Mono.GetOptions.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Mono.Posix.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Accessibility.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Mono.WebBrowser.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\System.Windows.Forms.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Mono.Data.Sqlite.dll</Gac>
-	<Gac>{destdir}\lib\mono\2.0\Mono.Data.SqliteClient.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\System.Web.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Mono.Web.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\System.Web.Services.dll</Gac>
@@ -1787,8 +1712,6 @@
 	<Gac>{destdir}\lib\mono\2.0\System.Runtime.Remoting.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\System.Configuration.Install.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\System.Management.dll</Gac>
-	<Gac>{destdir}\lib\mono\2.0\Mono.Data.SybaseClient.dll</Gac>
-	<Gac>{destdir}\lib\mono\2.0\Mono.Data.TdsClient.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\System.Data.OracleClient.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Microsoft.VisualC.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Cscompmgd.dll</Gac>
@@ -1796,7 +1719,6 @@
 	<Gac>{destdir}\lib\mono\2.0\PEAPI.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Npgsql.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\ICSharpCode.SharpZipLib.dll</Gac>
-	<Gac>{destdir}\lib\mono\2.0\ByteFX.Data.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Commons.Xml.Relaxng.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Novell.Directory.Ldap.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Mono.Security.Win32.dll</Gac>
@@ -1806,10 +1728,8 @@
 	<Gac>{destdir}\lib\mono\2.0\System.Drawing.Design.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\System.Design.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Mono.Http.dll</Gac>
-	<Gac>{destdir}\lib\mono\2.0\Microsoft.Vsa.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Mono.Cairo.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\IBM.Data.DB2.dll</Gac>
-	<Gac>{destdir}\lib\mono\2.0\Microsoft.JScript.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\CustomMarshalers.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\OpenSystem.C.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Microsoft.Build.Framework.dll</Gac>
@@ -1832,8 +1752,8 @@
 	<Gac>{destdir}\lib\mono\2.0\Mono.Management.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Mono.Simd.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\Mono.Messaging.dll</Gac>
-	<Gac>{destdir}\lib\mono\2.0\Mono.Messaging.RabbitMQ.dll</Gac>
-	<Gac>{destdir}\lib\mono\2.0\RabbitMQ.Client.dll</Gac>
+  <Gac enabled="false">{destdir}\lib\mono\2.0\Mono.Messaging.RabbitMQ.dll</Gac>
+  <Gac enabled="false">{destdir}\lib\mono\2.0\RabbitMQ.Client.dll</Gac>
 	<Gac>{destdir}\lib\mono\2.0\System.ComponentModel.DataAnnotations.dll</Gac>
   <Gac>{destdir}\lib\mono\2.0\System.Web.DynamicData.dll</Gac>
   <Gac>{destdir}\lib\mono\2.0\System.Web.Mvc.dll</Gac>
@@ -1842,6 +1762,7 @@
   <Gac>{destdir}\lib\mono\2.0\Mono.Cecil.dll</Gac>
   <Gac>{destdir}\lib\mono\2.0\Mono.Cecil.Mdb.dll</Gac>
   <Gac>{destdir}\lib\mono\2.0\Mono.CompilerServices.SymbolWriter.dll</Gac>
+  <Gac>{destdir}\lib\mono\2.0\Mono.Debugger.Soft.dll</Gac>
 
   <!-- Build some more tools -->
 	<Assembly name="al" destination="{destdir}\lib\mono\2.0\al.exe">
@@ -1849,7 +1770,7 @@
 		<References>
 			<Reference>Mono.Security</Reference>
 		</References>
-		<SourcePath>{sourcedir}\mcs\tools\al</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\tools\al</SourcePath>
 		<NoConfig>false</NoConfig>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<Debug>true</Debug>
@@ -1865,7 +1786,7 @@
 		<Reference>Mono.Management</Reference>
 		</References>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<SourcePath>{sourcedir}\mcs\tools\csharp</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\tools\csharp</SourcePath>
 		<NoConfig>false</NoConfig>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<Debug>true</Debug>
@@ -1879,7 +1800,7 @@
 		<References>
 			<Reference>Mono.Security</Reference>
 		</References>
-		<SourcePath>{sourcedir}\mcs\tools\security</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\tools\security</SourcePath>
 		<NoConfig>false</NoConfig>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<Debug>true</Debug>
@@ -1896,7 +1817,7 @@
 		<Reference>Mono.CompilerServices.SymbolWriter</Reference>
 		<Reference>Mono.Security</Reference>
 		</References>
-		<SourcePath>{sourcedir}\mcs\ilasm</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\ilasm</SourcePath>
 		<NoConfig>false</NoConfig>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<Debug>true</Debug>
@@ -1909,7 +1830,7 @@
 		<OutputType>exe</OutputType>
 		<References>
 		<Reference>System.Configuration.Install</Reference></References>
-		<SourcePath>{sourcedir}\mcs\tools\installutil</SourcePath>
+		<SourcePath>{sourcedir}\mono\mcs\tools\installutil</SourcePath>
 		<NoConfig>false</NoConfig>
 		<DefineConstants>NET_1_1,NET_2_0</DefineConstants>
 		<Debug>true</Debug>
@@ -1923,7 +1844,7 @@
       <Reference>System.Xml</Reference>
       <Reference>System.Web.Services</Reference>
     </References>
-    <SourcePath>{sourcedir}\mcs\tools\wsdl</SourcePath>
+    <SourcePath>{sourcedir}\mono\mcs\tools\wsdl</SourcePath>
     <NoConfig>false</NoConfig>
     <DefineConstants>NET_1_1,NET_2_0</DefineConstants>
     <Debug>true</Debug>
@@ -1938,7 +1859,7 @@
       <Reference>Microsoft.Build.Utilities</Reference>
       <Reference>Microsoft.Build.Engine</Reference>
     </References>
-    <SourcePath>{sourcedir}\mcs\tools\xbuild</SourcePath>
+    <SourcePath>{sourcedir}\mono\mcs\tools\xbuild</SourcePath>
     <NoConfig>false</NoConfig>
     <DefineConstants>NET_1_1,NET_2_0</DefineConstants>
     <Debug>true</Debug>
@@ -1965,7 +1886,7 @@
 	</Output>
 
   <!-- Copy some static things we want to ship -->
-  <Copy source="{sourcedir}\mcs\mcs\gmcs.exe.config" destination="{destdir}\lib\mono\2.0\gmcs.exe.config" />
+  <Copy source="{sourcedir}\mono\mcs\mcs\gmcs.exe.config" destination="{destdir}\lib\mono\2.0\gmcs.exe.config" />
 
   <!-- Delete things we don't want to end up in the installer -->
 	<Delete type="file">{destdir}\lib\mono\2.0\culevel.exe</Delete>
@@ -1975,4 +1896,4 @@
 
 	<!-- Build the wix includes files -->
 	<WixInclude installeronly="true" root="{destdir}" wixfiles="{destdir}\Files.wxi" wixcomponents="{destdir}\Components.wxi"/>
-</Assemblies>
\ No newline at end of file
+</Assemblies>