From 4adf4c57d481369af0d98d8addab2f7b54ce21a5 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sun, 8 Jul 2007 12:10:32 +0000
Subject: 

---
 .../Data.DB4o/OpenSim.Framework.Data.DB4o.csproj   | 10 +++---
 .../OpenSim.Framework.Data.DB4o.dll.build          |  2 +-
 .../Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj | 10 +++---
 .../OpenSim.Framework.Data.MSSQL.dll.build         |  2 +-
 .../Data.MySQL/OpenSim.Framework.Data.MySQL.csproj | 10 +++---
 .../OpenSim.Framework.Data.MySQL.dll.build         |  2 +-
 .../OpenSim.Framework.Data.SQLite.csproj           | 10 +++---
 .../OpenSim.Framework.Data.SQLite.dll.build        |  2 +-
 .../Framework/Data/OpenSim.Framework.Data.csproj   | 38 +++++++++-----------
 .../Data/OpenSim.Framework.Data.dll.build          |  1 +
 OpenSim/Framework/General/OpenSim.Framework.csproj | 40 ++++++++++------------
 .../OpenSim.Framework.UserManagement.csproj        | 10 +++---
 .../OpenSim.Framework.UserManagement.dll.build     |  2 +-
 .../Grid/GridServer/OpenSim.Grid.GridServer.csproj | 10 +++---
 .../GridServer/OpenSim.Grid.GridServer.exe.build   |  2 +-
 .../Grid/UserServer/OpenSim.Grid.UserServer.csproj | 10 +++---
 .../UserServer/OpenSim.Grid.UserServer.exe.build   |  2 +-
 17 files changed, 71 insertions(+), 92 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index b09cecf..5ecdf78 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -66,6 +66,10 @@
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="OpenSim.Framework.Data" >
+      <HintPath>OpenSim.Framework.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
@@ -80,12 +84,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenSim.Framework.Data</Name>
-      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DB4oGridData.cs">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
index f124eb5..ba660c2 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
@@ -23,7 +23,7 @@
                 </lib>
                 <include name="../../../bin/Db4objects.Db4o.dll" />
                 <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="OpenSim.Framework.Data.dll" />
                 <include name="System.dll" />
                 <include name="System.Data.dll" />
                 <include name="System.Xml.dll" />
diff --git a/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj
index 4c41a4f..6da0ab2 100644
--- a/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj
+++ b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj
@@ -62,6 +62,10 @@
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="OpenSim.Framework.Data" >
+      <HintPath>OpenSim.Framework.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
@@ -76,12 +80,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenSim.Framework.Data</Name>
-      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MSSQLGridData.cs">
diff --git a/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build
index a2b2e3d..77b1d14 100644
--- a/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build
+++ b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build
@@ -21,7 +21,7 @@
                     <include name="${project::get-base-directory()}/${build.dir}" />
                 </lib>
                 <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="OpenSim.Framework.Data.dll" />
                 <include name="System.dll" />
                 <include name="System.Data.dll" />
                 <include name="System.Xml.dll" />
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 62e3887..62c7916 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -66,6 +66,10 @@
       <HintPath>..\..\..\bin\MySql.Data.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="OpenSim.Framework.Data" >
+      <HintPath>OpenSim.Framework.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
@@ -80,12 +84,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenSim.Framework.Data</Name>
-      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MySQLGridData.cs">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
index 594ec52..b1d65e0 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
@@ -25,7 +25,7 @@
                 </lib>
                 <include name="../../../bin/libsecondlife.dll" />
                 <include name="../../../bin/MySql.Data.dll" />
-                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="OpenSim.Framework.Data.dll" />
                 <include name="System.dll" />
                 <include name="System.Data.dll" />
                 <include name="System.Xml.dll" />
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index 4ba24f1..1389875 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -62,6 +62,10 @@
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="OpenSim.Framework.Data" >
+      <HintPath>OpenSim.Framework.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
@@ -80,12 +84,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenSim.Framework.Data</Name>
-      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="SQLiteGridData.cs">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
index e28d0a6..e3538a9 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
@@ -21,7 +21,7 @@
                     <include name="${project::get-base-directory()}/${build.dir}" />
                 </lib>
                 <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="OpenSim.Framework.Data.dll" />
                 <include name="System.dll" />
                 <include name="System.Data.dll" />
                 <include name="../../../bin/System.Data.SQLite.dll" />
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index c0c95cb..26a0792 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -1,4 +1,4 @@
-<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>
@@ -6,8 +6,7 @@
     <ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Framework.Data</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.Framework.Data</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,27 +55,29 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="libsecondlife.dll">
