From 002d7dba30d466816b60d70e316636f86724e591 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 27 Mar 2007 19:47:23 +0000
Subject: * Fixed yet another project ref fuck-up in Prebuild.

---
 .../OpenSim.Config.SimConfigDb4o.csproj            | 114 ---------------------
 .../OpenSim.Config.SimConfigDb4o.dll.build         |   4 +-
 .../OpenSim.Framework.Console.csproj               |   2 +-
 .../Local/OpenSim.GridInterfaces.Local.dll.build   |   4 +-
 .../Remote/OpenSim.GridInterfaces.Remote.dll.build |   4 +-
 .../OpenSim.Physics.BasicPhysicsPlugin.dll.build   |   2 +-
 .../Manager/OpenSim.Physics.Manager.dll.build      |   2 +-
 .../OdePlugin/OpenSim.Physics.OdePlugin.dll.build  |   2 +-
 .../OpenSim.Physics.PhysXPlugin.dll.build          |   2 +-
 .../OpenSim.RegionServer.dll.build                 |   8 +-
 .../OpenSim.Storage.LocalStorageDb4o.dll.build     |   4 +-
 OpenSim/OpenSim.exe.build                          |   8 +-
 Prebuild/Prebuild.sln                              |  26 ++---
 Prebuild/src/Core/Targets/NAntTarget.cs            |  11 +-
 Servers/OpenSim.Servers.csproj                     |  42 ++++----
 bin/Prebuild.exe                                   | Bin 176128 -> 176128 bytes
 16 files changed, 58 insertions(+), 177 deletions(-)

diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
index 518cc13..e69de29 100644
--- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
+++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
@@ -1,114 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BF988EF6-D598-4B1B-914E-269BCF7CDF5E}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Config.SimConfigDb4o</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Config.SimConfigDb4o</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data.dll" >
-      <HintPath>..\..\bin\System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
-      <Name>OpenSim.Framework</Name>
-      <Project>{1817C154-9111-4C45-A19A-609A5717C1FA}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
-      <Name>OpenSim.Framework.Console</Name>
-      <Project>{023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DbSimConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MapStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
index 3dfa7ce..20344d6 100644
--- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
+++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
@@ -25,8 +25,8 @@
                 <include name="System.Xml.dll" />
                 <include name="../../bin/libsecondlife.dll" />
                 <include name="../../bin/Db4objects.Db4o.dll" />
-                <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
-                <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
index 9ae1c46..80e6f19 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
@@ -3,7 +3,7 @@
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}</ProjectGuid>
+    <ProjectGuid>{9D66924D-0CA1-42DF-8055-832067B6BB7C}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ApplicationIcon></ApplicationIcon>
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
index ec65ba8..bfc2988 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
@@ -24,8 +24,8 @@
                 <include name="System.Xml.dll" />
                 <include name="../../bin/Db4objects.Db4o.dll" />
                 <include name="../../bin/libsecondlife.dll" />
-                <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
-                <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
index 2060454..dfcf359 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
@@ -23,8 +23,8 @@
                 <include name="System.dll" />
                 <include name="System.Xml.dll" />
                 <include name="../../bin/libsecondlife.dll" />
-                <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
-                <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
index f146733..3497a55 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
@@ -21,7 +21,7 @@
                 </lib>
                 <include name="System.dll" />
                 <include name="../../bin/Axiom.MathLib.dll" />
-                <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
+                <include name="../../bin/OpenSim.Physics.Manager.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
index 47e5534..43978e0 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
@@ -25,7 +25,7 @@
                 <include name="System.dll" />
                 <include name="System.Xml.dll" />
                 <include name="../../bin/Axiom.MathLib.dll" />
-                <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
index 8e49f8f..f25361a 100644
--- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
@@ -21,7 +21,7 @@
                 </lib>
                 <include name="System.dll" />
                 <include name="../../bin/Axiom.MathLib.dll" />
-                <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
+                <include name="../../bin/OpenSim.Physics.Manager.dll" />
                 <include name="../../bin/Ode.NET.dll" />
             </references>
         </csc>
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
index 8f9e7dc..5ab70bb 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
@@ -22,7 +22,7 @@
                 <include name="System.dll" />
                 <include name="../../bin/Axiom.MathLib.dll" />
                 <include name="../../bin/PhysX_Wrapper_Dotnet.dll" />
