* First attempt at fixing differing build files on different .net flavours.

* And, as always, some bin ignores

38 files changed, 253 insertions, 216 deletions

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 7577fd1..4d95c7d 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -12,50 +12,50 @@
             </resources>

             <sources failonempty="true">

                 <include name="AgentInventory.cs" />

-                <include name="Util.cs" />

-                <include name="Remoting.cs" />

-                <include name="UserProfileManagerBase.cs" />

-                <include name="LoginService.cs" />

-                <include name="UserProfileManager.cs" />

-                <include name="HeightMapGenHills.cs" />

                 <include name="BlockingQueue.cs" />

-                <include name="UserProfile.cs" />

-                <include name="SimProfileBase.cs" />

+                <include name="HeightMapGenHills.cs" />

+                <include name="LoginService.cs" />

+                <include name="Remoting.cs" />

                 <include name="SimProfile.cs" />

-                <include name="Interfaces/IGenericConfig.cs" />

-                <include name="Interfaces/LocalGridBase.cs" />

-                <include name="Interfaces/RemoteGridBase.cs" />

-                <include name="Interfaces/IUserConfig.cs" />

-                <include name="Interfaces/IConfig.cs" />

-                <include name="Interfaces/IUserServer.cs" />

+                <include name="SimProfileBase.cs" />

+                <include name="UserProfile.cs" />

+                <include name="UserProfileManager.cs" />

+                <include name="UserProfileManagerBase.cs" />

+                <include name="Util.cs" />

                 <include name="Interfaces/IAssetServer.cs" />

                 <include name="Interfaces/IClientAPI.cs" />

-                <include name="Interfaces/IScriptEngine.cs" />

+                <include name="Interfaces/IConfig.cs" />

+                <include name="Interfaces/IGenericConfig.cs" />

                 <include name="Interfaces/IGridConfig.cs" />

                 <include name="Interfaces/IGridServer.cs" />

-                <include name="Interfaces/IScriptAPI.cs" />

                 <include name="Interfaces/ILocalStorage.cs" />

+                <include name="Interfaces/IScriptAPI.cs" />

+                <include name="Interfaces/IScriptEngine.cs" />

+                <include name="Interfaces/IUserConfig.cs" />

+                <include name="Interfaces/IUserServer.cs" />

+                <include name="Interfaces/LocalGridBase.cs" />

+                <include name="Interfaces/RemoteGridBase.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

-                <include name="Types/EstateSettings.cs" />

+                <include name="Types/AgentCircuitData.cs" />

                 <include name="Types/AssetBase.cs" />

                 <include name="Types/AssetLandmark.cs" />

                 <include name="Types/AssetStorage.cs" />

+                <include name="Types/EstateSettings.cs" />

                 <include name="Types/Login.cs" />

                 <include name="Types/NeighbourInfo.cs" />

                 <include name="Types/OSVector3.cs" />

                 <include name="Types/ParcelData.cs" />

                 <include name="Types/PrimData.cs" />

-                <include name="Types/AgentCircuitData.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

+                <include name="../../bin/Db4objects.Db4o.dll" />

+                <include name="../../bin/libsecondlife.dll" />

                 <include name="System.dll" />

                 <include name="System.Xml.dll" />

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/Db4objects.Db4o.dll" />

                 <include name="../../bin/XMLRPC.dll" />

             </references>

         </csc>

diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
index 926e72c..075ea7f 100644
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
+++ b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
@@ -19,9 +19,9 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

+                <include name="../../../bin/OpenSim.Framework.dll" />

                 <include name="System.dll" />

                 <include name="System.Xml.dll" />

-                <include name="../../../bin/OpenSim.Framework.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />

diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
index a2af584..25bcd65 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
@@ -11,26 +11,26 @@
             <resources prefix="OpenSim.Servers" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="LoginServer.cs" />

                 <include name="BaseHttpServer.cs" />

                 <include name="BaseServer.cs" />

+                <include name="CheckSumServer.cs" />

                 <include name="IRestHandler.cs" />

                 <include name="LocalUserProfileManager.cs" />

-                <include name="XmlRpcMethod.cs" />

                 <include name="LoginResponse.cs" />

-                <include name="CheckSumServer.cs" />

+                <include name="LoginServer.cs" />

                 <include name="UDPServerBase.cs" />

+                <include name="XmlRpcMethod.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Xml.dll" />

+                <include name="../../bin/libsecondlife.dll" />

                 <include name="../../bin/OpenSim.Framework.dll" />

                 <include name="../../bin/OpenSim.Framework.Console.dll" />

-                <include name="../../bin/libsecondlife.dll" />

+                <include name="System.dll" />

+                <include name="System.Xml.dll" />

                 <include name="../../bin/XMLRPC.dll" />

             </references>

         </csc>

diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
index 8d5efd1..2eabfcd 100644
--- a/Common/XmlRpcCS/XMLRPC.dll.build
+++ b/Common/XmlRpcCS/XMLRPC.dll.build
@@ -11,24 +11,24 @@
             <resources prefix="XMLRPC" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

+                <include name="Logger.cs" />

+                <include name="SimpleHttpRequest.cs" />

                 <include name="XmlRpcBoxcarRequest.cs" />

+                <include name="XmlRpcClientProxy.cs" />

+                <include name="XmlRpcDeserializer.cs" />

+                <include name="XmlRpcErrorCodes.cs" />

+                <include name="XmlRpcException.cs" />

+                <include name="XmlRpcExposedAttribute.cs" />

                 <include name="XmlRpcRequest.cs" />

-                <include name="XmlRpcResponseSerializer.cs" />

-                <include name="Logger.cs" />

                 <include name="XmlRpcRequestDeserializer.cs" />

-                <include name="XmlRpcExposedAttribute.cs" />

+                <include name="XmlRpcRequestSerializer.cs" />

+                <include name="XmlRpcResponder.cs" />

                 <include name="XmlRpcResponse.cs" />

-                <include name="XmlRpcException.cs" />

                 <include name="XmlRpcResponseDeserializer.cs" />

-                <include name="XmlRpcResponder.cs" />

-                <include name="XmlRpcServer.cs" />

-                <include name="XmlRpcErrorCodes.cs" />

+                <include name="XmlRpcResponseSerializer.cs" />

                 <include name="XmlRpcSerializer.cs" />

+                <include name="XmlRpcServer.cs" />

                 <include name="XmlRpcSystemObject.cs" />

-                <include name="SimpleHttpRequest.cs" />

-                <include name="XmlRpcClientProxy.cs" />

-                <include name="XmlRpcRequestSerializer.cs" />

-                <include name="XmlRpcDeserializer.cs" />

                 <include name="XmlRpcXmlTokens.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
index cbc8479..075593b 100644
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
+++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
@@ -19,13 +19,13 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Data.dll.dll" />

-                <include name="System.Xml.dll" />

-                <include name="../../../bin/libsecondlife.dll" />

                 <include name="../../../bin/Db4objects.Db4o.dll" />

+                <include name="../../../bin/libsecondlife.dll" />

                 <include name="../../../bin/OpenSim.Framework.dll" />

                 <include name="../../../bin/OpenSim.Framework.Console.dll" />

+                <include name="System.dll" />

+                <include name="System.Data.dll.dll" />

+                <include name="System.Xml.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />

diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
index db8662d..d82d751 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="DB4oUserData.cs" />

-                <include name="DB4oManager.cs" />

                 <include name="DB4oGridData.cs" />

+                <include name="DB4oManager.cs" />

+                <include name="DB4oUserData.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

@@ -21,12 +21,12 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

+                <include name="../../bin/Db4objects.Db4o.dll" />

+                <include name="../../bin/libsecondlife.dll" />

+                <include name="../../bin/OpenGrid.Framework.Data.dll" />

                 <include name="System.dll" />

-                <include name="System.Xml.dll" />

                 <include name="System.Data.dll" />

-                <include name="../../bin/OpenGrid.Framework.Data.dll" />

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/Db4objects.Db4o.dll" />

+                <include name="System.Xml.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
index 5b6b75b..577da4b 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
@@ -20,11 +20,11 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

+                <include name="../../bin/libsecondlife.dll" />

+                <include name="../../bin/OpenGrid.Framework.Data.dll" />

                 <include name="System.dll" />

-                <include name="System.Xml.dll" />

                 <include name="System.Data.dll" />

-                <include name="../../bin/OpenGrid.Framework.Data.dll" />

-                <include name="../../bin/libsecondlife.dll" />

+                <include name="System.Xml.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
index 84d3d56..a5f4028 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
@@ -11,11 +11,11 @@
             <resources prefix="OpenGrid.Framework.Data.MySQL" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

+                <include name="MySQLGridData.cs" />

                 <include name="MySQLInventoryData.cs" />

-                <include name="MySQLUserData.cs" />

-                <include name="MySQLManager.cs" />

                 <include name="MySQLLogData.cs" />

-                <include name="MySQLGridData.cs" />

+                <include name="MySQLManager.cs" />

+                <include name="MySQLUserData.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

@@ -23,12 +23,12 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Xml.dll" />

-                <include name="System.Data.dll" />

-                <include name="../../bin/OpenGrid.Framework.Data.dll" />

                 <include name="../../bin/libsecondlife.dll" />

                 <include name="../../bin/MySql.Data.dll" />

+                <include name="../../bin/OpenGrid.Framework.Data.dll" />

+                <include name="System.dll" />

+                <include name="System.Data.dll" />

+                <include name="System.Xml.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />

diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
index 8c0f8fe..79b0edf 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenGrid.Framework.Data.SQLite" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="SQLiteManager.cs" />

                 <include name="SQLiteGridData.cs" />

