diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj')
-rw-r--r-- | OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj | 147 |
1 files changed, 92 insertions, 55 deletions
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj index 481b3f8..9618c08 100644 --- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj +++ b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj | |||
@@ -1,62 +1,99 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
3 | <PropertyGroup> | 3 | <PropertyGroup> |
4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
5 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 5 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
6 | <ProductVersion>9.0.30729</ProductVersion> | 6 | <ProductVersion>9.0.30729</ProductVersion> |
7 | <SchemaVersion>2.0</SchemaVersion> | 7 | <SchemaVersion>2.0</SchemaVersion> |
8 | <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid> | 8 | <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid> |
9 | <OutputType>Exe</OutputType> | 9 | <OutputType>Exe</OutputType> |
10 | <AppDesignerFolder>Properties</AppDesignerFolder> | 10 | <AppDesignerFolder>Properties</AppDesignerFolder> |
11 | <RootNamespace>Robust._32BitLaunch</RootNamespace> | 11 | <RootNamespace>Robust._32BitLaunch</RootNamespace> |
12 | <AssemblyName>Robust.32BitLaunch</AssemblyName> | 12 | <AssemblyName>Robust.32BitLaunch</AssemblyName> |
13 | <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> | 13 | <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> |
14 | <FileAlignment>512</FileAlignment> | 14 | <FileAlignment>512</FileAlignment> |
15 | </PropertyGroup> | 15 | <FileUpgradeFlags> |
16 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 16 | </FileUpgradeFlags> |
17 | <DebugSymbols>true</DebugSymbols> | 17 | <UpgradeBackupLocation> |
18 | <DebugType>full</DebugType> | 18 | </UpgradeBackupLocation> |
19 | <Optimize>false</Optimize> | 19 | <OldToolsVersion>3.5</OldToolsVersion> |
20 | <OutputPath>..\..\..\bin\</OutputPath> | 20 | <PublishUrl>publish\</PublishUrl> |
21 | <DefineConstants>DEBUG;TRACE</DefineConstants> | 21 | <Install>true</Install> |
22 | <ErrorReport>prompt</ErrorReport> | 22 | <InstallFrom>Disk</InstallFrom> |
23 | <WarningLevel>4</WarningLevel> | 23 | <UpdateEnabled>false</UpdateEnabled> |
24 | <PlatformTarget>x86</PlatformTarget> | 24 | <UpdateMode>Foreground</UpdateMode> |
25 | </PropertyGroup> | 25 | <UpdateInterval>7</UpdateInterval> |
26 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 26 | <UpdateIntervalUnits>Days</UpdateIntervalUnits> |
27 | <DebugType>pdbonly</DebugType> | 27 | <UpdatePeriodically>false</UpdatePeriodically> |
28 | <Optimize>true</Optimize> | 28 | <UpdateRequired>false</UpdateRequired> |
29 | <OutputPath>bin\Release\</OutputPath> | 29 | <MapFileExtensions>true</MapFileExtensions> |
30 | <DefineConstants>TRACE</DefineConstants> | 30 | <ApplicationRevision>0</ApplicationRevision> |
31 | <ErrorReport>prompt</ErrorReport> | 31 | <ApplicationVersion>1.0.0.%2a</ApplicationVersion> |
32 | <WarningLevel>4</WarningLevel> | 32 | <IsWebBootstrapper>false</IsWebBootstrapper> |
33 | </PropertyGroup> | 33 | <UseApplicationTrust>false</UseApplicationTrust> |
34 | <ItemGroup> | 34 | <BootstrapperEnabled>true</BootstrapperEnabled> |
35 | <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> | 35 | </PropertyGroup> |
36 | <SpecificVersion>False</SpecificVersion> | 36 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
37 | <HintPath>..\..\..\bin\log4net.dll</HintPath> | 37 | <DebugSymbols>true</DebugSymbols> |
38 | </Reference> | 38 | <DebugType>full</DebugType> |
39 | <Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | 39 | <Optimize>false</Optimize> |
40 | <SpecificVersion>False</SpecificVersion> | 40 | <OutputPath>..\..\..\bin\</OutputPath> |
41 | <HintPath>..\..\..\bin\Robust.exe</HintPath> | 41 | <DefineConstants>DEBUG;TRACE</DefineConstants> |
42 | </Reference> | 42 | <ErrorReport>prompt</ErrorReport> |
43 | <Reference Include="System" /> | 43 | <WarningLevel>4</WarningLevel> |
44 | <Reference Include="System.Core"> | 44 | <PlatformTarget>x86</PlatformTarget> |
45 | <RequiredTargetFramework>3.5</RequiredTargetFramework> | 45 | </PropertyGroup> |
46 | </Reference> | 46 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
47 | <Reference Include="System.Data" /> | 47 | <DebugType>pdbonly</DebugType> |
48 | <Reference Include="System.Xml" /> | 48 | <Optimize>true</Optimize> |
49 | </ItemGroup> | 49 | <OutputPath>bin\Release\</OutputPath> |
50 | <ItemGroup> | 50 | <DefineConstants>TRACE</DefineConstants> |
51 | <Compile Include="Program.cs" /> | 51 | <ErrorReport>prompt</ErrorReport> |
52 | <Compile Include="Properties\AssemblyInfo.cs" /> | 52 | <WarningLevel>4</WarningLevel> |
53 | </ItemGroup> | 53 | </PropertyGroup> |
54 | <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | 54 | <ItemGroup> |
55 | <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> | ||
56 | <SpecificVersion>False</SpecificVersion> | ||
57 | <HintPath>..\..\..\bin\log4net.dll</HintPath> | ||
58 | </Reference> | ||
59 | <Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
60 | <SpecificVersion>False</SpecificVersion> | ||
61 | <HintPath>..\..\..\bin\Robust.exe</HintPath> | ||
62 | </Reference> | ||
63 | <Reference Include="System" /> | ||
64 | </ItemGroup> | ||
65 | <ItemGroup> | ||
66 | <Compile Include="Program.cs" /> | ||
67 | <Compile Include="Properties\AssemblyInfo.cs" /> | ||
68 | </ItemGroup> | ||
69 | <ItemGroup> | ||
70 | <BootstrapperPackage Include=".NETFramework,Version=v4.0"> | ||
71 | <Visible>False</Visible> | ||
72 | <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName> | ||
73 | <Install>true</Install> | ||
74 | </BootstrapperPackage> | ||
75 | <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> | ||
76 | <Visible>False</Visible> | ||
77 | <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> | ||
78 | <Install>false</Install> | ||
79 | </BootstrapperPackage> | ||
80 | <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> | ||
81 | <Visible>False</Visible> | ||
82 | <ProductName>.NET Framework 3.5 SP1</ProductName> | ||
83 | <Install>false</Install> | ||
84 | </BootstrapperPackage> | ||
85 | <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1"> | ||
86 | <Visible>False</Visible> | ||
87 | <ProductName>Windows Installer 3.1</ProductName> | ||
88 | <Install>true</Install> | ||
89 | </BootstrapperPackage> | ||
90 | </ItemGroup> | ||
91 | <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
55 | <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | 92 | <!-- To modify your build process, add your task inside one of the targets below and uncomment it. |
56 | Other similar extension points exist, see Microsoft.Common.targets. | 93 | Other similar extension points exist, see Microsoft.Common.targets. |
57 | <Target Name="BeforeBuild"> | 94 | <Target Name="BeforeBuild"> |
58 | </Target> | 95 | </Target> |
59 | <Target Name="AfterBuild"> | 96 | <Target Name="AfterBuild"> |
60 | </Target> | 97 | </Target> |
61 | --> | 98 | --> |
62 | </Project> \ No newline at end of file | 99 | </Project> \ No newline at end of file |