diff options
author | MW | 2007-05-15 15:05:13 +0000 |
---|---|---|
committer | MW | 2007-05-15 15:05:13 +0000 |
commit | db6427b6f4709d86c5bf1e4711ff2be0f65e5875 (patch) | |
tree | ea9d6f366436594f543c1d5b50c522dcfdb3b5e4 /ServiceManager | |
parent | updated Build/project files to include the new projects and new files. (diff) | |
download | opensim-SC_OLD-db6427b6f4709d86c5bf1e4711ff2be0f65e5875.zip opensim-SC_OLD-db6427b6f4709d86c5bf1e4711ff2be0f65e5875.tar.gz opensim-SC_OLD-db6427b6f4709d86c5bf1e4711ff2be0f65e5875.tar.bz2 opensim-SC_OLD-db6427b6f4709d86c5bf1e4711ff2be0f65e5875.tar.xz |
Turned SimClient into a partial class (and added SimClient(Grid), so that grid mode specific code can be kept separate)
Fixed the ServiceManager project (added reference to System.Xml to its project in prebuil.xml)
Diffstat (limited to 'ServiceManager')
-rw-r--r-- | ServiceManager/ServiceManager.csproj | 35 | ||||
-rw-r--r-- | ServiceManager/ServiceManager.exe.build | 1 |
2 files changed, 24 insertions, 12 deletions
diff --git a/ServiceManager/ServiceManager.csproj b/ServiceManager/ServiceManager.csproj index 8e3b110..ac118c3 100644 --- a/ServiceManager/ServiceManager.csproj +++ b/ServiceManager/ServiceManager.csproj | |||
@@ -1,4 +1,4 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
@@ -6,7 +6,8 @@ | |||
6 | <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon> |
10 | </ApplicationIcon> | ||
10 | <AssemblyKeyContainerName> | 11 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 12 | </AssemblyKeyContainerName> |
12 | <AssemblyName>ServiceManager</AssemblyName> | 13 | <AssemblyName>ServiceManager</AssemblyName> |
@@ -15,9 +16,11 @@ | |||
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 17 | <DelaySign>false</DelaySign> |
17 | <OutputType>Exe</OutputType> | 18 | <OutputType>Exe</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 19 | <AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
19 | <RootNamespace>ServiceManager</RootNamespace> | 21 | <RootNamespace>ServiceManager</RootNamespace> |
20 | <StartupObject></StartupObject> | 22 | <StartupObject> |
23 | </StartupObject> | ||
21 | <FileUpgradeFlags> | 24 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 25 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 26 | </PropertyGroup> |
@@ -28,7 +31,8 @@ | |||
28 | <ConfigurationOverrideFile> | 31 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 32 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 33 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 34 | <DocumentationFile> |
35 | </DocumentationFile> | ||
32 | <DebugSymbols>True</DebugSymbols> | 36 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 37 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 38 | <Optimize>False</Optimize> |
@@ -37,7 +41,8 @@ | |||
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 43 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 44 | <NoWarn> |
45 | </NoWarn> | ||
41 | </PropertyGroup> | 46 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -46,7 +51,8 @@ | |||
46 | <ConfigurationOverrideFile> | 51 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 52 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 53 | <DefineConstants>TRACE</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 54 | <DocumentationFile> |
55 | </DocumentationFile> | ||
50 | <DebugSymbols>False</DebugSymbols> | 56 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 57 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 58 | <Optimize>True</Optimize> |
@@ -55,23 +61,28 @@ | |||
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 63 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 64 | <NoWarn> |
65 | </NoWarn> | ||
59 | </PropertyGroup> | 66 | </PropertyGroup> |
60 | <ItemGroup> | 67 | <ItemGroup> |
61 | <Reference Include="System" > | 68 | <Reference Include="System"> |
62 | <HintPath>System.dll</HintPath> | 69 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 70 | <Private>False</Private> |
64 | </Reference> | 71 | </Reference> |
65 | <Reference Include="System.ServiceProcess" > | 72 | <Reference Include="System.ServiceProcess"> |
66 | <HintPath>System.ServiceProcess.dll</HintPath> | 73 | <HintPath>System.ServiceProcess.dll</HintPath> |
67 | <Private>False</Private> | 74 | <Private>False</Private> |
68 | </Reference> | 75 | </Reference> |
76 | <Reference Include="System.Xml"> | ||
77 | <HintPath>System.Xml.dll</HintPath> | ||
78 | <Private>False</Private> | ||
79 | </Reference> | ||
69 | </ItemGroup> | 80 | </ItemGroup> |
70 | <ItemGroup> | 81 | <ItemGroup> |
71 | </ItemGroup> | 82 | </ItemGroup> |
72 | <ItemGroup> | 83 | <ItemGroup> |
73 | <Compile Include="ServiceManager.cs"> | 84 | <Compile Include="ServiceManager.cs"> |
74 | <SubType>Code</SubType> | 85 | <SubType>Component</SubType> |
75 | </Compile> | 86 | </Compile> |
76 | </ItemGroup> | 87 | </ItemGroup> |
77 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 88 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
@@ -81,4 +92,4 @@ | |||
81 | <PostBuildEvent> | 92 | <PostBuildEvent> |
82 | </PostBuildEvent> | 93 | </PostBuildEvent> |
83 | </PropertyGroup> | 94 | </PropertyGroup> |
84 | </Project> | 95 | </Project> \ No newline at end of file |
diff --git a/ServiceManager/ServiceManager.exe.build b/ServiceManager/ServiceManager.exe.build index df7ecdd..7397f49 100644 --- a/ServiceManager/ServiceManager.exe.build +++ b/ServiceManager/ServiceManager.exe.build | |||
@@ -20,6 +20,7 @@ | |||
20 | </lib> | 20 | </lib> |
21 | <include name="System.dll" /> | 21 | <include name="System.dll" /> |
22 | <include name="System.ServiceProcess.dll" /> | 22 | <include name="System.ServiceProcess.dll" /> |
23 | <include name="System.Xml.dll" /> | ||
23 | </references> | 24 | </references> |
24 | </csc> | 25 | </csc> |
25 | <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/" /> |