+                <include name="SQLiteManager.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

@@ -20,12 +20,12 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

+                <include name="../../bin/libsecondlife.dll" />

+                <include name="../../bin/OpenGrid.Framework.Data.dll" />

                 <include name="System.dll" />

-                <include name="System.Xml.dll" />

                 <include name="System.Data.dll" />

                 <include name="../../bin/System.Data.SQLite.dll" />

-                <include name="../../bin/OpenGrid.Framework.Data.dll" />

-                <include name="../../bin/libsecondlife.dll" />

+                <include name="System.Xml.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />

diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
index c993a8d..7abebeb 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
@@ -12,10 +12,10 @@
             </resources>

             <sources failonempty="true">

                 <include name="GridData.cs" />

-                <include name="SimProfileData.cs" />

                 <include name="ILogData.cs" />

                 <include name="IniConfig.cs" />

                 <include name="InventoryData.cs" />

+                <include name="SimProfileData.cs" />

                 <include name="UserData.cs" />

                 <include name="UserProfileData.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

@@ -25,10 +25,10 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

+                <include name="../../bin/libsecondlife.dll" />

                 <include name="System.dll" />

-                <include name="System.Xml.dll" />

                 <include name="System.Data.dll" />

-                <include name="../../bin/libsecondlife.dll" />

+                <include name="System.Xml.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />

diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
index f8cc80e..9430ab9 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
@@ -19,10 +19,10 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

+                <include name="../../bin/libsecondlife.dll" />

                 <include name="../../bin/OpenSim.Framework.dll" />

                 <include name="../../bin/OpenSim.Servers.dll" />

-                <include name="../../bin/libsecondlife.dll" />

+                <include name="System.dll" />

                 <include name="../../bin/XMLRPC.dll" />

             </references>

         </csc>

diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
index 0da1d34..808f015 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenGridServices.AssetServer" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="Main.cs" />

                 <include name="AssetHttpServer.cs" />

+                <include name="Main.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

@@ -20,15 +20,15 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Data.dll" />

-                <include name="System.Xml.dll" />

+                <include name="../../bin/Db4objects.Db4o.dll" />

+                <include name="../../bin/libsecondlife.dll" />

                 <include name="../../bin/OpenSim.Framework.dll" />

                 <include name="../../bin/OpenSim.Framework.Console.dll" />

                 <include name="../../bin/OpenSim.GridInterfaces.Local.dll" />

                 <include name="../../bin/OpenSim.Servers.dll" />

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/Db4objects.Db4o.dll" />

+                <include name="System.dll" />

+                <include name="System.Data.dll" />

+                <include name="System.Xml.dll" />

                 <include name="../../bin/XMLRPC.dll" />

             </references>

         </csc>

diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
index 9d21edd..60c0f85 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
@@ -20,17 +20,17 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Data.dll" />

-                <include name="System.Xml.dll" />

-                <include name="../../bin/OpenSim.Framework.dll" />

-                <include name="../../bin/OpenSim.Framework.Console.dll" />

-                <include name="../../bin/OpenSim.Servers.dll" />

+                <include name="../../bin/Db4objects.Db4o.dll" />

+                <include name="../../bin/libsecondlife.dll" />

                 <include name="../../bin/OpenGrid.Framework.Data.dll" />

                 <include name="../../bin/OpenGrid.Framework.Manager.dll" />

+                <include name="../../bin/OpenSim.Framework.dll" />

+                <include name="../../bin/OpenSim.Framework.Console.dll" />

                 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/Db4objects.Db4o.dll" />

+                <include name="../../bin/OpenSim.Servers.dll" />

+                <include name="System.dll" />

+                <include name="System.Data.dll" />

+                <include name="System.Xml.dll" />

                 <include name="../../bin/XMLRPC.dll" />

             </references>

         </csc>

diff --git a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build
index c23a862..5e67af1 100644
--- a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build
+++ b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build
@@ -11,24 +11,24 @@
             <resources prefix="OpenGridServices.InventoryServer" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="Main.cs" />

                 <include name="InventoryManager.cs" />

+                <include name="Main.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Data.dll" />

-                <include name="System.Xml.dll" />

+                <include name="../../bin/Db4objects.Db4o.dll" />

+                <include name="../../bin/libsecondlife.dll" />

+                <include name="../../bin/OpenGrid.Framework.Data.dll" />

                 <include name="../../bin/OpenSim.Framework.dll" />

                 <include name="../../bin/OpenSim.Framework.Console.dll" />

                 <include name="../../bin/OpenSim.GridInterfaces.Local.dll" />

-                <include name="../../bin/OpenGrid.Framework.Data.dll" />

                 <include name="../../bin/OpenSim.Servers.dll" />

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/Db4objects.Db4o.dll" />

+                <include name="System.dll" />

+                <include name="System.Data.dll" />

