aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-07-08 12:10:32 +0000
committerlbsa712007-07-08 12:10:32 +0000
commit4adf4c57d481369af0d98d8addab2f7b54ce21a5 (patch)
tree6dec51dd8ece186c6044fa12ec3ff300d8f5074e
parent* Fixed building - something weird is happening with prebuild though, not add... (diff)
downloadopensim-SC_OLD-4adf4c57d481369af0d98d8addab2f7b54ce21a5.zip
opensim-SC_OLD-4adf4c57d481369af0d98d8addab2f7b54ce21a5.tar.gz
opensim-SC_OLD-4adf4c57d481369af0d98d8addab2f7b54ce21a5.tar.bz2
opensim-SC_OLD-4adf4c57d481369af0d98d8addab2f7b54ce21a5.tar.xz
Diffstat
-rw-r--r--OpenGridServices.build3
-rw-r--r--OpenGridServices.sln13
-rw-r--r--OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj10
-rw-r--r--OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build2
-rw-r--r--OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj10
-rw-r--r--OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build2
-rw-r--r--OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj10
-rw-r--r--OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build2
-rw-r--r--OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj10
-rw-r--r--OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build2
-rw-r--r--OpenSim/Framework/Data/OpenSim.Framework.Data.csproj38
-rw-r--r--OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build1
-rw-r--r--OpenSim/Framework/General/OpenSim.Framework.csproj40
-rw-r--r--OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj10
-rw-r--r--OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build2
-rw-r--r--OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj10
-rw-r--r--OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build2
-rw-r--r--OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj10
-rw-r--r--OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build2
-rw-r--r--bin/Prebuild.exebin176128 -> 176128 bytes
-rw-r--r--prebuild.xml24
21 files changed, 71 insertions, 132 deletions
diff --git a/OpenGridServices.build b/OpenGridServices.build
index 2efeac9..90f9341 100644
--- a/OpenGridServices.build
+++ b/OpenGridServices.build
@@ -46,7 +46,6 @@
46 <echo message="Deleting all builds from all configurations" /> 46 <echo message="Deleting all builds from all configurations" />
47 <delete dir="${bin.dir}" failonerror="false" /> 47 <delete dir="${bin.dir}" failonerror="false" />
48 <delete dir="${obj.dir}" failonerror="false" /> 48 <delete dir="${obj.dir}" failonerror="false" />
49 <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="clean" />
50 <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="clean" /> 49 <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="clean" />
51 <nant buildfile="OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build" target="clean" /> 50 <nant buildfile="OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build" target="clean" />
52 <nant buildfile="OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build" target="clean" /> 51 <nant buildfile="OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build" target="clean" />
@@ -61,7 +60,6 @@
61 </target> 60 </target>
62 61
63 <target name="build" depends="init" description=""> 62 <target name="build" depends="init" description="">
64 <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="build" />
65 <nant buildfile="OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build" target="build" /> 63 <nant buildfile="OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build" target="build" />
66 <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="build" /> 64 <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="build" />
67 <nant buildfile="OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build" target="build" /> 65 <nant buildfile="OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build" target="build" />
@@ -83,7 +81,6 @@
83 81
84 <target name="doc" depends="build-release"> 82 <target name="doc" depends="build-release">
85 <echo message="Generating all documentation from all builds" /> 83 <echo message="Generating all documentation from all builds" />
86 <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="doc" />
87 <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="doc" /> 84 <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="doc" />
88 <nant buildfile="OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build" target="doc" /> 85 <nant buildfile="OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build" target="doc" />
89 <nant buildfile="OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build" target="doc" /> 86 <nant buildfile="OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build" target="doc" />
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 2343bc0..bb33294 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,7 +1,5 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual Studio 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
6EndProject 4EndProject
7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.MSSQL", "OpenSim\Framework\Data.MSSQL\OpenSim.Framework.Data.MSSQL.csproj", "{17F7F694-0000-0000-0000-000000000000}" 5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.MSSQL", "OpenSim\Framework\Data.MSSQL\OpenSim.Framework.Data.MSSQL.csproj", "{17F7F694-0000-0000-0000-000000000000}"
@@ -30,21 +28,10 @@ Global
30 Release|Any CPU = Release|Any CPU 28 Release|Any CPU = Release|Any CPU
31 EndGlobalSection 29 EndGlobalSection
32 GlobalSection(ProjectDependencies) = postSolution 30 GlobalSection(ProjectDependencies) = postSolution
33 ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
34 ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
35 ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
36 ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
37 ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
38 ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
39 ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000}) 31 ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
40 ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
41 ({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000}) 32 ({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})
42 EndGlobalSection 33 EndGlobalSection
43 GlobalSection(ProjectConfigurationPlatforms) = postSolution 34 GlobalSection(ProjectConfigurationPlatforms) = postSolution
44 {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45 {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
46 {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
47 {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
48 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 35 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 36 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
50 {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 37 {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
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 @@
66 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 66 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
67 <Private>False</Private> 67 <Private>False</Private>
68 </Reference> 68 </Reference>
69 <Reference Include="OpenSim.Framework.Data" >
70 <HintPath>OpenSim.Framework.Data.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
69 <Reference Include="System" > 73 <Reference Include="System" >
70 <HintPath>System.dll</HintPath> 74 <HintPath>System.dll</HintPath>
71 <Private>False</Private> 75 <Private>False</Private>
@@ -80,12 +84,6 @@
80 </Reference> 84 </Reference>
81 </ItemGroup> 85 </ItemGroup>
82 <ItemGroup> 86 <ItemGroup>
83 <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
84 <Name>OpenSim.Framework.Data</Name>
85 <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private>
88 </ProjectReference>
89 </ItemGroup> 87 </ItemGroup>
90 <ItemGroup> 88 <ItemGroup>
91 <Compile Include="DB4oGridData.cs"> 89 <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 @@
23 </lib> 23 </lib>
24 <include name="../../../bin/Db4objects.Db4o.dll" /> 24 <include name="../../../bin/Db4objects.Db4o.dll" />
25 <include name="../../../bin/libsecondlife.dll" /> 25 <include name="../../../bin/libsecondlife.dll" />
26 <include name="../../../bin/OpenSim.Framework.Data.dll" /> 26 <include name="OpenSim.Framework.Data.dll" />
27 <include name="System.dll" /> 27 <include name="System.dll" />
28 <include name="System.Data.dll" /> 28 <include name="System.Data.dll" />
29 <include name="System.Xml.dll" /> 29 <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 @@
62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private> 63 <Private>False</Private>
64 </Reference> 64 </Reference>
65 <Reference Include="OpenSim.Framework.Data" >
66 <HintPath>OpenSim.Framework.Data.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
65 <Reference Include="System" > 69 <Reference Include="System" >
66 <HintPath>System.dll</HintPath> 70 <HintPath>System.dll</HintPath>
67 <Private>False</Private> 71 <Private>False</Private>
@@ -76,12 +80,6 @@
76 </Reference> 80 </Reference>
77 </ItemGroup> 81 </ItemGroup>
78 <ItemGroup> 82 <ItemGroup>
79 <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
80 <Name>OpenSim.Framework.Data</Name>
81 <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
83 <Private>False</Private>
84 </ProjectReference>
85 </ItemGroup> 83 </ItemGroup>
86 <ItemGroup> 84 <ItemGroup>
87 <Compile Include="MSSQLGridData.cs"> 85 <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 @@
21 <include name="${project::get-base-directory()}/${build.dir}" /> 21 <include name="${project::get-base-directory()}/${build.dir}" />
22 </lib> 22 </lib>
23 <include name="../../../bin/libsecondlife.dll" /> 23 <include name="../../../bin/libsecondlife.dll" />
24 <include name="../../../bin/OpenSim.Framework.Data.dll" /> 24 <include name="OpenSim.Framework.Data.dll" />
25 <include name="System.dll" /> 25 <include name="System.dll" />
26 <include name="System.Data.dll" /> 26 <include name="System.Data.dll" />
27 <include name="System.Xml.dll" /> 27 <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 @@
66 <HintPath>..\..\..\bin\MySql.Data.dll</HintPath> 66 <HintPath>..\..\..\bin\MySql.Data.dll</HintPath>
67 <Private>False</Private> 67 <Private>False</Private>
68 </Reference> 68 </Reference>
69 <Reference Include="OpenSim.Framework.Data" >
70 <HintPath>OpenSim.Framework.Data.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
69 <Reference Include="System" > 73 <Reference Include="System" >
70 <HintPath>System.dll</HintPath> 74 <HintPath>System.dll</HintPath>
71 <Private>False</Private> 75 <Private>False</Private>
@@ -80,12 +84,6 @@
80 </Reference> 84 </Reference>
81 </ItemGroup> 85 </ItemGroup>
82 <ItemGroup> 86 <ItemGroup>
83 <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
84 <Name>OpenSim.Framework.Data</Name>
85 <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private>
88 </ProjectReference>
89 </ItemGroup> 87 </ItemGroup>
90 <ItemGroup> 88 <ItemGroup>
91 <Compile Include="MySQLGridData.cs"> 89 <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 @@
25 </lib> 25 </lib>
26 <include name="../../../bin/libsecondlife.dll" /> 26 <include name="../../../bin/libsecondlife.dll" />
27 <include name="../../../bin/MySql.Data.dll" /> 27 <include name="../../../bin/MySql.Data.dll" />
28 <include name="../../../bin/OpenSim.Framework.Data.dll" /> 28 <include name="OpenSim.Framework.Data.dll" />
29 <include name="System.dll" /> 29 <include name="System.dll" />
30 <include name="System.Data.dll" /> 30 <include name="System.Data.dll" />
31 <include name="System.Xml.dll" /> 31 <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 @@
62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private> 63 <Private>False</Private>
64 </Reference> 64 </Reference>
65 <Reference Include="OpenSim.Framework.Data" >
66 <HintPath>OpenSim.Framework.Data.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
65 <Reference Include="System" > 69 <Reference Include="System" >
66 <HintPath>System.dll</HintPath> 70 <HintPath>System.dll</HintPath>
67 <Private>False</Private> 71 <Private>False</Private>
@@ -80,12 +84,6 @@
80 </Reference> 84 </Reference>
81 </ItemGroup> 85 </ItemGroup>
82 <ItemGroup> 86 <ItemGroup>
83 <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
84 <Name>OpenSim.Framework.Data</Name>
85 <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private>
88 </ProjectReference>
89 </ItemGroup> 87 </ItemGroup>
90 <ItemGroup> 88 <ItemGroup>
91 <Compile Include="SQLiteGridData.cs"> 89 <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 @@
21 <include name="${project::get-base-directory()}/${build.dir}" /> 21 <include name="${project::get-base-directory()}/${build.dir}" />
22 </lib> 22 </lib>
23 <include name="../../../bin/libsecondlife.dll" /> 23 <include name="../../../bin/libsecondlife.dll" />
24 <include name="../../../bin/OpenSim.Framework.Data.dll" /> 24 <include name="OpenSim.Framework.Data.dll" />
25 <include name="System.dll" /> 25 <include name="System.dll" />
26 <include name="System.Data.dll" /> 26 <include name="System.Data.dll" />
27 <include name="../../../bin/System.Data.SQLite.dll" /> 27 <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 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
6 <ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenSim.Framework.Data</AssemblyName> 12 <AssemblyName>OpenSim.Framework.Data</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenSim.Framework.Data</RootNamespace> 19 <RootNamespace>OpenSim.Framework.Data</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,27 +55,29 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="libsecondlife.dll"> 61 <Reference Include="libsecondlife.dll" >
69 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System"> 65 <Reference Include="System" >
73 <HintPath>System.dll</HintPath> 66 <HintPath>System.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System.Data"> 69 <Reference Include="System.Data" >
77 <HintPath>System.Data.dll</HintPath> 70 <HintPath>System.Data.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
80 <Reference Include="System.Xml"> 73 <Reference Include="System.Xml" >
81 <HintPath>System.Xml.dll</HintPath> 74 <HintPath>System.Xml.dll</HintPath>
82 <Private>False</Private> 75 <Private>False</Private>
83 </Reference> 76 </Reference>
84 <Reference Include="XMLRPC, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" /> 77 <Reference Include="XMLRPC.dll" >
78 <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
85 </ItemGroup> 81 </ItemGroup>
86 <ItemGroup> 82 <ItemGroup>
87 </ItemGroup> 83 </ItemGroup>
@@ -121,4 +117,4 @@
121 <PostBuildEvent> 117 <PostBuildEvent>
122 </PostBuildEvent> 118 </PostBuildEvent>
123 </PropertyGroup> 119 </PropertyGroup>
124</Project> \ No newline at end of file 120</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 @@
30 <include name="System.dll" /> 30 <include name="System.dll" />
31 <include name="System.Data.dll" /> 31 <include name="System.Data.dll" />
32 <include name="System.Xml.dll" /> 32 <include name="System.Xml.dll" />
33 <include name="../../../bin/XMLRPC.dll" />
33 </references> 34 </references>
34 </csc> 35 </csc>
35 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> 36 <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 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
6 <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenSim.Framework</AssemblyName> 12 <AssemblyName>OpenSim.Framework</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenSim.Framework</RootNamespace> 19 <RootNamespace>OpenSim.Framework</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,34 +55,36 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="Db4objects.Db4o.dll"> 61 <Reference Include="Db4objects.Db4o.dll" >
69 <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> 62 <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="libsecondlife.dll"> 65 <Reference Include="libsecondlife.dll" >
73 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 66 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System"> 69 <Reference Include="System" >
77 <HintPath>System.dll</HintPath> 70 <HintPath>System.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
80 <Reference Include="System.Xml"> 73 <Reference Include="System.Xml" >
81 <HintPath>System.Xml.dll</HintPath> 74 <HintPath>System.Xml.dll</HintPath>
82 <Private>False</Private> 75 <Private>False</Private>
83 </Reference> 76 </Reference>
84 <Reference Include="XMLRPC, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" /> 77 <Reference Include="XMLRPC.dll" >
78 <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
85 </ItemGroup> 81 </ItemGroup>
86 <ItemGroup> 82 <ItemGroup>
87 <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj"> 83 <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj">
88 <Name>OpenSim.Framework.Console</Name> 84 <Name>OpenSim.Framework.Console</Name>
89 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 85 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
91 <Private>False</Private> 87 <Private>False</Private>
92 </ProjectReference> 88 </ProjectReference>
93 </ItemGroup> 89 </ItemGroup>
94 <ItemGroup> 90 <ItemGroup>
@@ -205,4 +201,4 @@
205 <PostBuildEvent> 201 <PostBuildEvent>
206 </PostBuildEvent> 202 </PostBuildEvent>
207 </PropertyGroup> 203 </PropertyGroup>
208</Project> \ No newline at end of file 204</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 @@
74 <HintPath>OpenSim.Framework.Console.dll</HintPath> 74 <HintPath>OpenSim.Framework.Console.dll</HintPath>
75 <Private>False</Private> 75 <Private>False</Private>
76 </Reference> 76 </Reference>
77 <Reference Include="OpenSim.Framework.Data" >
78 <HintPath>OpenSim.Framework.Data.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
77 <Reference Include="OpenSim.Framework.GenericConfig.Xml" > 81 <Reference Include="OpenSim.Framework.GenericConfig.Xml" >
78 <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath> 82 <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
79 <Private>False</Private> 83 <Private>False</Private>
@@ -100,12 +104,6 @@
100 </Reference> 104 </Reference>
101 </ItemGroup> 105 </ItemGroup>
102 <ItemGroup> 106 <ItemGroup>
103 <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
104 <Name>OpenSim.Framework.Data</Name>
105 <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
107 <Private>False</Private>
108 </ProjectReference>
109 </ItemGroup> 107 </ItemGroup>
110 <ItemGroup> 108 <ItemGroup>
111 <Compile Include="LoginResponse.cs"> 109 <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 @@
23 <include name="../../../bin/libsecondlife.dll" /> 23 <include name="../../../bin/libsecondlife.dll" />
24 <include name="../../../bin/OpenSim.Framework.dll" /> 24 <include name="../../../bin/OpenSim.Framework.dll" />
25 <include name="../../../bin/OpenSim.Framework.Console.dll" /> 25 <include name="../../../bin/OpenSim.Framework.Console.dll" />
26 <include name="../../../bin/OpenSim.Framework.Data.dll" /> 26 <include name="OpenSim.Framework.Data.dll" />
27 <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> 27 <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
28 <include name="../../../bin/OpenSim.Framework.Servers.dll" /> 28 <include name="../../../bin/OpenSim.Framework.Servers.dll" />
29 <include name="System.dll" /> 29 <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 @@
74 <HintPath>OpenSim.Framework.Console.dll</HintPath> 74 <HintPath>OpenSim.Framework.Console.dll</HintPath>
75 <Private>False</Private> 75 <Private>False</Private>
76 </Reference> 76 </Reference>
77 <Reference Include="OpenSim.Framework.Data" >
78 <HintPath>OpenSim.Framework.Data.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
77 <Reference Include="OpenSim.Framework.GenericConfig.Xml" > 81 <Reference Include="OpenSim.Framework.GenericConfig.Xml" >
78 <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath> 82 <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
79 <Private>False</Private> 83 <Private>False</Private>
@@ -100,12 +104,6 @@
100 </Reference> 104 </Reference>
101 </ItemGroup> 105 </ItemGroup>
102 <ItemGroup> 106 <ItemGroup>
103 <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
104 <Name>OpenSim.Framework.Data</Name>
105 <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
107 <Private>False</Private>
108 </ProjectReference>
109 <ProjectReference Include="..\Framework.Manager\OpenSim.Grid.Framework.Manager.csproj"> 107 <ProjectReference Include="..\Framework.Manager\OpenSim.Grid.Framework.Manager.csproj">
110 <Name>OpenSim.Grid.Framework.Manager</Name> 108 <Name>OpenSim.Grid.Framework.Manager</Name>
111 <Project>{4B7BFD1C-0000-0000-0000-000000000000}</Project> 109 <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 @@
24 <include name="../../../bin/libsecondlife.dll" /> 24 <include name="../../../bin/libsecondlife.dll" />
25 <include name="../../../bin/OpenSim.Framework.dll" /> 25 <include name="../../../bin/OpenSim.Framework.dll" />
26 <include name="../../../bin/OpenSim.Framework.Console.dll" /> 26 <include name="../../../bin/OpenSim.Framework.Console.dll" />
27 <include name="../../../bin/OpenSim.Framework.Data.dll" /> 27 <include name="OpenSim.Framework.Data.dll" />
28 <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> 28 <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
29 <include name="../../../bin/OpenSim.Framework.Servers.dll" /> 29 <include name="../../../bin/OpenSim.Framework.Servers.dll" />
30 <include name="../../../bin/OpenSim.Grid.Framework.Manager.dll" /> 30 <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 @@
74 <HintPath>OpenSim.Framework.Console.dll</HintPath> 74 <HintPath>OpenSim.Framework.Console.dll</HintPath>
75 <Private>False</Private> 75 <Private>False</Private>
76 </Reference> 76 </Reference>
77 <Reference Include="OpenSim.Framework.Data" >
78 <HintPath>OpenSim.Framework.Data.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
77 <Reference Include="OpenSim.Framework.GenericConfig.Xml" > 81 <Reference Include="OpenSim.Framework.GenericConfig.Xml" >
78 <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath> 82 <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
79 <Private>False</Private> 83 <Private>False</Private>
@@ -100,12 +104,6 @@
100 </Reference> 104 </Reference>
101 </ItemGroup> 105 </ItemGroup>
102 <ItemGroup> 106 <ItemGroup>
103 <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
104 <Name>OpenSim.Framework.Data</Name>
105 <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
107 <Private>False</Private>
108 </ProjectReference>
109 <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj"> 107 <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
110 <Name>OpenSim.Framework.UserManagement</Name> 108 <Name>OpenSim.Framework.UserManagement</Name>
111 <Project>{586E2916-0000-0000-0000-000000000000}</Project> 109 <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 @@
24 <include name="../../../bin/libsecondlife.dll" /> 24 <include name="../../../bin/libsecondlife.dll" />
25 <include name="../../../bin/OpenSim.Framework.dll" /> 25 <include name="../../../bin/OpenSim.Framework.dll" />
26 <include name="../../../bin/OpenSim.Framework.Console.dll" /> 26 <include name="../../../bin/OpenSim.Framework.Console.dll" />
27 <include name="../../../bin/OpenSim.Framework.Data.dll" /> 27 <include name="OpenSim.Framework.Data.dll" />
28 <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> 28 <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
29 <include name="../../../bin/OpenSim.Framework.Servers.dll" /> 29 <include name="../../../bin/OpenSim.Framework.Servers.dll" />
30 <include name="../../../bin/OpenSim.Framework.UserManagement.dll" /> 30 <include name="../../../bin/OpenSim.Framework.UserManagement.dll" />
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index 81d532b..1aab4a2 100644
--- a/bin/Prebuild.exe
+++ b/bin/Prebuild.exe
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index 777a839..70ab6e8 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -762,30 +762,6 @@
762 </Options> 762 </Options>
763 </Configuration> 763 </Configuration>
764 764
765
766 <!-- OpenSim Data Services -->
767 <Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library">
768 <Configuration name="Debug">
769 <Options>
770 <OutputPath>../../../bin/</OutputPath>
771 </Options>
772 </Configuration>
773 <Configuration name="Release">
774 <Options>
775 <OutputPath>../../../bin/</OutputPath>
776 </Options>
777 </Configuration>
778
779 <ReferencePath>../../../bin/</ReferencePath>
780 <Reference name="System" localCopy="false"/>
781 <Reference name="System.Xml"/>
782 <Reference name="System.Data"/>
783 <Reference name="libsecondlife.dll"/>
784 <Files>
785 <Match pattern="*.cs" recurse="true"/>
786 </Files>
787 </Project>
788
789 <Project name="OpenSim.Framework.Data.MySQL" path="OpenSim/Framework/Data.MySQL" type="Library"> 765 <Project name="OpenSim.Framework.Data.MySQL" path="OpenSim/Framework/Data.MySQL" type="Library">
790 <Configuration name="Debug"> 766 <Configuration name="Debug">
791 <Options> 767 <Options>
generated by cgit v1.1 at 2024-11-17 04:09:11 +0000