Merge pull request #5714 from alexischr/update_bockbuild
[mono.git] / msvc / win32.xml
index 133bc711940e19b16c0a1853d69c77fa001374b5..6263590c1108efd95c39f3d7d8e55b06d367f34b 100644 (file)
@@ -5,19 +5,21 @@
        <Delete type="directory">{destdir}\lib</Delete>\r
 \r
        <Copy source="{monobuilddir}\mono.exe" destination="{destdir}\bin\mono.exe" />\r
-       <Copy source="{monobuilddir}\mono.dll" destination="{destdir}\bin\mono.dll" />\r
+       <Copy source="{monobuilddir}\mono-2.0.dll" destination="{destdir}\bin\mono-2.0.dll" />\r
        <Copy source="{monobuilddir}\MonoPosixHelper.dll" destination="{destdir}\bin\MonoPosixHelper.dll" />\r
 \r
        <!-- Copy Consts.cs.in and insert this revision number -->\r
-       <Copy source="{sourcedir}\mcs\build\common\Consts.cs.in" destination="{sourcedir}\mcs\build\common\Consts.cs" />\r
-       <Regex source="{sourcedir}\mcs\build\common\Consts.cs" pattern="@MONO_VERSION@" replacement="2.5.0.0" />\r
+       <Copy source="{sourcedir}\mono\mcs\build\common\Consts.cs.in" destination="{sourcedir}\mono\mcs\build\common\Consts.cs" />\r
+       <Regex source="{sourcedir}\mono\mcs\build\common\Consts.cs" pattern="@MONO_VERSION@" replacement="2.5.0.0" />\r
        \r
        <!-- Make the \etc directory -->\r
        <Copy source="{sourcedir}\mono\data\net_2_0\machine.config" destination="{destdir}\etc\mono\2.0\machine.config" />\r
        <Copy source="{sourcedir}\mono\data\net_2_0\DefaultWsdlHelpGenerator.aspx" destination="{destdir}\etc\mono\2.0\DefaultWsdlHelpGenerator.aspx" />\r
        <Copy source="{sourcedir}\mono\data\net_2_0\settings.map" destination="{destdir}\etc\mono\2.0\settings.map" />\r
        <Copy source="{sourcedir}\mono\data\net_2_0\web.config" destination="{destdir}\etc\mono\2.0\web.config" />\r
-       <Copy source="{sourcedir}\mono\data\net_2_0\Browsers\Compat.browser" destination="{destdir}\etc\mono\2.0\Browsers\Compat.browser" />\r
+       <Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\2.0\Browsers\Compat.browser" />\r
+       <Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\4.0\Browsers\Compat.browser" />\r
+       <Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\4.5\Browsers\Compat.browser" />\r
        <Copy source="{sourcedir}\mono\data\browscap.ini" destination="{destdir}\etc\mono\browscap.ini" />\r
 \r
        <!-- Bring in xulrunner -->\r
@@ -30,8 +32,8 @@
 \r
        <Copy source="{sourcedir}\mono\msvc\jaystuff.bat" destination="{sourcedir}\jaystuff.bat" />\r
 \r
-       <Copy source="{sourcedir}\mcs\class\System.XML\System.Xml.XPath\Parser.jay" destination="{sourcedir}\mcs\class\System.XML\Mono.Xml.Xsl\PatternParser.jay" />\r
-       <Regex source="{sourcedir}\mcs\class\System.XML\Mono.Xml.Xsl\PatternParser.jay" pattern="%start Expr" replacement="%start Pattern" />\r
+       <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" />\r
+       <Regex source="{sourcedir}\mono\mcs\class\System.XML\Mono.Xml.Xsl\PatternParser.jay" pattern="%start Expr" replacement="%start Pattern" />\r
 \r
        <Run source="{sourcedir}\jaystuff.bat" />\r
 \r
@@ -39,7 +41,7 @@
        <Assembly name="gmcs" destination="{destdir}\lib\mono\2.0\gmcs.exe" mono="install">\r
                <OutputType>exe</OutputType>\r
                <DefineConstants>GMCS_SOURCE,NET_1_1,NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\mcs</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\mcs</SourcePath>\r
                <Debug>false</Debug>\r
                <NoConfig>false</NoConfig>\r
                <Sources>\r
@@ -50,7 +52,7 @@
        <Assembly name="mscorlib" destination="{destdir}\lib\mono\2.0\mscorlib.dll" mono="install">\r
                <OutputType>library</OutputType>\r
                <DefineConstants>INSIDE_CORLIB,NET_1_1,NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\corlib</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\corlib</SourcePath>\r
                <Debug>false</Debug>\r
                <NoStandardLib>true</NoStandardLib>\r
                <IgnoreWarnings>612,618</IgnoreWarnings>\r
@@ -78,7 +80,7 @@
                <DefineConstants>NET_1_1;NET_2_0;CONFIGURATION_2_0;XML_DEP;SECURITY_DEP;CONFIGURATION_DEP</DefineConstants>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <IgnoreWarnings>618</IgnoreWarnings>\r
-               <SourcePath>{sourcedir}\mcs\class\System\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.dll.sources</Source>\r
                        <Source>-resource:resources/Asterisk.wav</Source>\r