+                <include name="System.Xml.dll" />

                 <include name="../../bin/XMLRPC.dll" />

             </references>

         </csc>

diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 5275ef4..68cbef7 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -20,16 +20,16 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Data.dll" />

-                <include name="System.Xml.dll" />

+                <include name="../../bin/Db4objects.Db4o.dll" />

+                <include name="../../bin/libsecondlife.dll" />

+                <include name="../../bin/OpenGrid.Framework.Data.dll" />

                 <include name="../../bin/OpenSim.Framework.dll" />

                 <include name="../../bin/OpenSim.Framework.Console.dll" />

-                <include name="../../bin/OpenGrid.Framework.Data.dll" />

                 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

                 <include name="../../bin/OpenSim.Servers.dll" />

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/Db4objects.Db4o.dll" />

+                <include name="System.dll" />

+                <include name="System.Data.dll" />

+                <include name="System.Xml.dll" />

                 <include name="../../bin/XMLRPC.dll" />

             </references>

         </csc>

diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
index 2833bce..bd5d49f 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
+++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
@@ -19,13 +19,13 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Data.dll.dll" />

-                <include name="System.Xml.dll" />

-                <include name="../../../bin/libsecondlife.dll" />

                 <include name="../../../bin/Db4objects.Db4o.dll" />

+                <include name="../../../bin/libsecondlife.dll" />

                 <include name="../../../bin/OpenSim.Framework.dll" />

                 <include name="../../../bin/OpenSim.Framework.Console.dll" />

+                <include name="System.dll" />

+                <include name="System.Data.dll.dll" />

+                <include name="System.Xml.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />

diff --git a/OpenGridServices/ServiceManager/ServiceManager.exe.build b/OpenGridServices/ServiceManager/ServiceManager.exe.build
index 5e1dd72..e0502c6 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.exe.build
+++ b/OpenGridServices/ServiceManager/ServiceManager.exe.build
@@ -18,12 +18,12 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

+                <include name="../../bin/libsecondlife.dll" />

+                <include name="../../bin/OpenSim.Framework.dll" />

+                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

                 <include name="System.dll" />

                 <include name="System.ServiceProcess.dll" />

                 <include name="System.Xml.dll" />

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

-                <include name="../../bin/OpenSim.Framework.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />

diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
index fc2d94b..c3c4ae4 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
@@ -20,12 +20,12 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Xml.dll" />

                 <include name="../../../bin/Db4objects.Db4o.dll" />

                 <include name="../../../bin/libsecondlife.dll" />

                 <include name="../../../bin/OpenSim.Framework.dll" />

                 <include name="../../../bin/OpenSim.Framework.Console.dll" />

+                <include name="System.dll" />

+                <include name="System.Xml.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />

diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
index daf35c6..860251f 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
@@ -20,11 +20,11 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Xml.dll" />

                 <include name="../../../bin/libsecondlife.dll" />

                 <include name="../../../bin/OpenSim.Framework.dll" />

                 <include name="../../../bin/OpenSim.Framework.Console.dll" />

+                <include name="System.dll" />

+                <include name="System.Xml.dll" />

                 <include name="../../../bin/XMLRPC.dll" />

             </references>

         </csc>

diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
index 5845387..00ca3f9 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
@@ -19,9 +19,9 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

                 <include name="../../../bin/Axiom.MathLib.dll" />

                 <include name="../../../bin/OpenSim.Physics.Manager.dll" />

+                <include name="System.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" />

diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
index 726444a..fc3e1e6 100644
--- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
@@ -22,11 +22,11 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Xml.dll" />

                 <include name="../../../bin/Axiom.MathLib.dll" />

                 <include name="../../../bin/OpenSim.Framework.dll" />

                 <include name="../../../bin/OpenSim.Framework.Console.dll" />

+                <include name="System.dll" />

+                <include name="System.Xml.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />

diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
index a49782f..c93c0c2 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
@@ -19,10 +19,10 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

                 <include name="../../../bin/Axiom.MathLib.dll" />

-                <include name="../../../bin/OpenSim.Physics.Manager.dll" />

                 <include name="../../../bin/Ode.NET.dll" />

+                <include name="../../../bin/OpenSim.Physics.Manager.dll" />

+                <include name="System.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" />

diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
index 2ea5534..be7a847 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
@@ -19,10 +19,10 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

                 <include name="../../../bin/Axiom.MathLib.dll" />

-                <include name="../../../bin/PhysX_Wrapper_Dotnet.dll" />

                 <include name="../../../bin/OpenSim.Physics.Manager.dll" />

+                <include name="../../../bin/PhysX_Wrapper_Dotnet.dll" />

+                <include name="System.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" />

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 5f33913..13341b3 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,66 +11,66 @@
             <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="OpenSimMain.cs" />

-                <include name="UDPServer.cs" />

+                <include name="AgentAssetUpload.cs" />

