diff options
Stage 2: GridServices build files should be fixed now, Someone will need to test it under nant, and the releng scripts might need updating as we now have two solutions.
Also the build order for the two solutions should be to compile the OpenSim Solution first and then the GridServices one, as the common projects are referenced by DLL in the Gridservices.
29 files changed, 563 insertions, 379 deletions
diff --git a/OpenGridServices.build b/OpenGridServices.build new file mode 100644 index 0000000..d240dc0 --- /dev/null +++ b/OpenGridServices.build | |||
@@ -0,0 +1,100 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenGridServices" default="build"> | ||
3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> | ||
4 | |||
5 | <property name="bin.dir" value="bin" /> | ||
6 | <property name="obj.dir" value="obj" /> | ||
7 | <property name="doc.dir" value="doc" /> | ||
8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> | ||
9 | |||
10 | <target name="Debug" description=""> | ||
11 | <property name="project.config" value="Debug" /> | ||
12 | <property name="build.debug" value="true" /> | ||
13 | </target> | ||
14 | |||
15 | <property name="project.config" value="Release" /> | ||
16 | |||
17 | <target name="Release" description=""> | ||
18 | <property name="project.config" value="Release" /> | ||
19 | <property name="build.debug" value="false" /> | ||
20 | </target> | ||
21 | |||
22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> | ||
23 | <property name="nant.settings.currentframework" value="net-1.1" /> | ||
24 | </target> | ||
25 | |||
26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> | ||
27 | <property name="nant.settings.currentframework" value="net-2.0" /> | ||
28 | </target> | ||
29 | |||
30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> | ||
31 | <property name="nant.settings.currentframework" value="mono-2.0" /> | ||
32 | </target> | ||
33 | |||
34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> | ||
35 | <property name="nant.settings.currentframework" value="mono-1.0" /> | ||
36 | </target> | ||
37 | |||
38 | <target name="init" description=""> | ||
39 | <call target="${project.config}" /> | ||
40 | <sysinfo /> | ||
41 | <echo message="Platform ${sys.os.platform}" /> | ||
42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> | ||
43 | </target> | ||
44 | |||
45 | <target name="clean" description=""> | ||
46 | <echo message="Deleting all builds from all configurations" /> | ||
47 | <delete dir="${bin.dir}" failonerror="false" /> | ||
48 | <delete dir="${obj.dir}" failonerror="false" /> | ||
49 | <nant buildfile="OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" /> | ||
50 | <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="clean" /> | ||
51 | <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" /> | ||
52 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="clean" /> | ||
53 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" /> | ||
54 | <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="clean" /> | ||
55 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="clean" /> | ||
56 | <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> | ||
57 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" /> | ||
58 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" /> | ||
59 | <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> | ||
60 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" /> | ||
61 | </target> | ||
62 | |||
63 | <target name="build" depends="init" description=""> | ||
64 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" /> | ||
65 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="build" /> | ||
66 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="build" /> | ||
67 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="build" /> | ||
68 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="build" /> | ||
69 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="build" /> | ||
70 | <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="build" /> | ||
71 | <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> | ||
72 | <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" /> | ||
73 | <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> | ||
74 | <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" /> | ||
75 | <nant buildfile="OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" /> | ||
76 | </target> | ||
77 | |||
78 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> | ||
79 | |||
80 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> | ||
81 | |||
82 | <target name="package" depends="clean, doc" description="Builds all" /> | ||
83 | |||
84 | <target name="doc" depends="build-release"> | ||
85 | <echo message="Generating all documentation from all builds" /> | ||
86 | <nant buildfile="OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" /> | ||
87 | <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="doc" /> | ||
88 | <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" /> | ||
89 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="doc" /> | ||
90 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" /> | ||
91 | <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="doc" /> | ||
92 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="doc" /> | ||
93 | <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> | ||
94 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" /> | ||
95 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" /> | ||
96 | <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> | ||
97 | <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" /> | ||
98 | </target> | ||
99 | |||
100 | </project> | ||
diff --git a/OpenGridServices.sln b/OpenGridServices.sln new file mode 100644 index 0000000..bc21256 --- /dev/null +++ b/OpenGridServices.sln | |||
@@ -0,0 +1,85 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | ||
2 | # Visual C# Express 2005 | ||
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}" | ||
4 | EndProject | ||
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices\OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}" | ||
6 | EndProject | ||
7 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGridServices\OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}" | ||
8 | EndProject | ||
9 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.SQLite", "OpenGridServices\OpenGrid.Framework.Data.SQLite\OpenGrid.Framework.Data.SQLite.csproj", "{1E3F341A-0000-0000-0000-000000000000}" | ||
10 | EndProject | ||
11 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.DB4o", "OpenGridServices\OpenGrid.Framework.Data.DB4o\OpenGrid.Framework.Data.DB4o.csproj", "{39BD9497-0000-0000-0000-000000000000}" | ||
12 | EndProject | ||
13 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceManager", "OpenGridServices\ServiceManager\ServiceManager.csproj", "{E141F4EE-0000-0000-0000-000000000000}" | ||
14 | EndProject | ||
15 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Manager", "OpenGridServices\OpenGrid.Framework.Manager\OpenGrid.Framework.Manager.csproj", "{7924FD35-0000-0000-0000-000000000000}" | ||
16 | EndProject | ||
17 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices\OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}" | ||
18 | EndProject | ||
19 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MSSQL", "OpenGridServices\OpenGrid.Framework.Data.MSSQL\OpenGrid.Framework.Data.MSSQL.csproj", "{0A563AC1-0000-0000-0000-000000000000}" | ||
20 | EndProject | ||
21 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "OpenGridServices\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}" | ||
22 | EndProject | ||
23 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices\OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{66591469-0000-0000-0000-000000000000}" | ||
24 | EndProject | ||
25 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}" | ||
26 | EndProject | ||
27 | Global | ||
28 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
29 | Debug|Any CPU = Debug|Any CPU | ||
30 | Release|Any CPU = Release|Any CPU | ||
31 | EndGlobalSection | ||
32 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
33 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
34 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
35 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
36 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
37 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
38 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
39 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
40 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
41 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
42 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
43 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
44 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
45 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
46 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
47 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
48 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
49 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
50 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
51 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
52 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
53 | {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
54 | {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
55 | {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
56 | {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
57 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
58 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
59 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
60 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
61 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
62 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
63 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
64 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
65 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
66 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
67 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
68 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
69 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
70 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
71 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
72 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
73 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
74 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
75 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
76 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
77 | {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
78 | {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
79 | {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
80 | {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
81 | EndGlobalSection | ||
82 | GlobalSection(SolutionProperties) = preSolution | ||
83 | HideSolutionNode = FALSE | ||
84 | EndGlobalSection | ||
85 | EndGlobal | ||
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj index 00d987b..744e1e8 100644 --- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj +++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj | |||
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\..\bin\</OutputPath> | 35 | <OutputPath>..\..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>..\..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -63,7 +63,7 @@ | |||
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System.Data.dll" > | 65 | <Reference Include="System.Data.dll" > |
66 | <HintPath>..\..\bin\System.Data.dll</HintPath> | 66 | <HintPath>..\..\..\bin\System.Data.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="System.Xml" > | 69 | <Reference Include="System.Xml" > |
@@ -71,27 +71,23 @@ | |||
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | <Reference Include="Db4objects.Db4o.dll" > | 77 | <Reference Include="Db4objects.Db4o.dll" > |
78 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 78 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> |
79 | <Private>False</Private> | ||
80 | </Reference> | ||
81 | <Reference Include="OpenSim.Framework" > | ||
82 | <HintPath>OpenSim.Framework.dll</HintPath> | ||
83 | <Private>False</Private> | ||
84 | </Reference> | ||
85 | <Reference Include="OpenSim.Framework.Console" > | ||
86 | <HintPath>OpenSim.Framework.Console.dll</HintPath> | ||
79 | <Private>False</Private> | 87 | <Private>False</Private> |
80 | </Reference> | 88 | </Reference> |
81 | </ItemGroup> | 89 | </ItemGroup> |
82 | <ItemGroup> | 90 | <ItemGroup> |
83 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> | ||
84 | <Name>OpenSim.Framework</Name> | ||
85 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
87 | <Private>False</Private> | ||
88 | </ProjectReference> | ||
89 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | ||
90 | <Name>OpenSim.Framework.Console</Name> | ||
91 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | ||
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
93 | <Private>False</Private> | ||
94 | </ProjectReference> | ||
95 | </ItemGroup> | 91 | </ItemGroup> |
96 | <ItemGroup> | 92 | <ItemGroup> |
97 | <Compile Include="AssemblyInfo.cs"> | 93 | <Compile Include="AssemblyInfo.cs"> |
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build index 61d3efd..cbc8479 100644 --- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build +++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build | |||
@@ -22,15 +22,15 @@ | |||
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="System.Data.dll.dll" /> | 23 | <include name="System.Data.dll.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../bin/libsecondlife.dll" /> | 25 | <include name="../../../bin/libsecondlife.dll" /> |
26 | <include name="../../bin/Db4objects.Db4o.dll" /> | 26 | <include name="../../../bin/Db4objects.Db4o.dll" /> |
27 | <include name="../../bin/OpenSim.Framework.dll" /> | 27 | <include name="../../../bin/OpenSim.Framework.dll" /> |
28 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj index 02abc3e..82d4f5f 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj | |||
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -71,11 +71,11 @@ | |||
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | <Reference Include="Db4objects.Db4o.dll" > | 77 | <Reference Include="Db4objects.Db4o.dll" > |
78 | <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> | 78 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </Reference> | 80 | </Reference> |
81 | </ItemGroup> | 81 | </ItemGroup> |
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 144813b..8e0f53a 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 | |||
@@ -24,14 +24,14 @@ | |||
24 | <include name="System.dll" /> | 24 | <include name="System.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
26 | <include name="System.Data.dll" /> | 26 | <include name="System.Data.dll" /> |
27 | <include name="../bin/OpenGrid.Framework.Data.dll" /> | 27 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> |
28 | <include name="../bin/libsecondlife.dll" /> | 28 | <include name="../../bin/libsecondlife.dll" /> |
29 | <include name="../bin/Db4objects.Db4o.dll" /> | 29 | <include name="../../bin/Db4objects.Db4o.dll" /> |
30 | </references> | 30 | </references> |
31 | </csc> | 31 | </csc> |
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
33 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
34 | <copy todir="${project::get-base-directory()}/../bin/"> | 34 | <copy todir="${project::get-base-directory()}/../../bin/"> |
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
36 | <include name="*.dll"/> | 36 | <include name="*.dll"/> |
37 | <include name="*.exe"/> | 37 | <include name="*.exe"/> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj index efb6a32..8d53692 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj | |||
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -71,7 +71,7 @@ | |||
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | </ItemGroup> | 77 | </ItemGroup> |
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 61b1826..5b6b75b 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 | |||
@@ -23,13 +23,13 @@ | |||
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="System.Data.dll" /> | 25 | <include name="System.Data.dll" /> |
26 | <include name="../bin/OpenGrid.Framework.Data.dll" /> | 26 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> |
27 | <include name="../bin/libsecondlife.dll" /> | 27 | <include name="../../bin/libsecondlife.dll" /> |
28 | </references> | 28 | </references> |
29 | </csc> | 29 | </csc> |
30 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 30 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
31 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 31 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
32 | <copy todir="${project::get-base-directory()}/../bin/"> | 32 | <copy todir="${project::get-base-directory()}/../../bin/"> |
33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
34 | <include name="*.dll"/> | 34 | <include name="*.dll"/> |
35 | <include name="*.exe"/> | 35 | <include name="*.exe"/> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj index ae3d5c5..9a1703a 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj | |||
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -71,11 +71,11 @@ | |||
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | <Reference Include="MySql.Data.dll" > | 77 | <Reference Include="MySql.Data.dll" > |
78 | <HintPath>..\bin\MySql.Data.dll</HintPath> | 78 | <HintPath>..\..\bin\MySql.Data.dll</HintPath> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </Reference> | 80 | </Reference> |
81 | </ItemGroup> | 81 | </ItemGroup> |
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 a390324..2d425b4 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 | |||
@@ -24,14 +24,14 @@ | |||
24 | <include name="System.dll" /> | 24 | <include name="System.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
26 | <include name="System.Data.dll" /> | 26 | <include name="System.Data.dll" /> |
27 | <include name="../bin/OpenGrid.Framework.Data.dll" /> | 27 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> |
28 | <include name="../bin/libsecondlife.dll" /> | 28 | <include name="../../bin/libsecondlife.dll" /> |
29 | <include name="../bin/MySql.Data.dll" /> | 29 | <include name="../../bin/MySql.Data.dll" /> |
30 | </references> | 30 | </references> |
31 | </csc> | 31 | </csc> |
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
33 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
34 | <copy todir="${project::get-base-directory()}/../bin/"> | 34 | <copy todir="${project::get-base-directory()}/../../bin/"> |
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
36 | <include name="*.dll"/> | 36 | <include name="*.dll"/> |
37 | <include name="*.exe"/> | 37 | <include name="*.exe"/> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj index ef2ecaa..463cf86 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj | |||
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -71,11 +71,11 @@ | |||
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="System.Data.SQLite.dll" > | 73 | <Reference Include="System.Data.SQLite.dll" > |
74 | <HintPath>..\bin\System.Data.SQLite.dll</HintPath> | 74 | <HintPath>..\..\bin\System.Data.SQLite.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | <Reference Include="libsecondlife.dll" > | 77 | <Reference Include="libsecondlife.dll" > |
78 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 78 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </Reference> | 80 | </Reference> |
81 | </ItemGroup> | 81 | </ItemGroup> |
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 d9a2369..1be9b43 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 | |||
@@ -23,14 +23,14 @@ | |||
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="System.Data.dll" /> | 25 | <include name="System.Data.dll" /> |
26 | <include name="../bin/System.Data.SQLite.dll" /> | 26 | <include name="../../bin/System.Data.SQLite.dll" /> |
27 | <include name="../bin/OpenGrid.Framework.Data.dll" /> | 27 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> |
28 | <include name="../bin/libsecondlife.dll" /> | 28 | <include name="../../bin/libsecondlife.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj index 201f7ba..2f47478 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj | |||
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -71,7 +71,7 @@ | |||
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | </ItemGroup> | 77 | </ItemGroup> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build index a3fd771..c054f8a 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build | |||
@@ -25,12 +25,12 @@ | |||
25 | <include name="System.dll" /> | 25 | <include name="System.dll" /> |
26 | <include name="System.Xml.dll" /> | 26 | <include name="System.Xml.dll" /> |
27 | <include name="System.Data.dll" /> | 27 | <include name="System.Data.dll" /> |
28 | <include name="../bin/libsecondlife.dll" /> | 28 | <include name="../../bin/libsecondlife.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj index 3122633..ea7548a 100644 --- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj +++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj | |||
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -62,30 +62,24 @@ | |||
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="OpenSim.Framework" > | ||
66 | <HintPath>OpenSim.Framework.dll</HintPath> | ||
67 | <Private>False</Private> | ||
68 | </Reference> | ||
69 | <Reference Include="OpenSim.Servers" > | ||
70 | <HintPath>OpenSim.Servers.dll</HintPath> | ||
71 | <Private>False</Private> | ||
72 | </Reference> | ||
65 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
66 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | ||
76 | </Reference> | ||
77 | <Reference Include="XMLRPC" > | ||
78 | <HintPath>XMLRPC.dll</HintPath> | ||
67 | <Private>False</Private> | 79 | <Private>False</Private> |
68 | </Reference> | 80 | </Reference> |
69 | </ItemGroup> | 81 | </ItemGroup> |
70 | <ItemGroup> | 82 | <ItemGroup> |
71 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | ||
72 | <Name>OpenSim.Framework</Name> | ||
73 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
74 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
75 | <Private>False</Private> | ||
76 | </ProjectReference> | ||
77 | <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj"> | ||
78 | <Name>OpenSim.Servers</Name> | ||
79 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | ||
80 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
81 | <Private>False</Private> | ||
82 | </ProjectReference> | ||
83 | <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> | ||
84 | <Name>XMLRPC</Name> | ||
85 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | ||
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
87 | <Private>False</Private> | ||
88 | </ProjectReference> | ||
89 | </ItemGroup> | 83 | </ItemGroup> |
90 | <ItemGroup> | 84 | <ItemGroup> |
91 | <Compile Include="GridManagementAgent.cs"> | 85 | <Compile Include="GridManagementAgent.cs"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build index daee3bf..f8cc80e 100644 --- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build | |||
@@ -20,15 +20,15 @@ | |||
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="../bin/OpenSim.Framework.dll" /> | 23 | <include name="../../bin/OpenSim.Framework.dll" /> |
24 | <include name="../bin/OpenSim.Servers.dll" /> | 24 | <include name="../../bin/OpenSim.Servers.dll" /> |
25 | <include name="../bin/libsecondlife.dll" /> | 25 | <include name="../../bin/libsecondlife.dll" /> |
26 | <include name="../bin/XMLRPC.dll" /> | 26 | <include name="../../bin/XMLRPC.dll" /> |
27 | </references> | 27 | </references> |
28 | </csc> | 28 | </csc> |
29 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 29 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
30 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 30 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
31 | <copy todir="${project::get-base-directory()}/../bin/"> | 31 | <copy todir="${project::get-base-directory()}/../../bin/"> |
32 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 32 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
33 | <include name="*.dll"/> | 33 | <include name="*.dll"/> |
34 | <include name="*.exe"/> | 34 | <include name="*.exe"/> |
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj index d01a52e..257f6e1 100644 --- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj +++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj | |||
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -70,46 +70,36 @@ | |||
70 | <HintPath>System.Xml.dll</HintPath> | 70 | <HintPath>System.Xml.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="OpenSim.Framework" > | ||
74 | <HintPath>OpenSim.Framework.dll</HintPath> | ||
75 | <Private>False</Private> | ||
76 | </Reference> | ||
77 | <Reference Include="OpenSim.Framework.Console" > | ||
78 | <HintPath>OpenSim.Framework.Console.dll</HintPath> | ||
79 | <Private>False</Private> | ||
80 | </Reference> | ||
81 | <Reference Include="OpenSim.GridInterfaces.Local" > | ||
82 | <HintPath>OpenSim.GridInterfaces.Local.dll</HintPath> | ||
83 | <Private>False</Private> | ||
84 | </Reference> | ||
85 | <Reference Include="OpenSim.Servers" > | ||
86 | <HintPath>OpenSim.Servers.dll</HintPath> | ||
87 | <Private>False</Private> | ||
88 | </Reference> | ||
73 | <Reference Include="libsecondlife.dll" > | 89 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 90 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 91 | <Private>False</Private> |
76 | </Reference> | 92 | </Reference> |
77 | <Reference Include="Db4objects.Db4o.dll" > | 93 | <Reference Include="Db4objects.Db4o.dll" > |
78 | <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> | 94 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
95 | <Private>False</Private> | ||
96 | </Reference> | ||
97 | <Reference Include="XMLRPC" > | ||
98 | <HintPath>XMLRPC.dll</HintPath> | ||
79 | <Private>False</Private> | 99 | <Private>False</Private> |
80 | </Reference> | 100 | </Reference> |
81 | </ItemGroup> | 101 | </ItemGroup> |
82 | <ItemGroup> | 102 | <ItemGroup> |
83 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | ||
84 | <Name>OpenSim.Framework</Name> | ||
85 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
87 | <Private>False</Private> | ||
88 | </ProjectReference> | ||
89 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | ||
90 | <Name>OpenSim.Framework.Console</Name> | ||
91 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | ||
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
93 | <Private>False</Private> | ||
94 | </ProjectReference> | ||
95 | <ProjectReference Include="..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj"> | ||
96 | <Name>OpenSim.GridInterfaces.Local</Name> | ||
97 | <Project>{546099CD-0000-0000-0000-000000000000}</Project> | ||
98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
99 | <Private>False</Private> | ||
100 | </ProjectReference> | ||
101 | <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj"> | ||
102 | <Name>OpenSim.Servers</Name> | ||
103 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | ||
104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
105 | <Private>False</Private> | ||
106 | </ProjectReference> | ||
107 | <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> | ||
108 | <Name>XMLRPC</Name> | ||
109 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | ||
110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
111 | <Private>False</Private> | ||
112 | </ProjectReference> | ||
113 | </ItemGroup> | 103 | </ItemGroup> |
114 | <ItemGroup> | 104 | <ItemGroup> |
115 | <Compile Include="AssetHttpServer.cs"> | 105 | <Compile Include="AssetHttpServer.cs"> |
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build index cd76f22..e889a4d 100644 --- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build +++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build | |||
@@ -23,18 +23,18 @@ | |||
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Data.dll" /> | 24 | <include name="System.Data.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
26 | <include name="../bin/OpenSim.Framework.dll" /> | 26 | <include name="../../bin/OpenSim.Framework.dll" /> |
27 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 27 | <include name="../../bin/OpenSim.Framework.Console.dll" /> |
28 | <include name="../bin/OpenSim.GridInterfaces.Local.dll" /> | 28 | <include name="../../bin/OpenSim.GridInterfaces.Local.dll" /> |
29 | <include name="../bin/OpenSim.Servers.dll" /> | 29 | <include name="../../bin/OpenSim.Servers.dll" /> |
30 | <include name="../bin/libsecondlife.dll" /> | 30 | <include name="../../bin/libsecondlife.dll" /> |
31 | <include name="../bin/Db4objects.Db4o.dll" /> | 31 | <include name="../../bin/Db4objects.Db4o.dll" /> |
32 | <include name="../bin/XMLRPC.dll" /> | 32 | <include name="../../bin/XMLRPC.dll" /> |
33 | </references> | 33 | </references> |
34 | </csc> | 34 | </csc> |
35 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 35 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
36 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 36 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
37 | <copy todir="${project::get-base-directory()}/../bin/"> | 37 | <copy todir="${project::get-base-directory()}/../../bin/"> |
38 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 38 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
39 | <include name="*.dll"/> | 39 | <include name="*.dll"/> |
40 | <include name="*.exe"/> | 40 | <include name="*.exe"/> |
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj index 5f3fc6f..b83c6ba 100644 --- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj +++ b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj | |||
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -70,34 +70,32 @@ | |||
70 | <HintPath>System.Xml.dll</HintPath> | 70 | <HintPath>System.Xml.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="OpenSim.Framework" > | ||
74 | <HintPath>OpenSim.Framework.dll</HintPath> | ||
75 | <Private>False</Private> | ||
76 | </Reference> | ||
77 | <Reference Include="OpenSim.Framework.Console" > | ||
78 | <HintPath>OpenSim.Framework.Console.dll</HintPath> | ||
79 | <Private>False</Private> | ||
80 | </Reference> | ||
81 | <Reference Include="OpenSim.Servers" > | ||
82 | <HintPath>OpenSim.Servers.dll</HintPath> | ||
83 | <Private>False</Private> | ||
84 | </Reference> | ||
73 | <Reference Include="libsecondlife.dll" > | 85 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 86 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 87 | <Private>False</Private> |
76 | </Reference> | 88 | </Reference> |
77 | <Reference Include="Db4objects.Db4o.dll" > | 89 | <Reference Include="Db4objects.Db4o.dll" > |
78 | <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> | 90 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
91 | <Private>False</Private> | ||
92 | </Reference> | ||
93 | <Reference Include="XMLRPC" > | ||
94 | <HintPath>XMLRPC.dll</HintPath> | ||
79 | <Private>False</Private> | 95 | <Private>False</Private> |
80 | </Reference> | 96 | </Reference> |
81 | </ItemGroup> | 97 | </ItemGroup> |
82 | <ItemGroup> | 98 | <ItemGroup> |
83 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | ||
84 | <Name>OpenSim.Framework</Name> | ||
85 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
87 | <Private>False</Private> | ||
88 | </ProjectReference> | ||
89 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | ||
90 | <Name>OpenSim.Framework.Console</Name> | ||
91 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | ||
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
93 | <Private>False</Private> | ||
94 | </ProjectReference> | ||
95 | <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj"> | ||
96 | <Name>OpenSim.Servers</Name> | ||
97 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | ||
98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
99 | <Private>False</Private> | ||
100 | </ProjectReference> | ||
101 | <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> | 99 | <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> |
102 | <Name>OpenGrid.Framework.Data</Name> | 100 | <Name>OpenGrid.Framework.Data</Name> |
103 | <Project>{62CDF671-0000-0000-0000-000000000000}</Project> | 101 | <Project>{62CDF671-0000-0000-0000-000000000000}</Project> |
@@ -110,12 +108,6 @@ | |||
110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 108 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
111 | <Private>False</Private> | 109 | <Private>False</Private> |
112 | </ProjectReference> | 110 | </ProjectReference> |
113 | <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> | ||
114 | <Name>XMLRPC</Name> | ||
115 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | ||
116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
117 | <Private>False</Private> | ||
118 | </ProjectReference> | ||
119 | </ItemGroup> | 111 | </ItemGroup> |
120 | <ItemGroup> | 112 | <ItemGroup> |
121 | <Compile Include="GridManager.cs"> | 113 | <Compile Include="GridManager.cs"> |
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build index 9ca4d4b..d61c0f3 100644 --- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build +++ b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build | |||
@@ -23,19 +23,19 @@ | |||
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Data.dll" /> | 24 | <include name="System.Data.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
26 | <include name="../bin/OpenSim.Framework.dll" /> | 26 | <include name="../../bin/OpenSim.Framework.dll" /> |
27 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 27 | <include name="../../bin/OpenSim.Framework.Console.dll" /> |
28 | <include name="../bin/OpenSim.Servers.dll" /> | 28 | <include name="../../bin/OpenSim.Servers.dll" /> |
29 | <include name="../bin/OpenGrid.Framework.Data.dll" /> | 29 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> |
30 | <include name="../bin/OpenGrid.Framework.Manager.dll" /> | 30 | <include name="../../bin/OpenGrid.Framework.Manager.dll" /> |
31 | <include name="../bin/libsecondlife.dll" /> | 31 | <include name="../../bin/libsecondlife.dll" /> |
32 | <include name="../bin/Db4objects.Db4o.dll" /> | 32 | <include name="../../bin/Db4objects.Db4o.dll" /> |
33 | <include name="../bin/XMLRPC.dll" /> | 33 | <include name="../../bin/XMLRPC.dll" /> |
34 | </references> | 34 | </references> |
35 | </csc> | 35 | </csc> |
36 | <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/" /> |
37 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 37 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
38 | <copy todir="${project::get-base-directory()}/../bin/"> | 38 | <copy todir="${project::get-base-directory()}/../../bin/"> |
39 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 39 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
40 | <include name="*.dll"/> | 40 | <include name="*.dll"/> |
41 | <include name="*.exe"/> | 41 | <include name="*.exe"/> |
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj index 9f4da40..16a713b 100644 --- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj +++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj | |||
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -70,46 +70,38 @@ | |||
70 | <HintPath>System.Xml.dll</HintPath> | 70 | <HintPath>System.Xml.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="OpenSim.Framework" > | ||
74 | <HintPath>OpenSim.Framework.dll</HintPath> | ||
75 | <Private>False</Private> | ||
76 | </Reference> | ||
77 | <Reference Include="OpenSim.Framework.Console" > | ||
78 | <HintPath>OpenSim.Framework.Console.dll</HintPath> | ||
79 | <Private>False</Private> | ||
80 | </Reference> | ||
81 | <Reference Include="OpenSim.Servers" > | ||
82 | <HintPath>OpenSim.Servers.dll</HintPath> | ||
83 | <Private>False</Private> | ||
84 | </Reference> | ||
73 | <Reference Include="libsecondlife.dll" > | 85 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 86 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 87 | <Private>False</Private> |
76 | </Reference> | 88 | </Reference> |
77 | <Reference Include="Db4objects.Db4o.dll" > | 89 | <Reference Include="Db4objects.Db4o.dll" > |
78 | <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> | 90 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
91 | <Private>False</Private> | ||
92 | </Reference> | ||
93 | <Reference Include="XMLRPC" > | ||
94 | <HintPath>XMLRPC.dll</HintPath> | ||
79 | <Private>False</Private> | 95 | <Private>False</Private> |
80 | </Reference> | 96 | </Reference> |
81 | </ItemGroup> | 97 | </ItemGroup> |
82 | <ItemGroup> | 98 | <ItemGroup> |
83 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | ||
84 | <Name>OpenSim.Framework</Name> | ||
85 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
87 | <Private>False</Private> | ||
88 | </ProjectReference> | ||
89 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | ||
90 | <Name>OpenSim.Framework.Console</Name> | ||
91 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | ||
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
93 | <Private>False</Private> | ||
94 | </ProjectReference> | ||
95 | <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> | 99 | <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> |
96 | <Name>OpenGrid.Framework.Data</Name> | 100 | <Name>OpenGrid.Framework.Data</Name> |
97 | <Project>{62CDF671-0000-0000-0000-000000000000}</Project> | 101 | <Project>{62CDF671-0000-0000-0000-000000000000}</Project> |
98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 102 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
99 | <Private>False</Private> | 103 | <Private>False</Private> |
100 | </ProjectReference> | 104 | </ProjectReference> |
101 | <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj"> | ||
102 | <Name>OpenSim.Servers</Name> | ||
103 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | ||
104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
105 | <Private>False</Private> | ||
106 | </ProjectReference> | ||
107 | <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> | ||
108 | <Name>XMLRPC</Name> | ||
109 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | ||
110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
111 | <Private>False</Private> | ||
112 | </ProjectReference> | ||
113 | </ItemGroup> | 105 | </ItemGroup> |
114 | <ItemGroup> | 106 | <ItemGroup> |
115 | <Compile Include="Main.cs"> | 107 | <Compile Include="Main.cs"> |
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build index 548c3cc..ba66225 100644 --- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build +++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build | |||
@@ -23,18 +23,18 @@ | |||
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Data.dll" /> | 24 | <include name="System.Data.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
26 | <include name="../bin/OpenSim.Framework.dll" /> | 26 | <include name="../../bin/OpenSim.Framework.dll" /> |
27 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 27 | <include name="../../bin/OpenSim.Framework.Console.dll" /> |
28 | <include name="../bin/OpenGrid.Framework.Data.dll" /> | 28 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> |
29 | <include name="../bin/OpenSim.Servers.dll" /> | 29 | <include name="../../bin/OpenSim.Servers.dll" /> |
30 | <include name="../bin/libsecondlife.dll" /> | 30 | <include name="../../bin/libsecondlife.dll" /> |
31 | <include name="../bin/Db4objects.Db4o.dll" /> | 31 | <include name="../../bin/Db4objects.Db4o.dll" /> |
32 | <include name="../bin/XMLRPC.dll" /> | 32 | <include name="../../bin/XMLRPC.dll" /> |
33 | </references> | 33 | </references> |
34 | </csc> | 34 | </csc> |
35 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 35 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
36 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 36 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
37 | <copy todir="${project::get-base-directory()}/../bin/"> | 37 | <copy todir="${project::get-base-directory()}/../../bin/"> |
38 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 38 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
39 | <include name="*.dll"/> | 39 | <include name="*.dll"/> |
40 | <include name="*.exe"/> | 40 | <include name="*.exe"/> |
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj index 8c4fd39..722b8d4 100644 --- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj +++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj | |||
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\..\bin\</OutputPath> | 35 | <OutputPath>..\..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>..\..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -63,7 +63,7 @@ | |||
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System.Data.dll" > | 65 | <Reference Include="System.Data.dll" > |
66 | <HintPath>..\..\bin\System.Data.dll</HintPath> | 66 | <HintPath>..\..\..\bin\System.Data.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="System.Xml" > | 69 | <Reference Include="System.Xml" > |
@@ -71,27 +71,23 @@ | |||
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | <Reference Include="Db4objects.Db4o.dll" > | 77 | <Reference Include="Db4objects.Db4o.dll" > |
78 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 78 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> |
79 | <Private>False</Private> | ||
80 | </Reference> | ||
81 | <Reference Include="OpenSim.Framework" > | ||
82 | <HintPath>OpenSim.Framework.dll</HintPath> | ||
83 | <Private>False</Private> | ||
84 | </Reference> | ||
85 | <Reference Include="OpenSim.Framework.Console" > | ||
86 | <HintPath>OpenSim.Framework.Console.dll</HintPath> | ||
79 | <Private>False</Private> | 87 | <Private>False</Private> |
80 | </Reference> | 88 | </Reference> |
81 | </ItemGroup> | 89 | </ItemGroup> |
82 | <ItemGroup> | 90 | <ItemGroup> |
83 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> | ||
84 | <Name>OpenSim.Framework</Name> | ||
85 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
87 | <Private>False</Private> | ||
88 | </ProjectReference> | ||
89 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | ||
90 | <Name>OpenSim.Framework.Console</Name> | ||
91 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | ||
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
93 | <Private>False</Private> | ||
94 | </ProjectReference> | ||
95 | </ItemGroup> | 91 | </ItemGroup> |
96 | <ItemGroup> | 92 | <ItemGroup> |
97 | <Compile Include="AssemblyInfo.cs"> | 93 | <Compile Include="AssemblyInfo.cs"> |
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build index 8494a0b..2833bce 100644 --- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build +++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build | |||
@@ -22,15 +22,15 @@ | |||
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="System.Data.dll.dll" /> | 23 | <include name="System.Data.dll.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../bin/libsecondlife.dll" /> | 25 | <include name="../../../bin/libsecondlife.dll" /> |
26 | <include name="../../bin/Db4objects.Db4o.dll" /> | 26 | <include name="../../../bin/Db4objects.Db4o.dll" /> |
27 | <include name="../../bin/OpenSim.Framework.dll" /> | 27 | <include name="../../../bin/OpenSim.Framework.dll" /> |
28 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj index ac118c3..392f560 100644 --- a/OpenGridServices/ServiceManager/ServiceManager.csproj +++ b/OpenGridServices/ServiceManager/ServiceManager.csproj | |||
@@ -36,7 +36,7 @@ | |||
36 | <DebugSymbols>True</DebugSymbols> | 36 | <DebugSymbols>True</DebugSymbols> |
37 | <FileAlignment>4096</FileAlignment> | 37 | <FileAlignment>4096</FileAlignment> |
38 | <Optimize>False</Optimize> | 38 | <Optimize>False</Optimize> |
39 | <OutputPath>..\bin\</OutputPath> | 39 | <OutputPath>..\..\bin\</OutputPath> |
40 | <RegisterForComInterop>False</RegisterForComInterop> | 40 | <RegisterForComInterop>False</RegisterForComInterop> |
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -56,7 +56,7 @@ | |||
56 | <DebugSymbols>False</DebugSymbols> | 56 | <DebugSymbols>False</DebugSymbols> |
57 | <FileAlignment>4096</FileAlignment> | 57 | <FileAlignment>4096</FileAlignment> |
58 | <Optimize>True</Optimize> | 58 | <Optimize>True</Optimize> |
59 | <OutputPath>..\bin\</OutputPath> | 59 | <OutputPath>..\..\bin\</OutputPath> |
60 | <RegisterForComInterop>False</RegisterForComInterop> | 60 | <RegisterForComInterop>False</RegisterForComInterop> |
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
diff --git a/OpenGridServices/ServiceManager/ServiceManager.exe.build b/OpenGridServices/ServiceManager/ServiceManager.exe.build index 7397f49..163e086 100644 --- a/OpenGridServices/ServiceManager/ServiceManager.exe.build +++ b/OpenGridServices/ServiceManager/ServiceManager.exe.build | |||
@@ -23,9 +23,9 @@ | |||
23 | <include name="System.Xml.dll" /> | 23 | <include name="System.Xml.dll" /> |
24 | </references> | 24 | </references> |
25 | </csc> | 25 | </csc> |
26 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 26 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
27 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 27 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
28 | <copy todir="${project::get-base-directory()}/../bin/"> | 28 | <copy todir="${project::get-base-directory()}/../../bin/"> |
29 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 29 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
30 | <include name="*.dll"/> | 30 | <include name="*.dll"/> |
31 | <include name="*.exe"/> | 31 | <include name="*.exe"/> |
diff --git a/OpenSim.sln b/OpenSim.sln index 4ad8e63..f82757b 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -1,5 +1,5 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual C# Express 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" |
4 | EndProject | 4 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim\OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}" | 5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim\OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}" |
@@ -37,85 +37,124 @@ EndProject | |||
37 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" | 37 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" |
38 | EndProject | 38 | EndProject |
39 | Global | 39 | Global |
40 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 40 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
41 | Debug|Any CPU = Debug|Any CPU | 41 | Debug|Any CPU = Debug|Any CPU |
42 | Release|Any CPU = Release|Any CPU | 42 | Release|Any CPU = Release|Any CPU |
43 | EndGlobalSection | 43 | EndGlobalSection |
44 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 44 | GlobalSection(ProjectDependencies) = postSolution |
45 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 45 | ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) |
46 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 46 | ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) |
47 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 47 | ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) |
48 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 48 | ({438A9556-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) |
49 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 49 | ({438A9556-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) |
50 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 50 | ({438A9556-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) |
51 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 51 | ({438A9556-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000}) |
52 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 52 | ({438A9556-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000}) |
53 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 53 | ({438A9556-0000-0000-0000-000000000000}).10 = ({632E1BFD-0000-0000-0000-000000000000}) |
54 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 54 | ({438A9556-0000-0000-0000-000000000000}).11 = ({E88EF749-0000-0000-0000-000000000000}) |
55 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 55 | ({438A9556-0000-0000-0000-000000000000}).12 = ({8E81D43C-0000-0000-0000-000000000000}) |
56 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 56 | ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) |
57 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 57 | ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) |
58 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 58 | ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) |
59 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 59 | ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000}) |
60 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 60 | ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000}) |
61 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 61 | ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000}) |
62 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 62 | ({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000}) |
63 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 63 | ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
64 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 64 | ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
65 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 65 | ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) |
66 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 66 | ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) |
67 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 67 | ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) |
68 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 68 | ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
69 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 69 | ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) |
70 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 70 | ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000}) |
71 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 71 | ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000}) |
72 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 72 | ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
73 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 73 | ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) |
74 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 74 | ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000}) |
75 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 75 | ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) |
76 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 76 | ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) |
77 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 77 | ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) |
78 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 78 | ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) |
79 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 79 | ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
80 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 80 | ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) |
81 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 81 | ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) |
82 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 82 | EndGlobalSection |
83 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 83 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
84 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 84 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
85 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 85 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
86 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 86 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
87 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 87 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
88 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 88 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
89 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 89 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
90 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 90 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
91 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 91 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
92 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 92 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
93 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 93 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
94 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 94 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
95 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 95 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
96 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 96 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
97 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 97 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
98 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 98 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
99 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 99 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
100 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 100 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
101 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 101 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
102 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 102 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
103 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 103 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
104 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 104 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
105 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 105 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
106 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 106 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
107 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 107 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
108 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 108 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
109 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 109 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
110 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 110 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
111 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 111 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
112 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 112 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
113 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 113 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
114 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 114 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
115 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 115 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
116 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 116 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
117 | EndGlobalSection | 117 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
118 | GlobalSection(SolutionProperties) = preSolution | 118 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
119 | HideSolutionNode = FALSE | 119 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
120 | EndGlobalSection | 120 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
121 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
122 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
123 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
124 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
125 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
126 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
127 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
128 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
129 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
130 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
131 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
132 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
133 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
134 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
135 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
136 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
137 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
138 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
139 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
140 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
141 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
142 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
143 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
144 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
145 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
146 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
147 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
148 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
149 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
150 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
151 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
152 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
153 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
154 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
155 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
156 | EndGlobalSection | ||
157 | GlobalSection(SolutionProperties) = preSolution | ||
158 | HideSolutionNode = FALSE | ||
159 | EndGlobalSection | ||
121 | EndGlobal | 160 | EndGlobal |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index b6a3aa7..9b4ff5d 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj | |||
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>..\..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
diff --git a/prebuild.xml b/prebuild.xml index 41ded03..98ef888 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -132,7 +132,7 @@ | |||
132 | </Configuration> | 132 | </Configuration> |
133 | <Configuration name="Release"> | 133 | <Configuration name="Release"> |
134 | <Options> | 134 | <Options> |
135 | <OutputPath>../../bin/</OutputPath> | 135 | <OutputPath>../../../bin/</OutputPath> |
136 | </Options> | 136 | </Options> |
137 | </Configuration> | 137 | </Configuration> |
138 | 138 | ||
@@ -513,19 +513,19 @@ | |||
513 | 513 | ||
514 | 514 | ||
515 | <!-- OpenGrid Data Services --> | 515 | <!-- OpenGrid Data Services --> |
516 | <Project name="OpenGrid.Framework.Data" path="OpenGrid.Framework.Data" type="Library"> | 516 | <Project name="OpenGrid.Framework.Data" path="OpenGridServices/OpenGrid.Framework.Data" type="Library"> |
517 | <Configuration name="Debug"> | 517 | <Configuration name="Debug"> |
518 | <Options> | 518 | <Options> |
519 | <OutputPath>../bin/</OutputPath> | 519 | <OutputPath>../../bin/</OutputPath> |
520 | </Options> | 520 | </Options> |
521 | </Configuration> | 521 | </Configuration> |
522 | <Configuration name="Release"> | 522 | <Configuration name="Release"> |
523 | <Options> | 523 | <Options> |
524 | <OutputPath>../bin/</OutputPath> | 524 | <OutputPath>../../bin/</OutputPath> |
525 | </Options> | 525 | </Options> |
526 | </Configuration> | 526 | </Configuration> |
527 | 527 | ||
528 | <ReferencePath>../bin/</ReferencePath> | 528 | <ReferencePath>../../bin/</ReferencePath> |
529 | <Reference name="System" localCopy="false"/> | 529 | <Reference name="System" localCopy="false"/> |
530 | <Reference name="System.Xml"/> | 530 | <Reference name="System.Xml"/> |
531 | <Reference name="System.Data"/> | 531 | <Reference name="System.Data"/> |
@@ -535,19 +535,19 @@ | |||
535 | </Files> | 535 | </Files> |
536 | </Project> | 536 | </Project> |
537 | 537 | ||
538 | <Project name="OpenGrid.Framework.Data.MySQL" path="OpenGrid.Framework.Data.MySQL" type="Library"> | 538 | <Project name="OpenGrid.Framework.Data.MySQL" path="OpenGridServices/OpenGrid.Framework.Data.MySQL" type="Library"> |
539 | <Configuration name="Debug"> | 539 | <Configuration name="Debug"> |
540 | <Options> | 540 | <Options> |
541 | <OutputPath>../bin/</OutputPath> | 541 | <OutputPath>../../bin/</OutputPath> |
542 | </Options> | 542 | </Options> |
543 | </Configuration> | 543 | </Configuration> |
544 | <Configuration name="Release"> | 544 | <Configuration name="Release"> |
545 | <Options> | 545 | <Options> |
546 | <OutputPath>../bin/</OutputPath> | 546 | <OutputPath>../../bin/</OutputPath> |
547 | </Options> | 547 | </Options> |
548 | </Configuration> | 548 | </Configuration> |
549 | 549 | ||
550 | <ReferencePath>../bin/</ReferencePath> | 550 | <ReferencePath>../../bin/</ReferencePath> |
551 | <Reference name="System" localCopy="false"/> | 551 | <Reference name="System" localCopy="false"/> |
552 | <Reference name="System.Xml"/> | 552 | <Reference name="System.Xml"/> |
553 | <Reference name="System.Data"/> | 553 | <Reference name="System.Data"/> |
@@ -559,19 +559,19 @@ | |||
559 | </Files> | 559 | </Files> |
560 | </Project> | 560 | </Project> |
561 | 561 | ||
562 | <Project name="OpenGrid.Framework.Data.DB4o" path="OpenGrid.Framework.Data.DB4o" type="Library"> | 562 | <Project name="OpenGrid.Framework.Data.DB4o" path="OpenGridServices/OpenGrid.Framework.Data.DB4o" type="Library"> |
563 | <Configuration name="Debug"> | 563 | <Configuration name="Debug"> |
564 | <Options> | 564 | <Options> |
565 | <OutputPath>../bin/</OutputPath> | 565 | <OutputPath>../../bin/</OutputPath> |
566 | </Options> | 566 | </Options> |
567 | </Configuration> | 567 | </Configuration> |
568 | <Configuration name="Release"> | 568 | <Configuration name="Release"> |
569 | <Options> | 569 | <Options> |
570 | <OutputPath>../bin/</OutputPath> | 570 | <OutputPath>../../bin/</OutputPath> |
571 | </Options> | 571 | </Options> |
572 | </Configuration> | 572 | </Configuration> |
573 | 573 | ||
574 | <ReferencePath>../bin/</ReferencePath> | 574 | <ReferencePath>../../bin/</ReferencePath> |
575 | <Reference name="System" localCopy="false"/> | 575 | <Reference name="System" localCopy="false"/> |
576 | <Reference name="System.Xml"/> | 576 | <Reference name="System.Xml"/> |
577 | <Reference name="System.Data"/> | 577 | <Reference name="System.Data"/> |
@@ -583,19 +583,19 @@ | |||
583 | </Files> | 583 | </Files> |
584 | </Project> | 584 | </Project> |
585 | 585 | ||
586 | <Project name="OpenGrid.Framework.Data.MSSQL" path="OpenGrid.Framework.Data.MSSQL" type="Library"> | 586 | <Project name="OpenGrid.Framework.Data.MSSQL" path="OpenGridServices/OpenGrid.Framework.Data.MSSQL" type="Library"> |
587 | <Configuration name="Debug"> | 587 | <Configuration name="Debug"> |
588 | <Options> | 588 | <Options> |
589 | <OutputPath>../bin/</OutputPath> | 589 | <OutputPath>../../bin/</OutputPath> |
590 | </Options> | 590 | </Options> |
591 | </Configuration> | 591 | </Configuration> |
592 | <Configuration name="Release"> | 592 | <Configuration name="Release"> |
593 | <Options> | 593 | <Options> |
594 | <OutputPath>../bin/</OutputPath> | 594 | <OutputPath>../../bin/</OutputPath> |
595 | </Options> | 595 | </Options> |
596 | </Configuration> | 596 | </Configuration> |
597 | 597 | ||
598 | <ReferencePath>../bin/</ReferencePath> | 598 | <ReferencePath>../../bin/</ReferencePath> |
599 | <Reference name="System" localCopy="false"/> | 599 | <Reference name="System" localCopy="false"/> |
600 | <Reference name="System.Xml"/> | 600 | <Reference name="System.Xml"/> |
601 | <Reference name="System.Data"/> | 601 | <Reference name="System.Data"/> |
@@ -606,19 +606,19 @@ | |||
606 | </Files> | 606 | </Files> |
607 | </Project> | 607 | </Project> |
608 | 608 | ||
609 | <Project name="OpenGrid.Framework.Data.SQLite" path="OpenGrid.Framework.Data.SQLite" type="Library"> | 609 | <Project name="OpenGrid.Framework.Data.SQLite" path="OpenGridServices/OpenGrid.Framework.Data.SQLite" type="Library"> |
610 | <Configuration name="Debug"> | 610 | <Configuration name="Debug"> |
611 | <Options> | 611 | <Options> |
612 | <OutputPath>../bin/</OutputPath> | 612 | <OutputPath>../../bin/</OutputPath> |
613 | </Options> | 613 | </Options> |
614 | </Configuration> | 614 | </Configuration> |
615 | <Configuration name="Release"> | 615 | <Configuration name="Release"> |
616 | <Options> | 616 | <Options> |
617 | <OutputPath>../bin/</OutputPath> | 617 | <OutputPath>../../bin/</OutputPath> |
618 | </Options> | 618 | </Options> |
619 | </Configuration> | 619 | </Configuration> |
620 | 620 | ||
621 | <ReferencePath>../bin/</ReferencePath> | 621 | <ReferencePath>../../bin/</ReferencePath> |
622 | <Reference name="System" localCopy="false"/> | 622 | <Reference name="System" localCopy="false"/> |
623 | <Reference name="System.Xml"/> | 623 | <Reference name="System.Xml"/> |
624 | <Reference name="System.Data"/> | 624 | <Reference name="System.Data"/> |
@@ -632,19 +632,19 @@ | |||
632 | 632 | ||
633 | <!-- OGS projects --> | 633 | <!-- OGS projects --> |
634 | 634 | ||
635 | <Project name="OpenGrid.Framework.Manager" path="OpenGrid.Framework.Manager" type="Library"> | 635 | <Project name="OpenGrid.Framework.Manager" path="OpenGridServices/OpenGrid.Framework.Manager" type="Library"> |
636 | <Configuration name="Debug"> | 636 | <Configuration name="Debug"> |
637 | <Options> | 637 | <Options> |
638 | <OutputPath>../bin/</OutputPath> | 638 | <OutputPath>../../bin/</OutputPath> |
639 | </Options> | 639 | </Options> |
640 | </Configuration> | 640 | </Configuration> |
641 | <Configuration name="Release"> | 641 | <Configuration name="Release"> |
642 | <Options> | 642 | <Options> |
643 | <OutputPath>../bin/</OutputPath> | 643 | <OutputPath>../../bin/</OutputPath> |
644 | </Options> | 644 | </Options> |
645 | </Configuration> | 645 | </Configuration> |
646 | 646 | ||
647 | <ReferencePath>../bin/</ReferencePath> | 647 | <ReferencePath>../../bin/</ReferencePath> |
648 | <Reference name="System" localCopy="false"/> | 648 | <Reference name="System" localCopy="false"/> |
649 | <Reference name="OpenSim.Framework"/> | 649 | <Reference name="OpenSim.Framework"/> |
650 | <Reference name="OpenSim.Servers"/> | 650 | <Reference name="OpenSim.Servers"/> |
@@ -658,19 +658,19 @@ | |||
658 | </Project> | 658 | </Project> |
659 | 659 | ||
660 | 660 | ||
661 | <Project name="ServiceManager" path="ServiceManager" type="Exe"> | 661 | <Project name="ServiceManager" path="OpenGridServices/ServiceManager" type="Exe"> |
662 | <Configuration name="Debug"> | 662 | <Configuration name="Debug"> |
663 | <Options> | 663 | <Options> |
664 | <OutputPath>../bin/</OutputPath> | 664 | <OutputPath>../../bin/</OutputPath> |
665 | </Options> | 665 | </Options> |
666 | </Configuration> | 666 | </Configuration> |
667 | <Configuration name="Release"> | 667 | <Configuration name="Release"> |
668 | <Options> | 668 | <Options> |
669 | <OutputPath>../bin/</OutputPath> | 669 | <OutputPath>../../bin/</OutputPath> |
670 | </Options> | 670 | </Options> |
671 | </Configuration> | 671 | </Configuration> |
672 | 672 | ||
673 | <ReferencePath>../bin/</ReferencePath> | 673 | <ReferencePath>../../bin/</ReferencePath> |
674 | <Reference name="System" localCopy="false"/> | 674 | <Reference name="System" localCopy="false"/> |
675 | <Reference name="System.ServiceProcess" localCopy="false"/> | 675 | <Reference name="System.ServiceProcess" localCopy="false"/> |
676 | <Reference name="System.Xml" localCopy="false"/> | 676 | <Reference name="System.Xml" localCopy="false"/> |
@@ -681,19 +681,19 @@ | |||
681 | </Project> | 681 | </Project> |
682 | 682 | ||
683 | 683 | ||
684 | <Project name="OpenGridServices.GridServer" path="OpenGridServices.GridServer" type="Exe"> | 684 | <Project name="OpenGridServices.GridServer" path="OpenGridServices/OpenGridServices.GridServer" type="Exe"> |
685 | <Configuration name="Debug"> | 685 | <Configuration name="Debug"> |
686 | <Options> | 686 | <Options> |
687 | <OutputPath>../bin/</OutputPath> | 687 | <OutputPath>../../bin/</OutputPath> |
688 | </Options> | 688 | </Options> |
689 | </Configuration> | 689 | </Configuration> |
690 | <Configuration name="Release"> | 690 | <Configuration name="Release"> |
691 | <Options> | 691 | <Options> |
692 | <OutputPath>../bin/</OutputPath> | 692 | <OutputPath>../../bin/</OutputPath> |
693 | </Options> | 693 | </Options> |
694 | </Configuration> | 694 | </Configuration> |
695 | 695 | ||
696 | <ReferencePath>../bin/</ReferencePath> | 696 | <ReferencePath>../../bin/</ReferencePath> |
697 | <Reference name="System" localCopy="false"/> | 697 | <Reference name="System" localCopy="false"/> |
698 | <Reference name="System.Data" localCopy="false"/> | 698 | <Reference name="System.Data" localCopy="false"/> |
699 | <Reference name="System.Xml" localCopy="false"/> | 699 | <Reference name="System.Xml" localCopy="false"/> |
@@ -711,19 +711,19 @@ | |||
711 | </Files> | 711 | </Files> |
712 | </Project> | 712 | </Project> |
713 | 713 | ||
714 | <Project name="OpenGridServices.AssetServer" path="OpenGridServices.AssetServer" type="Exe"> | 714 | <Project name="OpenGridServices.AssetServer" path="OpenGridServices/OpenGridServices.AssetServer" type="Exe"> |
715 | <Configuration name="Debug"> | 715 | <Configuration name="Debug"> |
716 | <Options> | 716 | <Options> |
717 | <OutputPath>../bin/</OutputPath> | 717 | <OutputPath>../../bin/</OutputPath> |
718 | </Options> | 718 | </Options> |
719 | </Configuration> | 719 | </Configuration> |
720 | <Configuration name="Release"> | 720 | <Configuration name="Release"> |
721 | <Options> | 721 | <Options> |
722 | <OutputPath>../bin/</OutputPath> | 722 | <OutputPath>../../bin/</OutputPath> |
723 | </Options> | 723 | </Options> |
724 | </Configuration> | 724 | </Configuration> |
725 | 725 | ||
726 | <ReferencePath>../bin/</ReferencePath> | 726 | <ReferencePath>../../bin/</ReferencePath> |
727 | <Reference name="System" localCopy="false"/> | 727 | <Reference name="System" localCopy="false"/> |
728 | <Reference name="System.Data" localCopy="false"/> | 728 | <Reference name="System.Data" localCopy="false"/> |
729 | <Reference name="System.Xml" localCopy="false"/> | 729 | <Reference name="System.Xml" localCopy="false"/> |
@@ -740,19 +740,19 @@ | |||
740 | </Files> | 740 | </Files> |
741 | </Project> | 741 | </Project> |
742 | 742 | ||
743 | <Project name="OpenGridServices.UserServer" path="OpenGridServices.UserServer" type="Exe"> | 743 | <Project name="OpenGridServices.UserServer" path="OpenGridServices/OpenGridServices.UserServer" type="Exe"> |
744 | <Configuration name="Debug"> | 744 | <Configuration name="Debug"> |
745 | <Options> | 745 | <Options> |
746 | <OutputPath>../bin/</OutputPath> | 746 | <OutputPath>../../bin/</OutputPath> |
747 | </Options> | 747 | </Options> |
748 | </Configuration> | 748 | </Configuration> |
749 | <Configuration name="Release"> | 749 | <Configuration name="Release"> |
750 | <Options> | 750 | <Options> |
751 | <OutputPath>../bin/</OutputPath> | 751 | <OutputPath>../../bin/</OutputPath> |
752 | </Options> | 752 | </Options> |
753 | </Configuration> | 753 | </Configuration> |
754 | 754 | ||
755 | <ReferencePath>../bin/</ReferencePath> | 755 | <ReferencePath>../../bin/</ReferencePath> |
756 | <Reference name="System" localCopy="false"/> | 756 | <Reference name="System" localCopy="false"/> |
757 | <Reference name="System.Data" localCopy="false"/> | 757 | <Reference name="System.Data" localCopy="false"/> |
758 | <Reference name="System.Xml" localCopy="false"/> | 758 | <Reference name="System.Xml" localCopy="false"/> |
@@ -771,19 +771,19 @@ | |||
771 | 771 | ||
772 | 772 | ||
773 | 773 | ||
774 | <Project name="OpenGrid.Config.GridConfigDb4o" path="OpenGrid.Config/GridConfigDb4o" type="Library"> | 774 | <Project name="OpenGrid.Config.GridConfigDb4o" path="OpenGridServices/OpenGrid.Config/GridConfigDb4o" type="Library"> |
775 | <Configuration name="Debug"> | 775 | <Configuration name="Debug"> |
776 | <Options> | 776 | <Options> |
777 | <OutputPath>../../bin/</OutputPath> | 777 | <OutputPath>../../../bin/</OutputPath> |
778 | </Options> | 778 | </Options> |
779 | </Configuration> | 779 | </Configuration> |
780 | <Configuration name="Release"> | 780 | <Configuration name="Release"> |
781 | <Options> | 781 | <Options> |
782 | <OutputPath>../../bin/</OutputPath> | 782 | <OutputPath>../../../bin/</OutputPath> |
783 | </Options> | 783 | </Options> |
784 | </Configuration> | 784 | </Configuration> |
785 | 785 | ||
786 | <ReferencePath>../../bin/</ReferencePath> | 786 | <ReferencePath>../../../bin/</ReferencePath> |
787 | <Reference name="System" localCopy="false"/> | 787 | <Reference name="System" localCopy="false"/> |
788 | <Reference name="System.Data.dll"/> | 788 | <Reference name="System.Data.dll"/> |
789 | <Reference name="System.Xml"/> | 789 | <Reference name="System.Xml"/> |
@@ -796,19 +796,19 @@ | |||
796 | </Files> | 796 | </Files> |
797 | </Project> | 797 | </Project> |
798 | 798 | ||
799 | <Project name="OpenUser.Config.UserConfigDb4o" path="OpenUser.Config/UserConfigDb4o" type="Library"> | 799 | <Project name="OpenUser.Config.UserConfigDb4o" path="OpenGridServices/OpenUser.Config/UserConfigDb4o" type="Library"> |
800 | <Configuration name="Debug"> | 800 | <Configuration name="Debug"> |
801 | <Options> | 801 | <Options> |
802 | <OutputPath>../../bin/</OutputPath> | 802 | <OutputPath>../../../bin/</OutputPath> |
803 | </Options> | 803 | </Options> |
804 | </Configuration> | 804 | </Configuration> |
805 | <Configuration name="Release"> | 805 | <Configuration name="Release"> |
806 | <Options> | 806 | <Options> |
807 | <OutputPath>../../bin/</OutputPath> | 807 | <OutputPath>../../../bin/</OutputPath> |
808 | </Options> | 808 | </Options> |
809 | </Configuration> | 809 | </Configuration> |
810 | 810 | ||
811 | <ReferencePath>../../bin/</ReferencePath> | 811 | <ReferencePath>../../../bin/</ReferencePath> |
812 | <Reference name="System" localCopy="false"/> | 812 | <Reference name="System" localCopy="false"/> |
813 | <Reference name="System.Data.dll"/> | 813 | <Reference name="System.Data.dll"/> |
814 | <Reference name="System.Xml"/> | 814 | <Reference name="System.Xml"/> |