@@ -96,7 +98,7 @@
                <OutputType>library</OutputType>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <Debug>false</Debug>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.Security\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.Security\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Mono.Security.dll.sources</Source>\r
                </Sources>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <IgnoreWarnings>612,618,642</IgnoreWarnings>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Xml</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Xml</SourcePath>\r
                <Debug>false</Debug>\r
                <Sources>\r
                        <Source type="list">System.Xml.dll.sources</Source>\r
                <Debug>false</Debug>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <IgnoreWarnings>618,414</IgnoreWarnings>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Security\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Security\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Security.dll.sources</Source>\r
                </Sources>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <Debug>false</Debug>\r
                <IgnoreWarnings>618,414</IgnoreWarnings>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Configuration\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Configuration\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Configuration.dll.sources</Source>\r
                </Sources>\r
        </Assembly>\r
        <Assembly name="Mono.CompilerServices.SymbolWriter" destination="{destdir}\lib\mono\2.0\Mono.CompilerServices.SymbolWriter.dll" mono="install">\r
+               <References>\r
+                       <Reference>System</Reference>\r
+               </References>\r
                <OutputType>library</OutputType>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.CompilerServices.SymbolWriter</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.CompilerServices.SymbolWriter</SourcePath>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <Debug>false</Debug>\r
                <Sources>\r
     </References>\r
     <OutputType>library</OutputType>\r
     <DefineConstants>NET_1_1;NET_2_0;NET_3_5;LIBC</DefineConstants>\r
-    <SourcePath>{sourcedir}\mcs\class\System.Core\</SourcePath>\r
+    <SourcePath>{sourcedir}\mono\mcs\class\System.Core\</SourcePath>\r
     <IgnoreWarnings>1720</IgnoreWarnings>\r
     <Debug>false</Debug>\r
     <Sources>\r
        <Assembly name="gmcs" destination="{destdir}\temp\gmcs.exe">\r
                <OutputType>exe</OutputType>\r
                <DefineConstants>GMCS_SOURCE,NET_1_1,NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\mcs</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\mcs</SourcePath>\r
                <Debug>true</Debug>\r
                <NoConfig>false</NoConfig>\r
                <Sources>\r
        <Assembly name="mscorlib" destination="{destdir}\temp\mscorlib.dll">\r
                <OutputType>library</OutputType>\r
                <DefineConstants>INSIDE_CORLIB,NET_1_1,NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\corlib</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\corlib</SourcePath>\r
                <Debug>true</Debug>\r
                <NoStandardLib>true</NoStandardLib>\r
                <IgnoreWarnings>612,618</IgnoreWarnings>\r
                <DefineConstants>NET_1_1;NET_2_0;CONFIGURATION_2_0;XML_DEP;SECURITY_DEP;CONFIGURATION_DEP</DefineConstants>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <IgnoreWarnings>618</IgnoreWarnings>\r
-               <SourcePath>{sourcedir}\mcs\class\System\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.dll.sources</Source>\r
                        <Source>-resource:resources/Asterisk.wav</Source>\r
                <OutputType>library</OutputType>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <Debug>true</Debug>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.Security\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.Security\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Mono.Security.dll.sources</Source>\r
                </Sources>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <IgnoreWarnings>612,618,642</IgnoreWarnings>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Xml</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Xml</SourcePath>\r
                <Debug>true</Debug>\r
                <Sources>\r
                        <Source type="list">System.Xml.dll.sources</Source>\r
                <Debug>true</Debug>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <IgnoreWarnings>618,414</IgnoreWarnings>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Security\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Security\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Security.dll.sources</Source>\r
                </Sources>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <Debug>true</Debug>\r
                <IgnoreWarnings>618,414</IgnoreWarnings>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Configuration\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Configuration\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Configuration.dll.sources</Source>\r
                </Sources>\r
     <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
     <IgnoreWarnings>618,612</IgnoreWarnings>\r
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <SourcePath>{sourcedir}\mcs\class\Mono.Posix\</SourcePath>\r
+    <SourcePath>{sourcedir}\mono\mcs\class\Mono.Posix\</SourcePath>\r
     <Sources>\r
       <Source type="list">Mono.Posix.dll.sources</Source>\r
     </Sources>\r
     </References>\r
     <OutputType>library</OutputType>\r
     <DefineConstants>NET_1_1;NET_2_0;NET_3_5;LIBC</DefineConstants>\r
-    <SourcePath>{sourcedir}\mcs\class\System.Core\</SourcePath>\r
+    <SourcePath>{sourcedir}\mono\mcs\class\System.Core\</SourcePath>\r
     <IgnoreWarnings>1720</IgnoreWarnings>\r
     <Sources>\r
       <Source type="list">System.Core.dll.sources</Source>\r
                <OutputType>exe</OutputType>\r
                <NoConfig>true</NoConfig>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\tools\security</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\tools\security</SourcePath>\r
                <Debug>true</Debug>\r
                <Sources>\r
                        <Source>sn.cs</Source>\r
        </Assembly>\r
 \r
        <!-- Sign what we've made so far -->\r
-       <Sign assembly="{destdir}\temp\System.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\temp\mscorlib.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\temp\Mono.Security.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\temp\System.Xml.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\temp\System.Security.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-  <Sign assembly="{destdir}\temp\System.Configuration.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-  <Sign assembly="{destdir}\temp\System.Core.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\temp\System.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\temp\mscorlib.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\temp\Mono.Security.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\temp\System.Xml.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\temp\System.Security.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+  <Sign assembly="{destdir}\temp\System.Configuration.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+  <Sign assembly="{destdir}\temp\System.Core.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
 \r
   <!-- Copy our new assemblies to the bin/lib locations -->\r
        <Copy source="{destdir}\temp\gmcs.exe" destination="{destdir}\lib\mono\2.0\gmcs.exe" />\r
                <OutputType>exe</OutputType>\r
                <NoConfig>false</NoConfig>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\tools\gacutil</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\tools\gacutil</SourcePath>\r
                <Debug>true</Debug>\r
                <Sources>\r
                        <Source type="list">gacutil.exe.sources</Source>\r
        </Assembly>\r
        <Assembly name="resgen" destination="{destdir}\lib\mono\2.0\resgen.exe">\r
                <OutputType>exe</OutputType>\r