+                <include name="AuthenticateSessionsBase.cs" />

                 <include name="AuthenticateSessionsLocal.cs" />

                 <include name="AuthenticateSessionsRemote.cs" />

-                <include name="OpenSimNetworkHandler.cs" />

                 <include name="Grid.cs" />

+                <include name="OpenSimMain.cs" />

+                <include name="OpenSimNetworkHandler.cs" />

                 <include name="PacketServer.cs" />

-                <include name="AuthenticateSessionsBase.cs" />

-                <include name="VersionInfo.cs" />

-                <include name="AgentAssetUpload.cs" />

-                <include name="RegionInfoBase.cs" />

                 <include name="RegionInfo.cs" />

+                <include name="RegionInfoBase.cs" />

                 <include name="RegionServerBase.cs" />

+                <include name="UDPServer.cs" />

+                <include name="VersionInfo.cs" />

+                <include name="Assets/AssetCache.cs" />

+                <include name="Assets/InventoryCache.cs" />

+                <include name="CAPS/AdminWebFront.cs" />

+                <include name="Client/ClientView.cs" />

+                <include name="Client/ClientView.Grid.cs" />

+                <include name="Client/ClientView.PacketHandlers.cs" />

+                <include name="Client/ClientView.ProcessPackets.cs" />

+                <include name="Client/ClientViewBase.cs" />

+                <include name="Estate/EstateManager.cs" />

+                <include name="Scripting/IScriptContext.cs" />

+                <include name="Scripting/IScriptEntity.cs" />

+                <include name="Scripting/IScriptHandler.cs" />

+                <include name="Scripting/Script.cs" />

+                <include name="Scripting/ScriptFactory.cs" />

+                <include name="Scripting/Scripts/FollowRandomAvatar.cs" />

                 <include name="Simulator/Avatar.Client.cs" />

-                <include name="Simulator/Entity.cs" />

-                <include name="Simulator/World.PacketHandlers.cs" />

+                <include name="Simulator/Avatar.cs" />

+                <include name="Simulator/Avatar.Update.cs" />

                 <include name="Simulator/AvatarAnimations.cs" />

-                <include name="Simulator/WorldBase.cs" />

+                <include name="Simulator/Entity.cs" />

+                <include name="Simulator/ParcelManager.cs" />

                 <include name="Simulator/Primitive.cs" />

-                <include name="Simulator/World.Scripting.cs" />

                 <include name="Simulator/Primitive2.cs" />

                 <include name="Simulator/SceneObject.cs" />

-                <include name="Simulator/Avatar.cs" />

-                <include name="Simulator/Avatar.Update.cs" />

                 <include name="Simulator/World.cs" />

-                <include name="Simulator/ParcelManager.cs" />

-                <include name="Estate/EstateManager.cs" />

-                <include name="CAPS/AdminWebFront.cs" />

-                <include name="Assets/InventoryCache.cs" />

-                <include name="Assets/AssetCache.cs" />

-                <include name="Scripting/IScriptHandler.cs" />

-                <include name="Scripting/ScriptFactory.cs" />

-                <include name="Scripting/IScriptContext.cs" />

-                <include name="Scripting/Script.cs" />

-                <include name="Scripting/IScriptEntity.cs" />

-                <include name="Scripting/Scripts/FollowRandomAvatar.cs" />

+                <include name="Simulator/World.PacketHandlers.cs" />

+                <include name="Simulator/World.Scripting.cs" />

+                <include name="Simulator/WorldBase.cs" />

                 <include name="Types/Mesh.cs" />

                 <include name="Types/Triangle.cs" />

-                <include name="Client/ClientView.Grid.cs" />

-                <include name="Client/ClientView.PacketHandlers.cs" />

-                <include name="Client/ClientViewBase.cs" />

-                <include name="Client/ClientView.ProcessPackets.cs" />

-                <include name="Client/ClientView.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Xml.dll" />

-                <include name="../../bin/libsecondlife.dll" />

                 <include name="../../bin/Axiom.MathLib.dll" />

                 <include name="../../bin/Db4objects.Db4o.dll" />

-                <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />

+                <include name="../../bin/libsecondlife.dll" />

                 <include name="../../bin/OpenSim.Framework.dll" />

                 <include name="../../bin/OpenSim.Framework.Console.dll" />

                 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

                 <include name="../../bin/OpenSim.Physics.Manager.dll" />

                 <include name="../../bin/OpenSim.Servers.dll" />

+                <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />

+                <include name="System.dll" />

+                <include name="System.Xml.dll" />

                 <include name="../../bin/XMLRPC.dll" />

             </references>

         </csc>

diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index ac4d564..cce2fef 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -11,26 +11,26 @@
             <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="MainMemory.cs" />

+                <include name="ClassInstance.cs" />

+                <include name="ClassRecord.cs" />

                 <include name="Heap.cs" />