-                <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
+                <include name="../../bin/OpenSim.Physics.Manager.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index d77e896..78e0e8d 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -49,10 +49,10 @@
                 <include name="../bin/libsecondlife.dll" />
                 <include name="../bin/Axiom.MathLib.dll" />
                 <include name="../bin/Db4objects.Db4o.dll" />
-                <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
-                <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
-                <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
-                <include name="../Servers/${build.dir}/OpenSim.Servers.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../bin/OpenSim.Servers.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 44e8597..b80bf58 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -24,8 +24,8 @@
                 <include name="System.Xml.dll" />
                 <include name="../../bin/Db4objects.Db4o.dll" />
                 <include name="../../bin/libsecondlife.dll" />
-                <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
-                <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build
index 7d69d90..09e29ee 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim.exe.build
@@ -23,10 +23,10 @@
                 <include name="../bin/libsecondlife.dll" />
                 <include name="../bin/Axiom.MathLib.dll" />
                 <include name="../bin/Db4objects.Db4o.dll" />
-                <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
-                <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
-                <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
-                <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../bin/OpenSim.RegionServer.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index fbbbd7e..b36ed1e 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", "{6A56621D-A328-4E23-96E3-0514A3817BAF}"
 EndProject
 Global
-  GlobalSection(SolutionConfigurationPlatforms) = preSolution
-    Debug|Any CPU = Debug|Any CPU
-    Release|Any CPU = Release|Any CPU
-  EndGlobalSection
-  GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    {6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {6A56621D-A328-4E23-96E3-0514A3817BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {6A56621D-A328-4E23-96E3-0514A3817BAF}.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
+		{6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A56621D-A328-4E23-96E3-0514A3817BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A56621D-A328-4E23-96E3-0514A3817BAF}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 EndGlobal
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs
index bd366dc..242bb9c 100644
--- a/Prebuild/src/Core/Targets/NAntTarget.cs
+++ b/Prebuild/src/Core/Targets/NAntTarget.cs
@@ -83,10 +83,10 @@ namespace Prebuild.Core.Targets
 			if(solution.ProjectsTable.ContainsKey(refr.Name))
 			{
 				ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];				
-				string fileRef = FindFileReference(refr.Name, project);
-				string finalPath = Helper.NormalizePath(Helper.MakeFilePath(project.FullPath + "/${build.dir}/", refr.Name, "dll"), '/');
-				ret += finalPath;
-				return ret;
+				
+				string finalPath = Helper.NormalizePath( ((ReferencePathNode) project.ReferencePaths[0]).Path + refr.Name + ".dll", '/');
+				
+				return finalPath;
 			}
 			else
 			{
@@ -316,7 +316,8 @@ namespace Prebuild.Core.Targets
 				ss.WriteLine("                </lib>");
 				foreach(ReferenceNode refr in project.References)
 				{
-					ss.WriteLine("                <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr))+"\" />", '/'));
+				    string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr)), '/');
+					ss.WriteLine("                <include name=\""+ path + "\" />" );
 				}
 				ss.WriteLine("            </references>");
                 
diff --git a/Servers/OpenSim.Servers.csproj b/Servers/OpenSim.Servers.csproj
index b99d323..713ef6a 100644
--- a/Servers/OpenSim.Servers.csproj
+++ b/Servers/OpenSim.Servers.csproj
@@ -1,13 +1,12 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2}</ProjectGuid>
+    <ProjectGuid>{BDB404AB-194D-4D2F-B42C-9E0C02E9553E}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Servers</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.Servers</RootNamespace>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject></StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -61,28 +55,26 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System">
+    <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml">
+    <Reference Include="System.Xml" >
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="OpenSim.Framework.dll">
+    <Reference Include="OpenSim.Framework.dll" >
       <HintPath>..\bin\OpenSim.Framework.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="OpenSim.Framework.Console.dll">
+    <Reference Include="OpenSim.Framework.Console.dll" >
       <HintPath>..\bin\OpenSim.Framework.Console.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="libsecondlife.dll">
+    <Reference Include="libsecondlife.dll" >
       <HintPath>..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -90,7 +82,9 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BaseHttpServer.cs" />
+    <Compile Include="BaseHttpServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
@@ -99,4 +93,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index a473e44..7b080bc 100644
Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ
-- 
cgit v1.1