-               <SourcePath>{sourcedir}\mcs\tools\resgen</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\tools\resgen</SourcePath>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <NoConfig>false</NoConfig>\r
                <Debug>true</Debug>\r
        </Assembly>\r
        <Assembly name="culevel" destination="{destdir}\lib\mono\2.0\culevel.exe">\r
                <OutputType>exe</OutputType>\r
-               <SourcePath>{sourcedir}\mcs\tools\culevel</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\tools\culevel</SourcePath>\r
                <NoConfig>false</NoConfig>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <Debug>true</Debug>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-               <SourcePath>{sourcedir}\mcs\class\I18N\Common\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\I18N\Common\</SourcePath>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <Sources>\r
                        <Source type="list">I18N.dll.sources</Source>\r
                <OutputType>library</OutputType>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\I18N\West\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\I18N\West\</SourcePath>\r
                <Sources>\r
                        <Source type="list">I18N.West.dll.sources</Source>\r
                </Sources>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-               <SourcePath>{sourcedir}\mcs\class\I18N\MidEast\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\I18N\MidEast\</SourcePath>\r
                <Sources>\r
                        <Source type="list">I18N.MidEast.dll.sources</Source>\r
                </Sources>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-               <SourcePath>{sourcedir}\mcs\class\I18N\Other\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\I18N\Other\</SourcePath>\r
                <Sources>\r
                        <Source type="list">I18N.Other.dll.sources</Source>\r
                </Sources>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-               <SourcePath>{sourcedir}\mcs\class\I18N\Rare\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\I18N\Rare\</SourcePath>\r
                <Sources>\r
                        <Source type="list">I18N.Rare.dll.sources</Source>\r
                </Sources>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-               <SourcePath>{sourcedir}\mcs\class\I18N\CJK\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\I18N\CJK\</SourcePath>\r
                <Sources>\r
                        <Source type="list">I18N.CJK.dll.sources</Source>\r
                        <Source>/resource:jis.table</Source>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Drawing\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Drawing\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Drawing.dll.sources</Source>\r
                        <Source>-resource:Assembly/Mono.ico,Mono.ico</Source>\r
                <OutputType>library</OutputType>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Transactions\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Transactions\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Transactions.dll.sources</Source>\r
                </Sources>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <IgnoreWarnings>168,162</IgnoreWarnings>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-               <SourcePath>{sourcedir}\mcs\class\System.EnterpriseServices\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.EnterpriseServices\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.EnterpriseServices.dll.sources</Source>\r
                </Sources>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
                <IgnoreWarnings>169</IgnoreWarnings>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.C5\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.C5\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Mono.C5.dll.sources</Source>\r
                </Sources>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.Data.Tds\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.Data.Tds\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Mono.Data.Tds.dll.sources</Source>\r
                </Sources>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <IgnoreWarnings>649</IgnoreWarnings>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Data\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Data\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Data.dll.sources</Source>\r
                        <Source>Mono.Data.SqlExpressions/Parser.cs</Source>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Accessibility\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Accessibility\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Accessibility.dll.sources</Source>\r
                </Sources>\r
                <OutputType>library</OutputType>\r
                <IgnoreWarnings>108</IgnoreWarnings>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.WebBrowser\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.WebBrowser\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Mono.WebBrowser.dll.sources</Source>\r
                </Sources>\r
        </Assembly>\r
 \r
-       <Copy source="{sourcedir}\mcs\class\Managed.Windows.Forms\resources\keyboards.resources.prebuilt" destination="{sourcedir}\mcs\class\Managed.Windows.Forms\resources\keyboards.resources" />\r
+       <Copy source="{sourcedir}\mono\mcs\class\Managed.Windows.Forms\resources\keyboards.resources.prebuilt" destination="{sourcedir}\mono\mcs\class\Managed.Windows.Forms\resources\keyboards.resources" />\r
 \r
        <Assembly name="System.Windows.Forms" destination="{destdir}\lib\mono\2.0\System.Windows.Forms.dll">\r
                <References>\r
                <OutputType>library</OutputType>\r
                <IgnoreWarnings>618,612,809</IgnoreWarnings>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Managed.Windows.Forms\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Managed.Windows.Forms\</SourcePath>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <Sources>\r
                        <Source type="list">System.Windows.Forms.dll.sources</Source>\r
                </Sources>\r
        </Assembly>\r
 \r
-       <Resgen workingdir="{sourcedir}\mcs\class\Mono.Data.Sqlite">{sourcedir}\mcs\class\Mono.Data.Sqlite\resources\SR.resx</Resgen>\r
+       <Resgen workingdir="{sourcedir}\mono\mcs\class\Mono.Data.Sqlite">{sourcedir}\mono\mcs\class\Mono.Data.Sqlite\resources\SR.resx</Resgen>\r
 \r
        <Assembly name="Mono.Data.Sqlite" destination="{destdir}\lib\mono\2.0\Mono.Data.Sqlite.dll">\r
                <References>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0;MONO_BACKWARD_COMPAT</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.Data.Sqlite\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.Data.Sqlite\</SourcePath>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <Sources>\r
                        <Source type="list">Mono.Data.Sqlite.dll.sources</Source>\r
                </Sources>\r
        </Assembly>\r
 \r