-                <include name="StackFrame.cs" />

+                <include name="Interpreter.cs" />

                 <include name="InterpreterLogic.cs" />

-                <include name="OpenSimJVM.cs" />

                 <include name="InterpreterMethods.cs" />

-                <include name="ClassInstance.cs" />

                 <include name="InterpreterReturn.cs" />

-                <include name="Interpreter.cs" />

-                <include name="ClassRecord.cs" />

-                <include name="Stack.cs" />

+                <include name="MainMemory.cs" />

+                <include name="MethodMemory.cs" />

                 <include name="Object.cs" />

+                <include name="OpenSimJVM.cs" />

+                <include name="Stack.cs" />

+                <include name="StackFrame.cs" />

                 <include name="Thread.cs" />

-                <include name="MethodMemory.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

-                <include name="Types/BaseType.cs" />

                 <include name="Types/ArrayReference.cs" />

+                <include name="Types/BaseType.cs" />

                 <include name="Types/ObjectReference.cs" />

-                <include name="Types/PrimitiveTypes/Char.cs" />

                 <include name="Types/PrimitiveTypes/Byte.cs" />

+                <include name="Types/PrimitiveTypes/Char.cs" />

                 <include name="Types/PrimitiveTypes/Float.cs" />

                 <include name="Types/PrimitiveTypes/Int.cs" />

             </sources>

@@ -39,9 +39,9 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

+                <include name="../../../bin/OpenSim.Framework.dll" />

                 <include name="System.dll" />

                 <include name="System.Xml.dll" />

-                <include name="../../../bin/OpenSim.Framework.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/ScriptEngines/" />

diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
index 1c7306a..bc2d8ec 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
@@ -18,14 +18,14 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Xml.dll" />

-                <include name="System.Data.dll" />

                 <include name="../../../bin/Kds.Serialization.dll" />

                 <include name="../../../bin/libdb_dotNET43.dll" />

                 <include name="../../../bin/libsecondlife.dll" />

                 <include name="../../../bin/OpenSim.Framework.dll" />

                 <include name="../../../bin/OpenSim.Framework.Console.dll" />

+                <include name="System.dll" />

+                <include name="System.Data.dll" />

+                <include name="System.Xml.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />

diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 72aac2a..739b98c 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -12,22 +12,22 @@
             </resources>

             <sources failonempty="true">

                 <include name="AssemblyInfo.cs" />

+                <include name="Db4LocalStorage.cs" />

                 <include name="MapStorage.cs" />

                 <include name="UUIDParcelQuery.cs" />

                 <include name="UUIDPrimQuery.cs" />

-                <include name="Db4LocalStorage.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Xml.dll" />

                 <include name="../../../bin/Db4objects.Db4o.dll" />

                 <include name="../../../bin/libsecondlife.dll" />

                 <include name="../../../bin/OpenSim.Framework.dll" />

                 <include name="../../../bin/OpenSim.Framework.Console.dll" />

+                <include name="System.dll" />

+                <include name="System.Xml.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />

diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
index 4c8917a..bd4c731 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
@@ -19,13 +19,13 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Xml.dll" />

-                <include name="System.Data.dll" />

-                <include name="../../../bin/System.Data.SQLite.dll" />

                 <include name="../../../bin/libsecondlife.dll" />

                 <include name="../../../bin/OpenSim.Framework.dll" />

                 <include name="../../../bin/OpenSim.Framework.Console.dll" />

+                <include name="System.dll" />

+                <include name="System.Data.dll" />

+                <include name="../../../bin/System.Data.SQLite.dll" />

+                <include name="System.Xml.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />

diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
index 9c80ac7..6526648 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
@@ -19,11 +19,11 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

+                <include name="../../bin/libTerrain-BSD.dll" />

                 <include name="System.dll" />

-                <include name="System.Drawing.dll" />

                 <include name="System.Data.dll" />

+                <include name="System.Drawing.dll" />

                 <include name="System.Xml.dll" />

-                <include name="../../bin/libTerrain-BSD.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />

diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build
index 4f8ca8a..784c9ca 100644
--- a/OpenSim/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim/OpenSim.exe.build
@@ -19,18 +19,18 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="System.dll" />

-                <include name="System.Xml.dll" />

-                <include name="../../bin/libsecondlife.dll" />

                 <include name="../../bin/Axiom.MathLib.dll" />

                 <include name="../../bin/Db4objects.Db4o.dll" />

-                <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />

+                <include name="../../bin/libsecondlife.dll" />

                 <include name="../../bin/OpenSim.Framework.dll" />

                 <include name="../../bin/OpenSim.Framework.Console.dll" />

+                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

                 <include name="../../bin/OpenSim.Physics.Manager.dll" />

-                <include name="../../bin/OpenSim.Servers.dll" />

                 <include name="../../bin/OpenSim.RegionServer.dll" />

-                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