+    <Reference Include="libsecondlife.dll" >
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System">
+    <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Data">
+    <Reference Include="System.Data" >
       <HintPath>System.Data.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml">
+    <Reference Include="System.Xml" >
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="XMLRPC, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
   </ItemGroup>
@@ -121,4 +117,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
index aefb02b..776d867 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -30,6 +30,7 @@
                 <include name="System.dll" />
                 <include name="System.Data.dll" />
                 <include name="System.Xml.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 192e757..c5124cd 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -1,4 +1,4 @@
-<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>
@@ -6,8 +6,7 @@
     <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Framework</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.Framework</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,34 +55,36 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Db4objects.Db4o.dll">
+    <Reference Include="Db4objects.Db4o.dll" >
       <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="libsecondlife.dll">
+    <Reference Include="libsecondlife.dll" >
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System">
+    <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml">
+    <Reference Include="System.Xml" >
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="XMLRPC, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -205,4 +201,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
index 02aa3f3..0a31086 100644
--- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
@@ -74,6 +74,10 @@
       <HintPath>OpenSim.Framework.Console.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="OpenSim.Framework.Data" >
+      <HintPath>OpenSim.Framework.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="OpenSim.Framework.GenericConfig.Xml" >
       <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
       <Private>False</Private>
@@ -100,12 +104,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenSim.Framework.Data</Name>
-      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="LoginResponse.cs">
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
index 3ea339b..5edca28 100644
--- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
@@ -23,7 +23,7 @@
                 <include name="../../../bin/libsecondlife.dll" />
                 <include name="../../../bin/OpenSim.Framework.dll" />
                 <include name="../../../bin/OpenSim.Framework.Console.dll" />
-                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="OpenSim.Framework.Data.dll" />
                 <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
                 <include name="../../../bin/OpenSim.Framework.Servers.dll" />
                 <include name="System.dll" />
diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
index 424072e..550e2f8 100644
--- a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
@@ -74,6 +74,10 @@
       <HintPath>OpenSim.Framework.Console.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="OpenSim.Framework.Data" >
+      <HintPath>OpenSim.Framework.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="OpenSim.Framework.GenericConfig.Xml" >
       <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
       <Private>False</Private>
@@ -100,12 +104,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenSim.Framework.Data</Name>
-      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\Framework.Manager\OpenSim.Grid.Framework.Manager.csproj">
       <Name>OpenSim.Grid.Framework.Manager</Name>
       <Project>{4B7BFD1C-0000-0000-0000-000000000000}</Project>
diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
index 4cadf1d..fdf0922 100644
--- a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
@@ -24,7 +24,7 @@
                 <include name="../../../bin/libsecondlife.dll" />
                 <include name="../../../bin/OpenSim.Framework.dll" />
                 <include name="../../../bin/OpenSim.Framework.Console.dll" />
-                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="OpenSim.Framework.Data.dll" />
                 <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
                 <include name="../../../bin/OpenSim.Framework.Servers.dll" />
                 <include name="../../../bin/OpenSim.Grid.Framework.Manager.dll" />
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
index 1146b17..62d67f7 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -74,6 +74,10 @@
       <HintPath>OpenSim.Framework.Console.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="OpenSim.Framework.Data" >
+      <HintPath>OpenSim.Framework.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="OpenSim.Framework.GenericConfig.Xml" >
       <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
       <Private>False</Private>
@@ -100,12 +104,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenSim.Framework.Data</Name>
-      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
       <Name>OpenSim.Framework.UserManagement</Name>
       <Project>{586E2916-0000-0000-0000-000000000000}</Project>
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
index 50c9788..8a5d1e6 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
@@ -24,7 +24,7 @@
                 <include name="../../../bin/libsecondlife.dll" />
                 <include name="../../../bin/OpenSim.Framework.dll" />
                 <include name="../../../bin/OpenSim.Framework.Console.dll" />
-                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="OpenSim.Framework.Data.dll" />
                 <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
                 <include name="../../../bin/OpenSim.Framework.Servers.dll" />
                 <include name="../../../bin/OpenSim.Framework.UserManagement.dll" />
-- 
cgit v1.1