-       <Culevel source="{sourcedir}\mcs\class\System.Web\UplevelHelperDefinitions.xml" destination="{sourcedir}\mcs\class\System.Web\System.Web\UplevelHelper.cs" />\r
-       <Resgen workingdir="{sourcedir}\mcs\class\System.Web">{sourcedir}\mcs\class\System.Web\resources\TranslationResources.resx</Resgen>\r
+       <Culevel source="{sourcedir}\mono\mcs\class\System.Web\UplevelHelperDefinitions.xml" destination="{sourcedir}\mono\mcs\class\System.Web\System.Web\UplevelHelper.cs" />\r
+       <Resgen workingdir="{sourcedir}\mono\mcs\class\System.Web">{sourcedir}\mono\mcs\class\System.Web\resources\TranslationResources.resx</Resgen>\r
 \r
        <Assembly name="System.Web" destination="{destdir}\lib\mono\2.0\System.Web.dll">\r
                <References>\r
                <DefineConstants>NET_1_1;NET_2_0;INSIDE_SYSTEM_WEB;SYSTEMCORE_DEP</DefineConstants>\r
                <IgnoreWarnings>618,612</IgnoreWarnings>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Web\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Web\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Web.dll.sources</Source>\r
+                       <Source>System.Web.UI/KeyedList.cs</Source>\r
+                       <Source>System.Web.UI/KeyedListEnumerator.cs</Source>\r
+                       <Source>System.Web.Security/MembershipCreateStatus.cs</Source>\r
+                       <Source>System.Web.Security/MembershipCreateUserException.cs</Source>\r
+                       <Source>System.Web.Security/MembershipPasswordException.cs</Source>\r
+                       <Source>System.Web.Security/MembershipPasswordFormat.cs</Source>\r
+                       <Source>System.Web.Security/MembershipProviderCollection.cs</Source>\r
+                       <Source>System.Web.Security/MembershipProvider.cs</Source>\r
+                       <Source>System.Web.Security/MembershipUserCollection.cs</Source>\r
+                       <Source>System.Web.Security/MembershipUser.cs</Source>\r
+                       <Source>System.Web.Security/MembershipValidatePasswordEventHandler.cs</Source>\r
+                       <Source>System.Web.Security/RoleProvider.cs</Source>\r
+                       <Source>System.Web.Security/ValidatePasswordEventArgs.cs</Source>\r
                        <Source>System.Web/UplevelHelper.cs</Source>\r
                </Sources>\r
        </Assembly>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.Web\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.Web\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Mono.Web.dll.sources</Source>\r
                </Sources>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
                <IgnoreWarnings>649,169</IgnoreWarnings>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Web.Services\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Web.Services\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Web.Services.dll.sources</Source>\r
                        <Source>-resource:System.Web.Services.Description/wsdl-1.1.xsd,wsdl-1.1.xsd</Source>\r
                <DefineConstants>NET_1_1;NET_2_0;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP;MONOWEB_DEP;SYSTEMCORE_DEP</DefineConstants>\r
                <IgnoreWarnings>618,612</IgnoreWarnings>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Web\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Web\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Web.dll.sources</Source>\r
+                       <Source>System.Web.UI/KeyedList.cs</Source>\r
+                       <Source>System.Web.UI/KeyedListEnumerator.cs</Source>\r
+                       <Source>System.Web.Security/MembershipCreateStatus.cs</Source>\r
+                       <Source>System.Web.Security/MembershipCreateUserException.cs</Source>\r
+                       <Source>System.Web.Security/MembershipPasswordException.cs</Source>\r
+                       <Source>System.Web.Security/MembershipPasswordFormat.cs</Source>\r
+                       <Source>System.Web.Security/MembershipProviderCollection.cs</Source>\r
+                       <Source>System.Web.Security/MembershipProvider.cs</Source>\r
+                       <Source>System.Web.Security/MembershipUserCollection.cs</Source>\r
+                       <Source>System.Web.Security/MembershipUser.cs</Source>\r
+                       <Source>System.Web.Security/MembershipValidatePasswordEventHandler.cs</Source>\r
+                       <Source>System.Web.Security/RoleProvider.cs</Source>\r
+                       <Source>System.Web.Security/ValidatePasswordEventArgs.cs</Source>\r
                        <Source>System.Web/UplevelHelper.cs</Source>\r
                        <Source>-resource:resources/TranslationResources.resources</Source>\r
                        <Source>-resource:resources/WebUIValidation.js</Source>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Runtime.Serialization.Formatters.Soap\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Runtime.Serialization.Formatters.Soap\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Runtime.Serialization.Formatters.Soap.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Runtime.Remoting\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Runtime.Remoting\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Runtime.Remoting.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Configuration.Install\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Configuration.Install\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Configuration.Install.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Management\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Management\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Management.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Data.OracleClient\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Data.OracleClient\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Data.OracleClient.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Microsoft.VisualC\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Microsoft.VisualC\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Microsoft.VisualC.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Cscompmgd\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Cscompmgd\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Cscompmgd.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Design\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Design\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Design.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\PEAPI\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\PEAPI\</SourcePath>\r
                <Sources>\r
                        <Source type="list">PEAPI.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Npgsql\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Npgsql\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Npgsql.dll.sources</Source>\r
                </Sources>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
                <KeyFile>SharpZipLib.key</KeyFile>\r