+                <include name="../../bin/OpenSim.Servers.dll" />

+                <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />

+                <include name="System.dll" />

+                <include name="System.Xml.dll" />

                 <include name="../../bin/XMLRPC.dll" />

             </references>

         </csc>

diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index 449896b..227677f 100644
--- a/Prebuild/Prebuild.sln
+++ b/Prebuild/Prebuild.sln
@@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-0000-0000-0000-000000000000}"

 EndProject

 Global

-  GlobalSection(SolutionConfigurationPlatforms) = preSolution

-    Debug|Any CPU = Debug|Any CPU

-    Release|Any CPU = Release|Any CPU

-  EndGlobalSection

-  GlobalSection(ProjectConfigurationPlatforms) = postSolution

-    {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-  EndGlobalSection

-  GlobalSection(SolutionProperties) = preSolution

-    HideSolutionNode = FALSE

-  EndGlobalSection

+        GlobalSection(SolutionConfigurationPlatforms) = preSolution

+                Debug|Any CPU = Debug|Any CPU

+                Release|Any CPU = Release|Any CPU

+        EndGlobalSection

+        GlobalSection(ProjectConfigurationPlatforms) = postSolution

+                {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+        EndGlobalSection

+        GlobalSection(SolutionProperties) = preSolution

+                HideSolutionNode = FALSE

+        EndGlobalSection

 EndGlobal

diff --git a/Prebuild/src/Core/Nodes/ConfigurationNode.cs b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
index e1488a7..390794f 100644
--- a/Prebuild/src/Core/Nodes/ConfigurationNode.cs
+++ b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
@@ -45,7 +45,7 @@ namespace Prebuild.Core.Nodes
         /// 

         /// </summary>

         [DataNode("Configuration")]

-        public class ConfigurationNode : DataNode, ICloneable

+        public class ConfigurationNode : DataNode, ICloneable, IComparable

         {

                 #region Fields

 

@@ -173,5 +173,15 @@ namespace Prebuild.Core.Nodes
                 }

 

                 #endregion

-        }

+

+        #region IComparable Members

+

+        public int CompareTo(object obj)

+        {

+            ConfigurationNode that = (ConfigurationNode) obj;

+            return this.m_Name.CompareTo(that.m_Name);

+        }

+

+        #endregion

+    }

 }

diff --git a/Prebuild/src/Core/Nodes/FilesNode.cs b/Prebuild/src/Core/Nodes/FilesNode.cs
index 442a45f..d31307b 100644
--- a/Prebuild/src/Core/Nodes/FilesNode.cs
+++ b/Prebuild/src/Core/Nodes/FilesNode.cs
@@ -218,5 +218,6 @@ namespace Prebuild.Core.Nodes
                 }

 

                 #endregion

-        }

+

+    }

 }

diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
index 84d9f5d..5f03c4d 100644
--- a/Prebuild/src/Core/Nodes/ProjectNode.cs
+++ b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -290,7 +290,9 @@ namespace Prebuild.Core.Nodes
                 {

                         get

                         {

-                                return m_Configurations.Values;

+                ArrayList tmp = new ArrayList( ConfigurationsTable.Values);

+                            tmp.Sort();

+                                return tmp;

                         }

                 }

 

@@ -314,8 +316,10 @@ namespace Prebuild.Core.Nodes
                 {

                         get

                         {

-                                return m_ReferencePaths;

-                        }

+                ArrayList tmp = new ArrayList(m_ReferencePaths);

+                tmp.Sort();

+                return tmp;

+            }

                 }

 

                 /// <summary>

@@ -326,7 +330,9 @@ namespace Prebuild.Core.Nodes
                 {

                         get

                         {

-                                return m_References;

+                ArrayList tmp = new ArrayList(m_References);

+                tmp.Sort();

+                return tmp;

                         }

                 }

 

diff --git a/Prebuild/src/Core/Nodes/ReferenceNode.cs b/Prebuild/src/Core/Nodes/ReferenceNode.cs
index beb50dc..a2880c0 100644
--- a/Prebuild/src/Core/Nodes/ReferenceNode.cs
+++ b/Prebuild/src/Core/Nodes/ReferenceNode.cs
@@ -45,7 +45,7 @@ namespace Prebuild.Core.Nodes
         /// 

         /// </summary>

         [DataNode("Reference")]

-        public class ReferenceNode : DataNode

+        public class ReferenceNode : DataNode, IComparable

         {

                 #region Fields

 

@@ -139,5 +139,15 @@ namespace Prebuild.Core.Nodes
                 }

 

                 #endregion

-        }

+

+        #region IComparable Members

+

+        public int CompareTo(object obj)

+        {

+            ReferenceNode that = (ReferenceNode)obj;

+            return this.m_Name.CompareTo(that.m_Name);

+        }

+

+        #endregion

+    }

 }

diff --git a/Prebuild/src/Core/Nodes/ReferencePathNode.cs b/Prebuild/src/Core/Nodes/ReferencePathNode.cs
index 5d98dda..0563c1b 100644
--- a/Prebuild/src/Core/Nodes/ReferencePathNode.cs
+++ b/Prebuild/src/Core/Nodes/ReferencePathNode.cs
@@ -47,7 +47,7 @@ namespace Prebuild.Core.Nodes
         /// 

         /// </summary>

         [DataNode("ReferencePath")]

-        public class ReferencePathNode : DataNode

+        public class ReferencePathNode : DataNode, IComparable

         {

                 #region Fields

 

@@ -94,5 +94,15 @@ namespace Prebuild.Core.Nodes
                 }

 

                 #endregion

-        }

+

+        #region IComparable Members

+

+        public int CompareTo(object obj)

+        {

+            ReferencePathNode that = (ReferencePathNode)obj;

+            return this.m_Path.CompareTo(that.m_Path);

+        }

+

+        #endregion

+    }

 }

diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index f2c8cab..2851125 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -14,42 +14,42 @@
             </resources>

             <sources failonempty="true">

                 <include name="Prebuild.cs" />

+                <include name="Core/FatalException.cs" />

                 <include name="Core/Kernel.cs" />

                 <include name="Core/UnknownLanguageException.cs" />

                 <include name="Core/WarningException.cs" />

-                <include name="Core/FatalException.cs" />

-                <include name="Core/Interfaces/ITarget.cs" />

-                <include name="Core/Interfaces/IDataNode.cs" />

-                <include name="Core/Attributes/OptionNodeAttribute.cs" />

                 <include name="Core/Attributes/DataNodeAttribute.cs" />

+                <include name="Core/Attributes/OptionNodeAttribute.cs" />

                 <include name="Core/Attributes/TargetAttribute.cs" />

-                <include name="Core/Nodes/ProjectNode.cs" />

+                <include name="Core/Interfaces/IDataNode.cs" />

+                <include name="Core/Interfaces/ITarget.cs" />

                 <include name="Core/Nodes/ConfigurationNode.cs" />

                 <include name="Core/Nodes/DataNode.cs" />

                 <include name="Core/Nodes/ExcludeNode.cs" />

-                <include name="Core/Nodes/OptionsNode.cs" />

-                <include name="Core/Nodes/ReferencePathNode.cs" />

+                <include name="Core/Nodes/FileNode.cs" />

+                <include name="Core/Nodes/FilesNode.cs" />

                 <include name="Core/Nodes/MatchNode.cs" />

-                <include name="Core/Nodes/SolutionNode.cs" />

+                <include name="Core/Nodes/OptionsNode.cs" />

                 <include name="Core/Nodes/ProcessNode.cs" />

+                <include name="Core/Nodes/ProjectNode.cs" />

                 <include name="Core/Nodes/ReferenceNode.cs" />

-                <include name="Core/Nodes/FileNode.cs" />

-                <include name="Core/Nodes/FilesNode.cs" />

+                <include name="Core/Nodes/ReferencePathNode.cs" />

+                <include name="Core/Nodes/SolutionNode.cs" />

+                <include name="Core/Parse/IfContext.cs" />

+                <include name="Core/Parse/Preprocessor.cs" />

+                <include name="Core/Targets/AutotoolsTarget.cs" />

                 <include name="Core/Targets/DebugTarget.cs" />

                 <include name="Core/Targets/MonoDevelopTarget.cs" />

-                <include name="Core/Targets/AutotoolsTarget.cs" />

+                <include name="Core/Targets/NAntTarget.cs" />

+                <include name="Core/Targets/SharpDevelop2Target.cs" />

                 <include name="Core/Targets/SharpDevelopTarget.cs" />

                 <include name="Core/Targets/VS2002Target.cs" />

                 <include name="Core/Targets/VS2003Target.cs" />

-                <include name="Core/Targets/SharpDevelop2Target.cs" />

                 <include name="Core/Targets/VS2005Target.cs" />

-                <include name="Core/Targets/NAntTarget.cs" />

-                <include name="Core/Parse/IfContext.cs" />

-                <include name="Core/Parse/Preprocessor.cs" />

-                <include name="Core/Utilities/Helper.cs" />

-                <include name="Core/Utilities/Log.cs" />

                 <include name="Core/Utilities/CommandLineCollection.cs" />

                 <include name="Core/Utilities/CurrentDirectory.cs" />

+                <include name="Core/Utilities/Helper.cs" />

+                <include name="Core/Utilities/Log.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

@@ -57,9 +57,9 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

+                <include name="System.dll" />

                 <include name="System.EnterpriseServices.dll" />

                 <include name="System.Xml.dll" />

-                <include name="System.dll" />

             </references>

         </csc>

         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />

diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index 4717d79..f794cfa 100644
--- a/bin/Prebuild.exe
+++ b/bin/Prebuild.exe