-               <SourcePath>{sourcedir}\mcs\class\ICSharpCode.SharpZipLib\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\ICSharpCode.SharpZipLib\</SourcePath>\r
                <Sources>\r
                        <Source type="list">ICSharpCode.SharpZipLib.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Commons.Xml.Relaxng\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Commons.Xml.Relaxng\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Commons.Xml.Relaxng.dll.sources</Source>\r
                        <Source>/resource:resources/relaxng.rng,relaxng.rng</Source>\r
                </Sources>\r
        </Assembly>\r
 \r
-       <Resgen workingdir="{sourcedir}\mcs\class\Novell.Directory.Ldap">{sourcedir}\mcs\class\Novell.Directory.Ldap\Novell.Directory.Ldap.Utilclass\ResultCodeMessages.resx</Resgen>\r
+       <Resgen workingdir="{sourcedir}\mono\mcs\class\Novell.Directory.Ldap">{sourcedir}\mono\mcs\class\Novell.Directory.Ldap\Novell.Directory.Ldap.Utilclass\ResultCodeMessages.resx</Resgen>\r
 \r
        <Assembly name="Novell.Directory.Ldap" destination="{destdir}\lib\mono\2.0\Novell.Directory.Ldap.dll">\r
                <References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
                <IgnoreWarnings>649,169,219,168</IgnoreWarnings>\r
-               <SourcePath>{sourcedir}\mcs\class\Novell.Directory.Ldap\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Novell.Directory.Ldap\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Novell.Directory.Ldap.dll.sources</Source>\r
                        <Source>/res:Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resources</Source>\r
                <OutputType>library</OutputType>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.Security.Win32\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.Security.Win32\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Mono.Security.Win32.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.DirectoryServices\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.DirectoryServices\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.DirectoryServices.dll.sources</Source>\r
                </Sources>\r
     </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.Messaging\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.Messaging\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Mono.Messaging.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Messaging\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Messaging\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Messaging.dll.sources</Source>\r
                        <Source>/resource:System.Messaging/MessageQueue.resx</Source>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\RabbitMQ.Client\src\client\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\RabbitMQ.Client\src\client\</SourcePath>\r
                <Sources>\r
                        <Source type="list">RabbitMQ.Client.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.Messaging.RabbitMQ\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.Messaging.RabbitMQ\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Mono.Messaging.RabbitMQ.dll.sources</Source>\r
                </Sources>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
                <IgnoreWarnings>618</IgnoreWarnings>\r
-               <SourcePath>{sourcedir}\mcs\class\System.ServiceProcess\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.ServiceProcess\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.ServiceProcess.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Drawing.Design\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Drawing.Design\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Drawing.Design.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>DRAWING_DESIGN_DEP;NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Design\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Design\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Design.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.Http\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.Http\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Mono.Http.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.Cairo\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.Cairo\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Mono.Cairo.dll.sources</Source>\r
                </Sources>\r
                        <Reference>System.Data</Reference>\r
                </References>\r
                <OutputType>library</OutputType>\r
-               <SourcePath>{sourcedir}\mcs\class\IBM.Data.DB2\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\IBM.Data.DB2\</SourcePath>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\CustomMarshalers\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\CustomMarshalers\</SourcePath>\r
                <Sources>\r
                        <Source type="list">CustomMarshalers.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\OpenSystem.C\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\OpenSystem.C\</SourcePath>\r
                <Sources>\r
                        <Source type="list">OpenSystem.C.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Microsoft.Build.Framework\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Microsoft.Build.Framework\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Microsoft.Build.Framework.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Microsoft.Build.Utilities\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Microsoft.Build.Utilities\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Microsoft.Build.Utilities.dll.sources</Source>\r
                </Sources>\r
                <References>\r
                        <Reference>mscorlib</Reference>\r
                        <Reference>System</Reference>\r
+                       <Reference>System.Core</Reference>\r
                        <Reference>System.Xml</Reference>\r
                        <Reference>Microsoft.Build.Framework</Reference>\r
                        <Reference>Microsoft.Build.Utilities</Reference>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Microsoft.Build.Engine\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Microsoft.Build.Engine\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Microsoft.Build.Engine.dll.sources</Source>\r
                </Sources>\r
     </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Microsoft.Build.Tasks\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Microsoft.Build.Tasks\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Microsoft.Build.Tasks.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Xml.Linq\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Xml.Linq\</SourcePath>\r
                <IgnoreWarnings>1720</IgnoreWarnings>\r
                <Sources>\r
                        <Source type="list">System.Xml.Linq.dll.sources</Source>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Data.DataSetExtensions\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Data.DataSetExtensions\</SourcePath>\r
                <IgnoreWarnings>1720</IgnoreWarnings>\r
                <Sources>\r
                        <Source type="list">System.Data.DataSetExtensions.dll.sources</Source>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Runtime.Serialization\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Runtime.Serialization\</SourcePath>\r
                <IgnoreWarnings>168,169,219,414</IgnoreWarnings>\r
                <Sources>\r
                        <Source type="list">System.Runtime.Serialization.dll.sources</Source>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0;NET_3_5;MONO_STRICT;MONO_DEPLOY</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Data.Linq\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Data.Linq\</SourcePath>\r
                <IgnoreWarnings>1720</IgnoreWarnings>\r
                <Sources>\r
                        <Source type="list">System.Data.Linq.dll.sources</Source>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Web.Abstractions\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Web.Abstractions\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Web.Abstractions.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Web.Routing\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Web.Routing\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Web.Routing.dll.sources</Source>\r
                </Sources>\r
     </References>\r
     <OutputType>library</OutputType>\r
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <SourcePath>{sourcedir}\mcs\class\System.IdentityModel\</SourcePath>\r
+    <SourcePath>{sourcedir}\mono\mcs\class\System.IdentityModel\</SourcePath>\r
     <Sources>\r
       <Source type="list">System.IdentityModel.dll.sources</Source>\r
     </Sources>\r
     </References>\r
     <OutputType>library</OutputType>\r
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <SourcePath>{sourcedir}\mcs\class\System.IdentityModel.Selectors\</SourcePath>\r
+    <SourcePath>{sourcedir}\mono\mcs\class\System.IdentityModel.Selectors\</SourcePath>\r
     <Sources>\r
       <Source type="list">System.IdentityModel.Selectors.dll.sources</Source>\r
     </Sources>\r
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
     <IgnoreWarnings>414,169,67,3005,436,219,618</IgnoreWarnings>\r
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-    <SourcePath>{sourcedir}\mcs\class\System.ServiceModel\</SourcePath>\r
+    <SourcePath>{sourcedir}\mono\mcs\class\System.ServiceModel\</SourcePath>\r
     <Sources>\r
       <Source type="list">System.ServiceModel.dll.sources</Source>\r
       <Source>/resource:resources/WS-Addressing.schema</Source>\r
     </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0;NET_3_5;SYSTEM_WEB_EXTENSIONS</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Web.Extensions\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Web.Extensions\</SourcePath>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <Sources>\r
                        <Source type="list">System.Web.Extensions.dll.sources</Source>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Web.Extensions.Design\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Web.Extensions.Design\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.Web.Extensions.Design.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.ServiceModel.Web\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.ServiceModel.Web\</SourcePath>\r
                <Sources>\r
                        <Source type="list">System.ServiceModel.Web.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.Management\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.Management\</SourcePath>\r
                <Sources>\r
                        <Source type="list">Mono.Management.dll.sources</Source>\r
                </Sources>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\Mono.Simd\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\Mono.Simd\</SourcePath>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <Sources>\r
                        <Source type="list">Mono.Simd.dll.sources</Source>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.ComponentModel.DataAnnotations\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.ComponentModel.DataAnnotations\</SourcePath>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <Sources>\r
                        <Source type="list">System.ComponentModel.DataAnnotations.dll.sources</Source>\r
                </References>\r
                <OutputType>library</OutputType>\r
                <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
-               <SourcePath>{sourcedir}\mcs\class\System.Web.DynamicData\</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\class\System.Web.DynamicData\</SourcePath>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
                <Sources>\r
                        <Source type="list">System.Web.DynamicData.dll.sources</Source>\r
                </Sources>\r
        </Assembly>\r
   \r
-  <Resgen workingdir="{sourcedir}\mcs\class\System.Web.Mvc">{sourcedir}\mcs\class\System.Web.Mvc\System.Web.Mvc\Resources\MvcResources.resx</Resgen>\r
+  <Resgen workingdir="{sourcedir}\mono\mcs\class\System.Web.Mvc">{sourcedir}\mono\mcs\class\System.Web.Mvc\System.Web.Mvc\Resources\MvcResources.resx</Resgen>\r
 \r
   <Assembly name="System.Web.Mvc" destination="{destdir}\lib\mono\2.0\System.Web.Mvc.dll">\r
     <References>\r
     </References>\r
     <OutputType>library</OutputType>\r
     <DefineConstants>NET_1_1;NET_2_0;NET_3_5;MONO</DefineConstants>\r
-    <SourcePath>{sourcedir}\mcs\class\System.Web.Mvc\</SourcePath>\r
+    <SourcePath>{sourcedir}\mono\mcs\class\System.Web.Mvc\</SourcePath>\r
     <Sources>\r
       <Source type="list">System.Web.Mvc.dll.sources</Source>\r
       <Source>/resource:System.Web.Mvc\Resources\MvcResources.resx</Source>\r
     </References>\r
     <OutputType>library</OutputType>\r
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0</DefineConstants>\r
-    <SourcePath>{sourcedir}\mcs\class\WindowsBase\</SourcePath>\r
+    <SourcePath>{sourcedir}\mono\mcs\class\WindowsBase\</SourcePath>\r
     <Sources>\r
       <Source type="list">WindowsBase.dll.sources</Source>\r
     </Sources>\r
     <References>\r
     </References>\r
     <OutputType>library</OutputType>\r
-    <SourcePath>{sourcedir}\mcs\class\Mono.Tasklets\</SourcePath>\r
+    <SourcePath>{sourcedir}\mono\mcs\class\Mono.Tasklets\</SourcePath>\r
     <DefineConstants>NET_1_1;NET_2_0</DefineConstants>\r
     <Sources>\r
       <Source type="list">Mono.Tasklets.dll.sources</Source>\r
   </Assembly>\r
 \r
   <!-- Cecil looks for the signing key in the wrong place for our setup -->\r
-  <Copy source="{sourcedir}\mcs\class\mono.snk" destination="{sourcedir}\mcs\mono.snk" />\r
+  <Copy source="{sourcedir}\mono\mcs\class\mono.snk" destination="{sourcedir}\mono\mcs\mono.snk" />\r
 \r
   <Assembly name="Mono.Cecil" destination="{destdir}\lib\mono\2.0\Mono.Cecil.dll">\r
     <References>\r
     </References>\r
     <OutputType>library</OutputType>\r
     <DefineConstants>NET_1_1;NET_2_0;KEYFILE</DefineConstants>\r
-    <SourcePath>{sourcedir}\mcs\class\Mono.Cecil\</SourcePath>\r
+    <SourcePath>{sourcedir}\mono\mcs\class\Mono.Cecil\</SourcePath>\r
     <Sources>\r
       <Source type="list">Mono.Cecil.dll.sources</Source>\r
     </Sources>\r
     </References>\r
     <OutputType>library</OutputType>\r
     <DefineConstants>NET_1_1;NET_2_0;CECIL</DefineConstants>\r
-    <SourcePath>{sourcedir}\mcs\class\Mono.Cecil.Mdb\</SourcePath>\r
+    <SourcePath>{sourcedir}\mono\mcs\class\Mono.Cecil.Mdb\</SourcePath>\r
     <Sources>\r
       <Source type="list">Mono.Cecil.Mdb.dll.sources</Source>\r
     </Sources>\r
   </Assembly>\r
+  <Assembly name="Mono.Debugger.Soft" destination="{destdir}\lib\mono\2.0\Mono.Debugger.Soft.dll">\r
+    <References>\r
+      <Reference>mscorlib</Reference>\r
+      <Reference>System</Reference>\r
+      <Reference>System.Core</Reference>\r
+      <Reference>Mono.Cecil</Reference>\r
+    </References>\r
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
+    <OutputType>library</OutputType>\r
+    <KeyFile>{sourcedir}\mono\mcs\class\mono.snk</KeyFile>\r
+    <SourcePath>{sourcedir}\mono\mcs\class\Mono.Debugger.Soft\</SourcePath>\r
+    <DefineConstants>NET_1_1;NET_2_0;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>\r
+    <Sources>\r
+      <Source type="list">Mono.Debugger.Soft.dll.sources</Source>\r
+    </Sources>\r
+  </Assembly>\r
 \r
-  <Sign assembly="{destdir}\lib\mono\2.0\I18N.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\I18N.West.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\I18N.MidEast.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\I18N.Other.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\I18N.Rare.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\I18N.CJK.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Drawing.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Transactions.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.EnterpriseServices.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Mono.C5.dll" key="{sourcedir}\mcs\class\Mono.C5\c5.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Data.Tds.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Data.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Posix.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Accessibility.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Mono.WebBrowser.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Windows.Forms.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Data.Sqlite.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Web.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Web.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Services.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Runtime.Serialization.Formatters.Soap.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Runtime.Remoting.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Configuration.Install.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Management.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Data.OracleClient.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Microsoft.VisualC.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Cscompmgd.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Design.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\PEAPI.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Npgsql.dll" key="{sourcedir}\mcs\class\Npgsql\Npgsql\Npgsql.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\ICSharpCode.SharpZipLib.dll" key="{sourcedir}\mcs\class\ICSharpCode.SharpZipLib\SharpZipLib.key" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Commons.Xml.Relaxng.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Novell.Directory.Ldap.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Security.Win32.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.DirectoryServices.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Messaging.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.ServiceProcess.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Drawing.Design.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Design.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Http.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Cairo.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\IBM.Data.DB2.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\CustomMarshalers.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\OpenSystem.C.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Framework.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Utilities.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Engine.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Tasks.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Core.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Xml.Linq.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Data.DataSetExtensions.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Data.Linq.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Abstractions.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Routing.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Extensions.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Extensions.Design.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.Runtime.Serialization.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.IdentityModel.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.IdentityModel.Selectors.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.ServiceModel.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.ServiceModel.Web.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Management.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Simd.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Messaging.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-  <Sign enabled="false" assembly="{destdir}\lib\mono\2.0\Mono.Messaging.RabbitMQ.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-  <Sign enabled="false" assembly="{destdir}\lib\mono\2.0\RabbitMQ.Client.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-       <Sign assembly="{destdir}\lib\mono\2.0\System.ComponentModel.DataAnnotations.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-  <Sign assembly="{destdir}\lib\mono\2.0\System.Web.DynamicData.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-  <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Mvc.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-  <Sign assembly="{destdir}\lib\mono\2.0\WindowsBase.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Tasklets.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Cecil.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Cecil.Mdb.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
-  <Sign assembly="{destdir}\lib\mono\2.0\Mono.CompilerServices.SymbolWriter.dll" key="{sourcedir}\mcs\class\mono.snk" />\r
+  <Sign assembly="{destdir}\lib\mono\2.0\I18N.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\I18N.West.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\I18N.MidEast.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\I18N.Other.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\I18N.Rare.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\I18N.CJK.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Drawing.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Transactions.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.EnterpriseServices.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Mono.C5.dll" key="{sourcedir}\mono\mcs\class\Mono.C5\c5.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Data.Tds.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Data.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Posix.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Accessibility.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Mono.WebBrowser.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Windows.Forms.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Data.Sqlite.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Web.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Web.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Services.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Runtime.Serialization.Formatters.Soap.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Runtime.Remoting.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Configuration.Install.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Management.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Data.OracleClient.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Microsoft.VisualC.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Cscompmgd.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Design.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\PEAPI.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Npgsql.dll" key="{sourcedir}\mono\mcs\class\Npgsql\Npgsql\Npgsql.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\ICSharpCode.SharpZipLib.dll" key="{sourcedir}\mono\mcs\class\ICSharpCode.SharpZipLib\SharpZipLib.key" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Commons.Xml.Relaxng.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Novell.Directory.Ldap.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Security.Win32.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.DirectoryServices.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Messaging.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.ServiceProcess.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Drawing.Design.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Design.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Http.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Cairo.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\IBM.Data.DB2.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\CustomMarshalers.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\OpenSystem.C.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Framework.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Utilities.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Engine.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Microsoft.Build.Tasks.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Core.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Xml.Linq.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Data.DataSetExtensions.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Data.Linq.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Abstractions.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Routing.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Extensions.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Extensions.Design.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.Runtime.Serialization.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.IdentityModel.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.IdentityModel.Selectors.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.ServiceModel.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.ServiceModel.Web.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Management.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Simd.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\Mono.Messaging.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+  <Sign enabled="false" assembly="{destdir}\lib\mono\2.0\Mono.Messaging.RabbitMQ.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+  <Sign enabled="false" assembly="{destdir}\lib\mono\2.0\RabbitMQ.Client.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+       <Sign assembly="{destdir}\lib\mono\2.0\System.ComponentModel.DataAnnotations.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+  <Sign assembly="{destdir}\lib\mono\2.0\System.Web.DynamicData.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+  <Sign assembly="{destdir}\lib\mono\2.0\System.Web.Mvc.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+  <Sign assembly="{destdir}\lib\mono\2.0\WindowsBase.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Tasklets.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Cecil.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Cecil.Mdb.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+  <Sign assembly="{destdir}\lib\mono\2.0\Mono.CompilerServices.SymbolWriter.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
+  <Sign assembly="{destdir}\lib\mono\2.0\Mono.Debugger.Soft.dll" key="{sourcedir}\mono\mcs\class\mono.snk" />\r
 \r
   <!-- GAC our assemblies -->\r
        <Gac>{destdir}\lib\mono\2.0\System.dll</Gac>\r
   <Gac>{destdir}\lib\mono\2.0\Mono.Cecil.dll</Gac>\r
   <Gac>{destdir}\lib\mono\2.0\Mono.Cecil.Mdb.dll</Gac>\r
   <Gac>{destdir}\lib\mono\2.0\Mono.CompilerServices.SymbolWriter.dll</Gac>\r
+  <Gac>{destdir}\lib\mono\2.0\Mono.Debugger.Soft.dll</Gac>\r
 \r
   <!-- Build some more tools -->\r
        <Assembly name="al" destination="{destdir}\lib\mono\2.0\al.exe">\r
                <References>\r
                        <Reference>Mono.Security</Reference>\r
                </References>\r
-               <SourcePath>{sourcedir}\mcs\tools\al</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\tools\al</SourcePath>\r
                <NoConfig>false</NoConfig>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <Debug>true</Debug>\r
                <Reference>Mono.Management</Reference>\r
                </References>\r
                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
-               <SourcePath>{sourcedir}\mcs\tools\csharp</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\tools\csharp</SourcePath>\r
                <NoConfig>false</NoConfig>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <Debug>true</Debug>\r
                <References>\r
                        <Reference>Mono.Security</Reference>\r
                </References>\r
-               <SourcePath>{sourcedir}\mcs\tools\security</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\tools\security</SourcePath>\r
                <NoConfig>false</NoConfig>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <Debug>true</Debug>\r
                <Reference>Mono.CompilerServices.SymbolWriter</Reference>\r
                <Reference>Mono.Security</Reference>\r
                </References>\r
-               <SourcePath>{sourcedir}\mcs\ilasm</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\ilasm</SourcePath>\r
                <NoConfig>false</NoConfig>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <Debug>true</Debug>\r
                <OutputType>exe</OutputType>\r
                <References>\r
                <Reference>System.Configuration.Install</Reference></References>\r
-               <SourcePath>{sourcedir}\mcs\tools\installutil</SourcePath>\r
+               <SourcePath>{sourcedir}\mono\mcs\tools\installutil</SourcePath>\r
                <NoConfig>false</NoConfig>\r
                <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
                <Debug>true</Debug>\r
       <Reference>System.Xml</Reference>\r
       <Reference>System.Web.Services</Reference>\r
     </References>\r
-    <SourcePath>{sourcedir}\mcs\tools\wsdl</SourcePath>\r
+    <SourcePath>{sourcedir}\mono\mcs\tools\wsdl</SourcePath>\r
     <NoConfig>false</NoConfig>\r
     <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
     <Debug>true</Debug>\r
       <Reference>Microsoft.Build.Utilities</Reference>\r
       <Reference>Microsoft.Build.Engine</Reference>\r
     </References>\r
-    <SourcePath>{sourcedir}\mcs\tools\xbuild</SourcePath>\r
+    <SourcePath>{sourcedir}\mono\mcs\tools\xbuild</SourcePath>\r
     <NoConfig>false</NoConfig>\r
     <DefineConstants>NET_1_1,NET_2_0</DefineConstants>\r
     <Debug>true</Debug>\r
        </Output>\r
 \r
   <!-- Copy some static things we want to ship -->\r
-  <Copy source="{sourcedir}\mcs\mcs\gmcs.exe.config" destination="{destdir}\lib\mono\2.0\gmcs.exe.config" />\r
+  <Copy source="{sourcedir}\mono\mcs\mcs\gmcs.exe.config" destination="{destdir}\lib\mono\2.0\gmcs.exe.config" />\r
 \r
   <!-- Delete things we don't want to end up in the installer -->\r
        <Delete type="file">{destdir}\lib\mono\2.0\culevel.exe</Delete>\r
 \r
        <!-- Build the wix includes files -->\r
        <WixInclude installeronly="true" root="{destdir}" wixfiles="{destdir}\Files.wxi" wixcomponents="{destdir}\Components.wxi"/>\r
-</Assemblies>
\ No newline at end of file
+</Assemblies>\r