aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj25
-rw-r--r--OpenSim.Framework.Console/OpenSim.Framework.Console.csproj5
-rw-r--r--OpenSim.Framework/OpenSim.Framework.csproj15
-rw-r--r--OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj22
-rw-r--r--OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj19
-rw-r--r--OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj11
-rw-r--r--OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user12
-rw-r--r--OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj16
-rw-r--r--OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj46
-rw-r--r--OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj22
-rw-r--r--OpenSim.sln134
-rw-r--r--Prebuild/src/Core/Targets/VS2005Target.cs26
-rw-r--r--prebuild.xml20
13 files changed, 209 insertions, 164 deletions
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
index 02f626f..8cadd32 100644
--- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
+++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{C077B28B-2F8D-4BD9-8E47-84C51B3A7358}</ProjectGuid> 6 <ProjectGuid>{C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}</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></ApplicationIcon>
@@ -59,31 +59,38 @@
59 </PropertyGroup> 59 </PropertyGroup>
60 <ItemGroup> 60 <ItemGroup>
61 <Reference Include="System" > 61 <Reference Include="System" >
62 <HintPath>\System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
63 <Private>False</Private>
63 </Reference> 64 </Reference>
64 <Reference Include="System.Data.dll" > 65 <Reference Include="System.Data.dll" >
65 <HintPath>\System.Data.dll.dll</HintPath> 66 <HintPath>..\..\bin\System.Data.dll</HintPath>
67 <Private>False</Private>
66 </Reference> 68 </Reference>
67 <Reference Include="System.Xml.dll" > 69 <Reference Include="System.Xml" >
68 <HintPath>\System.Xml.dll.dll</HintPath> 70 <HintPath>System.Xml.dll</HintPath>
71 <Private>False</Private>
69 </Reference> 72 </Reference>
70 <Reference Include="libsecondlife.dll" > 73 <Reference Include="libsecondlife.dll" >
71 <HintPath>\libsecondlife.dll.dll</HintPath> 74 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
75 <Private>False</Private>
72 </Reference> 76 </Reference>
73 <Reference Include="Db4objects.Db4o.dll" > 77 <Reference Include="Db4objects.Db4o.dll" >
74 <HintPath>\Db4objects.Db4o.dll.dll</HintPath> 78 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
79 <Private>False</Private>
75 </Reference> 80 </Reference>
76 </ItemGroup> 81 </ItemGroup>
77 <ItemGroup> 82 <ItemGroup>
78 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> 83 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
79 <Name>OpenSim.Framework</Name> 84 <Name>OpenSim.Framework</Name>
80 <Project>{1D2865A9-CF8E-45F7-B96D-91ED128A32CF}</Project> 85 <Project>{08C84711-1498-461D-8081-02FDD06BBC4D}</Project>
81 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private>
82 </ProjectReference> 88 </ProjectReference>
83 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 89 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
84 <Name>OpenSim.Framework.Console</Name> 90 <Name>OpenSim.Framework.Console</Name>
85 <Project>{C8405E1A-EC19-48B6-9C8C-CA03624B9916}</Project> 91 <Project>{FCDE59EA-602A-4705-BBC1-A228522669E4}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private>
87 </ProjectReference> 94 </ProjectReference>
88 </ItemGroup> 95 </ItemGroup>
89 <ItemGroup> 96 <ItemGroup>
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
index 1f0da56..83ac6df 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{C8405E1A-EC19-48B6-9C8C-CA03624B9916}</ProjectGuid> 6 <ProjectGuid>{FCDE59EA-602A-4705-BBC1-A228522669E4}</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></ApplicationIcon>
@@ -59,7 +59,8 @@
59 </PropertyGroup> 59 </PropertyGroup>
60 <ItemGroup> 60 <ItemGroup>
61 <Reference Include="System" > 61 <Reference Include="System" >
62 <HintPath>\System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
63 <Private>False</Private>
63 </Reference> 64 </Reference>
64 </ItemGroup> 65 </ItemGroup>
65 <ItemGroup> 66 <ItemGroup>
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj
index 7a10319..eba0eb9 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim.Framework/OpenSim.Framework.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{1D2865A9-CF8E-45F7-B96D-91ED128A32CF}</ProjectGuid> 6 <ProjectGuid>{08C84711-1498-461D-8081-02FDD06BBC4D}</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></ApplicationIcon>
@@ -58,14 +58,17 @@
58 <NoWarn></NoWarn> 58 <NoWarn></NoWarn>
59 </PropertyGroup> 59 </PropertyGroup>
60 <ItemGroup> 60 <ItemGroup>
61 <Reference Include="System.dll" > 61 <Reference Include="System" >
62 <HintPath>\System.dll.dll</HintPath> 62 <HintPath>System.dll</HintPath>
63 <Private>False</Private>
63 </Reference> 64 </Reference>
64 <Reference Include="System.Xml.dll" > 65 <Reference Include="System.Xml" >
65 <HintPath>\System.Xml.dll.dll</HintPath> 66 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private>
66 </Reference> 68 </Reference>
67 <Reference Include="libsecondlife.dll" > 69 <Reference Include="libsecondlife.dll" >
68 <HintPath>\libsecondlife.dll.dll</HintPath> 70 <HintPath>..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private>
69 </Reference> 72 </Reference>
70 </ItemGroup> 73 </ItemGroup>
71 <ItemGroup> 74 <ItemGroup>
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
index b3318af..ca1a10d 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
+++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{FBF3DA4B-5176-4602-AA52-482D077EEC88}</ProjectGuid> 6 <ProjectGuid>{55452604-E7D6-4A66-85DD-A41E570C1CF2}</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></ApplicationIcon>
@@ -59,28 +59,34 @@
59 </PropertyGroup> 59 </PropertyGroup>
60 <ItemGroup> 60 <ItemGroup>
61 <Reference Include="System" > 61 <Reference Include="System" >
62 <HintPath>\System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
63 <Private>False</Private>
63 </Reference> 64 </Reference>
64 <Reference Include="System.Xml.dll" > 65 <Reference Include="System.Xml" >
65 <HintPath>\System.Xml.dll.dll</HintPath> 66 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private>
66 </Reference> 68 </Reference>
67 <Reference Include="Db4objects.Db4o.dll" > 69 <Reference Include="Db4objects.Db4o.dll" >
68 <HintPath>\Db4objects.Db4o.dll.dll</HintPath> 70 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
71 <Private>False</Private>
69 </Reference> 72 </Reference>
70 <Reference Include="libsecondlife.dll" > 73 <Reference Include="libsecondlife.dll" >
71 <HintPath>\libsecondlife.dll.dll</HintPath> 74 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
75 <Private>False</Private>
72 </Reference> 76 </Reference>
73 </ItemGroup> 77 </ItemGroup>
74 <ItemGroup> 78 <ItemGroup>
75 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> 79 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
76 <Name>OpenSim.Framework</Name> 80 <Name>OpenSim.Framework</Name>
77 <Project>{1D2865A9-CF8E-45F7-B96D-91ED128A32CF}</Project> 81 <Project>{08C84711-1498-461D-8081-02FDD06BBC4D}</Project>
78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
83 <Private>False</Private>
79 </ProjectReference> 84 </ProjectReference>
80 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 85 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
81 <Name>OpenSim.Framework.Console</Name> 86 <Name>OpenSim.Framework.Console</Name>
82 <Project>{C8405E1A-EC19-48B6-9C8C-CA03624B9916}</Project> 87 <Project>{FCDE59EA-602A-4705-BBC1-A228522669E4}</Project>
83 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
89 <Private>False</Private>
84 </ProjectReference> 90 </ProjectReference>
85 </ItemGroup> 91 </ItemGroup>
86 <ItemGroup> 92 <ItemGroup>
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
index 37d1d12..819fb8d 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
+++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{2AF1E37E-064D-4590-8D7E-B6390F721BAE}</ProjectGuid> 6 <ProjectGuid>{8A213DE7-B78F-4631-B232-D36B1B0BAE34}</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></ApplicationIcon>
@@ -59,25 +59,30 @@
59 </PropertyGroup> 59 </PropertyGroup>
60 <ItemGroup> 60 <ItemGroup>
61 <Reference Include="System" > 61 <Reference Include="System" >
62 <HintPath>\System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
63 <Private>False</Private>
63 </Reference> 64 </Reference>
64 <Reference Include="System.Xml.dll" > 65 <Reference Include="System.Xml" >
65 <HintPath>\System.Xml.dll.dll</HintPath> 66 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private>
66 </Reference> 68 </Reference>
67 <Reference Include="libsecondlife.dll" > 69 <Reference Include="libsecondlife.dll" >
68 <HintPath>\libsecondlife.dll.dll</HintPath> 70 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private>
69 </Reference> 72 </Reference>
70 </ItemGroup> 73 </ItemGroup>
71 <ItemGroup> 74 <ItemGroup>
72 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> 75 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
73 <Name>OpenSim.Framework</Name> 76 <Name>OpenSim.Framework</Name>
74 <Project>{1D2865A9-CF8E-45F7-B96D-91ED128A32CF}</Project> 77 <Project>{08C84711-1498-461D-8081-02FDD06BBC4D}</Project>
75 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
79 <Private>False</Private>
76 </ProjectReference> 80 </ProjectReference>
77 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 81 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
78 <Name>OpenSim.Framework.Console</Name> 82 <Name>OpenSim.Framework.Console</Name>
79 <Project>{C8405E1A-EC19-48B6-9C8C-CA03624B9916}</Project> 83 <Project>{FCDE59EA-602A-4705-BBC1-A228522669E4}</Project>
80 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 84 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
85 <Private>False</Private>
81 </ProjectReference> 86 </ProjectReference>
82 </ItemGroup> 87 </ItemGroup>
83 <ItemGroup> 88 <ItemGroup>
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
index dbfebd3..5fa02ed 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
+++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{00594B9E-29A5-4B9C-AEBD-0AD08C73CFE8}</ProjectGuid> 6 <ProjectGuid>{BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}</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></ApplicationIcon>
@@ -59,17 +59,20 @@
59 </PropertyGroup> 59 </PropertyGroup>
60 <ItemGroup> 60 <ItemGroup>
61 <Reference Include="System" > 61 <Reference Include="System" >
62 <HintPath>\System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
63 <Private>False</Private>
63 </Reference> 64 </Reference>
64 <Reference Include="Axiom.MathLib.dll" > 65 <Reference Include="Axiom.MathLib.dll" >
65 <HintPath>\Axiom.MathLib.dll.dll</HintPath> 66 <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
67 <Private>False</Private>
66 </Reference> 68 </Reference>
67 </ItemGroup> 69 </ItemGroup>
68 <ItemGroup> 70 <ItemGroup>
69 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> 71 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
70 <Name>OpenSim.Physics.Manager</Name> 72 <Name>OpenSim.Physics.Manager</Name>
71 <Project>{58360A80-9333-4E0F-8F83-3CF937E51633}</Project> 73 <Project>{FA317002-FFCB-4066-B107-FCCD5E313DE9}</Project>
72 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 74 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
75 <Private>False</Private>
73 </ProjectReference> 76 </ProjectReference>
74 </ItemGroup> 77 </ItemGroup>
75 <ItemGroup> 78 <ItemGroup>
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
deleted file mode 100644
index 13e65a8..0000000
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\Documents and Settings\Stefan\My Documents\Projects\source\opensim\branches\zircon\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
index 728686e..d13b9f0 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
+++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{58360A80-9333-4E0F-8F83-3CF937E51633}</ProjectGuid> 6 <ProjectGuid>{FA317002-FFCB-4066-B107-FCCD5E313DE9}</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></ApplicationIcon>
@@ -59,20 +59,24 @@
59 </PropertyGroup> 59 </PropertyGroup>
60 <ItemGroup> 60 <ItemGroup>
61 <Reference Include="System" > 61 <Reference Include="System" >
62 <HintPath>\System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
63 <Private>False</Private>
63 </Reference> 64 </Reference>
64 <Reference Include="System.Xml.dll" > 65 <Reference Include="System.Xml" >
65 <HintPath>\System.Xml.dll.dll</HintPath> 66 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private>
66 </Reference> 68 </Reference>
67 <Reference Include="Axiom.MathLib.dll" > 69 <Reference Include="Axiom.MathLib.dll" >
68 <HintPath>\Axiom.MathLib.dll.dll</HintPath> 70 <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
71 <Private>False</Private>
69 </Reference> 72 </Reference>
70 </ItemGroup> 73 </ItemGroup>
71 <ItemGroup> 74 <ItemGroup>
72 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 75 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
73 <Name>OpenSim.Framework.Console</Name> 76 <Name>OpenSim.Framework.Console</Name>
74 <Project>{C8405E1A-EC19-48B6-9C8C-CA03624B9916}</Project> 77 <Project>{FCDE59EA-602A-4705-BBC1-A228522669E4}</Project>
75 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
79 <Private>False</Private>
76 </ProjectReference> 80 </ProjectReference>
77 </ItemGroup> 81 </ItemGroup>
78 <ItemGroup> 82 <ItemGroup>
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
index db310e9..1cdd46f 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
@@ -1,13 +1,12 @@
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>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{CBE1E31D-D7E3-4791-A616-F00173BBC26A}</ProjectGuid> 6 <ProjectGuid>{40308959-8EF3-4818-8CE6-47C158CFBD34}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenSim.Physics.PhysXPlugin</AssemblyName> 12 <AssemblyName>OpenSim.Physics.PhysXPlugin</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenSim.Physics.PhysXPlugin</RootNamespace> 19 <RootNamespace>OpenSim.Physics.PhysXPlugin</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,26 +55,28 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="PhysX_Wrapper_Dotnet, Version=1.0.2628.28883, Culture=neutral, processorArchitecture=MSIL"> 61 <Reference Include="System" >
69 <SpecificVersion>False</SpecificVersion> 62 <HintPath>System.dll</HintPath>
70 <HintPath>..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System"> 65 <Reference Include="Axiom.MathLib.dll" >
73 <HintPath>\System.dll</HintPath> 66 <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
67 <Private>False</Private>
74 </Reference> 68 </Reference>
75 <Reference Include="Axiom.MathLib.dll"> 69 <Reference Include="PhysX_Wrapper_Dotnet.dll" >
76 <HintPath>\Axiom.MathLib.dll.dll</HintPath> 70 <HintPath>..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath>
71 <Private>False</Private>
77 </Reference> 72 </Reference>
78 </ItemGroup> 73 </ItemGroup>
79 <ItemGroup> 74 <ItemGroup>
80 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> 75 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
81 <Name>OpenSim.Physics.Manager</Name> 76 <Name>OpenSim.Physics.Manager</Name>
82 <Project>{58360A80-9333-4E0F-8F83-3CF937E51633}</Project> 77 <Project>{FA317002-FFCB-4066-B107-FCCD5E313DE9}</Project>
83 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
79 <Private>False</Private>
84 </ProjectReference> 80 </ProjectReference>
85 </ItemGroup> 81 </ItemGroup>
86 <ItemGroup> 82 <ItemGroup>
@@ -98,4 +94,4 @@
98 <PostBuildEvent> 94 <PostBuildEvent>
99 </PostBuildEvent> 95 </PostBuildEvent>
100 </PropertyGroup> 96 </PropertyGroup>
101</Project> \ No newline at end of file 97</Project>
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 5c2ffa5..db4074d 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{2B5E9FF0-DE71-41DA-AC6A-B8E2D2D0AE09}</ProjectGuid> 6 <ProjectGuid>{498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}</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></ApplicationIcon>
@@ -59,28 +59,34 @@
59 </PropertyGroup> 59 </PropertyGroup>
60 <ItemGroup> 60 <ItemGroup>
61 <Reference Include="System" > 61 <Reference Include="System" >
62 <HintPath>\System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
63 <Private>False</Private>
63 </Reference> 64 </Reference>
64 <Reference Include="System.Xml.dll" > 65 <Reference Include="System.Xml" >
65 <HintPath>\System.Xml.dll.dll</HintPath> 66 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private>
66 </Reference> 68 </Reference>
67 <Reference Include="Db4objects.Db4o.dll" > 69 <Reference Include="Db4objects.Db4o.dll" >
68 <HintPath>\Db4objects.Db4o.dll.dll</HintPath> 70 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
71 <Private>False</Private>
69 </Reference> 72 </Reference>
70 <Reference Include="libsecondlife.dll" > 73 <Reference Include="libsecondlife.dll" >
71 <HintPath>\libsecondlife.dll.dll</HintPath> 74 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
75 <Private>False</Private>
72 </Reference> 76 </Reference>
73 </ItemGroup> 77 </ItemGroup>
74 <ItemGroup> 78 <ItemGroup>
75 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> 79 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
76 <Name>OpenSim.Framework</Name> 80 <Name>OpenSim.Framework</Name>
77 <Project>{1D2865A9-CF8E-45F7-B96D-91ED128A32CF}</Project> 81 <Project>{08C84711-1498-461D-8081-02FDD06BBC4D}</Project>
78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
83 <Private>False</Private>
79 </ProjectReference> 84 </ProjectReference>
80 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 85 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
81 <Name>OpenSim.Framework.Console</Name> 86 <Name>OpenSim.Framework.Console</Name>
82 <Project>{C8405E1A-EC19-48B6-9C8C-CA03624B9916}</Project> 87 <Project>{FCDE59EA-602A-4705-BBC1-A228522669E4}</Project>
83 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
89 <Private>False</Private>
84 </ProjectReference> 90 </ProjectReference>
85 </ItemGroup> 91 </ItemGroup>
86 <ItemGroup> 92 <ItemGroup>
diff --git a/OpenSim.sln b/OpenSim.sln
index c64c145..a92e45d 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,73 +1,89 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual Studio 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{CBE1E31D-D7E3-4791-A616-F00173BBC26A}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{40308959-8EF3-4818-8CE6-47C158CFBD34}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{C8405E1A-EC19-48B6-9C8C-CA03624B9916}" 5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{FCDE59EA-602A-4705-BBC1-A228522669E4}"
6EndProject 6EndProject
7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C077B28B-2F8D-4BD9-8E47-84C51B3A7358}" 7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}"
8EndProject 8EndProject
9Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{00594B9E-29A5-4B9C-AEBD-0AD08C73CFE8}" 9Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}"
10EndProject 10EndProject
11Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{2AF1E37E-064D-4590-8D7E-B6390F721BAE}" 11Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{8A213DE7-B78F-4631-B232-D36B1B0BAE34}"
12EndProject 12EndProject
13Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{2B5E9FF0-DE71-41DA-AC6A-B8E2D2D0AE09}" 13Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}"
14EndProject 14EndProject
15Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{1D2865A9-CF8E-45F7-B96D-91ED128A32CF}" 15Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{08C84711-1498-461D-8081-02FDD06BBC4D}"
16EndProject 16EndProject
17Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{B48F0D82-2DE5-42B0-9F1D-0F4353FA243A}" 17Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{FA317002-FFCB-4066-B107-FCCD5E313DE9}"
18EndProject 18EndProject
19Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{58360A80-9333-4E0F-8F83-3CF937E51633}" 19Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{55452604-E7D6-4A66-85DD-A41E570C1CF2}"
20EndProject 20EndProject
21Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{FBF3DA4B-5176-4602-AA52-482D077EEC88}" 21Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim.RegionServer\OpenSim.csproj", "{50D8594C-39E2-4695-B28D-AC8ADE15BC5A}"
22EndProject 22EndProject
23Global 23Global
24 GlobalSection(SolutionConfigurationPlatforms) = preSolution 24 GlobalSection(SolutionConfigurationPlatforms) = preSolution
25 Debug|Any CPU = Debug|Any CPU 25 Debug|Any CPU = Debug|Any CPU
26 Release|Any CPU = Release|Any CPU 26 Release|Any CPU = Release|Any CPU
27 EndGlobalSection 27 EndGlobalSection
28 GlobalSection(ProjectConfigurationPlatforms) = postSolution 28 GlobalSection(ProjectDependencies) = postSolution
29 {CBE1E31D-D7E3-4791-A616-F00173BBC26A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 29 ({40308959-8EF3-4818-8CE6-47C158CFBD34}).3 = ({FA317002-FFCB-4066-B107-FCCD5E313DE9})
30 {CBE1E31D-D7E3-4791-A616-F00173BBC26A}.Debug|Any CPU.Build.0 = Debug|Any CPU 30 ({C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}).5 = ({08C84711-1498-461D-8081-02FDD06BBC4D})
31 {CBE1E31D-D7E3-4791-A616-F00173BBC26A}.Release|Any CPU.ActiveCfg = Release|Any CPU 31 ({C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}).6 = ({FCDE59EA-602A-4705-BBC1-A228522669E4})
32 {CBE1E31D-D7E3-4791-A616-F00173BBC26A}.Release|Any CPU.Build.0 = Release|Any CPU 32 ({BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}).2 = ({FA317002-FFCB-4066-B107-FCCD5E313DE9})
33 {C8405E1A-EC19-48B6-9C8C-CA03624B9916}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 33 ({8A213DE7-B78F-4631-B232-D36B1B0BAE34}).3 = ({08C84711-1498-461D-8081-02FDD06BBC4D})
34 {C8405E1A-EC19-48B6-9C8C-CA03624B9916}.Debug|Any CPU.Build.0 = Debug|Any CPU 34 ({8A213DE7-B78F-4631-B232-D36B1B0BAE34}).4 = ({FCDE59EA-602A-4705-BBC1-A228522669E4})
35 {C8405E1A-EC19-48B6-9C8C-CA03624B9916}.Release|Any CPU.ActiveCfg = Release|Any CPU 35 ({498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}).4 = ({08C84711-1498-461D-8081-02FDD06BBC4D})
36 {C8405E1A-EC19-48B6-9C8C-CA03624B9916}.Release|Any CPU.Build.0 = Release|Any CPU 36 ({498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}).5 = ({FCDE59EA-602A-4705-BBC1-A228522669E4})
37 {C077B28B-2F8D-4BD9-8E47-84C51B3A7358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 37 ({FA317002-FFCB-4066-B107-FCCD5E313DE9}).3 = ({FCDE59EA-602A-4705-BBC1-A228522669E4})
38 {C077B28B-2F8D-4BD9-8E47-84C51B3A7358}.Debug|Any CPU.Build.0 = Debug|Any CPU 38 ({55452604-E7D6-4A66-85DD-A41E570C1CF2}).4 = ({08C84711-1498-461D-8081-02FDD06BBC4D})
39 {C077B28B-2F8D-4BD9-8E47-84C51B3A7358}.Release|Any CPU.ActiveCfg = Release|Any CPU 39 ({55452604-E7D6-4A66-85DD-A41E570C1CF2}).5 = ({FCDE59EA-602A-4705-BBC1-A228522669E4})
40 {C077B28B-2F8D-4BD9-8E47-84C51B3A7358}.Release|Any CPU.Build.0 = Release|Any CPU 40 ({50D8594C-39E2-4695-B28D-AC8ADE15BC5A}).5 = ({FCDE59EA-602A-4705-BBC1-A228522669E4})
41 {00594B9E-29A5-4B9C-AEBD-0AD08C73CFE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 41 ({50D8594C-39E2-4695-B28D-AC8ADE15BC5A}).6 = ({FA317002-FFCB-4066-B107-FCCD5E313DE9})
42 {00594B9E-29A5-4B9C-AEBD-0AD08C73CFE8}.Debug|Any CPU.Build.0 = Debug|Any CPU 42 ({50D8594C-39E2-4695-B28D-AC8ADE15BC5A}).7 = ({08C84711-1498-461D-8081-02FDD06BBC4D})
43 {00594B9E-29A5-4B9C-AEBD-0AD08C73CFE8}.Release|Any CPU.ActiveCfg = Release|Any CPU 43 EndGlobalSection
44 {00594B9E-29A5-4B9C-AEBD-0AD08C73CFE8}.Release|Any CPU.Build.0 = Release|Any CPU 44 GlobalSection(ProjectConfigurationPlatforms) = postSolution
45 {2AF1E37E-064D-4590-8D7E-B6390F721BAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 45 {40308959-8EF3-4818-8CE6-47C158CFBD34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46 {2AF1E37E-064D-4590-8D7E-B6390F721BAE}.Debug|Any CPU.Build.0 = Debug|Any CPU 46 {40308959-8EF3-4818-8CE6-47C158CFBD34}.Debug|Any CPU.Build.0 = Debug|Any CPU
47 {2AF1E37E-064D-4590-8D7E-B6390F721BAE}.Release|Any CPU.ActiveCfg = Release|Any CPU 47 {40308959-8EF3-4818-8CE6-47C158CFBD34}.Release|Any CPU.ActiveCfg = Release|Any CPU
48 {2AF1E37E-064D-4590-8D7E-B6390F721BAE}.Release|Any CPU.Build.0 = Release|Any CPU 48 {40308959-8EF3-4818-8CE6-47C158CFBD34}.Release|Any CPU.Build.0 = Release|Any CPU
49 {2B5E9FF0-DE71-41DA-AC6A-B8E2D2D0AE09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 49 {FCDE59EA-602A-4705-BBC1-A228522669E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50 {2B5E9FF0-DE71-41DA-AC6A-B8E2D2D0AE09}.Debug|Any CPU.Build.0 = Debug|Any CPU 50 {FCDE59EA-602A-4705-BBC1-A228522669E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
51 {2B5E9FF0-DE71-41DA-AC6A-B8E2D2D0AE09}.Release|Any CPU.ActiveCfg = Release|Any CPU 51 {FCDE59EA-602A-4705-BBC1-A228522669E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
52 {2B5E9FF0-DE71-41DA-AC6A-B8E2D2D0AE09}.Release|Any CPU.Build.0 = Release|Any CPU 52 {FCDE59EA-602A-4705-BBC1-A228522669E4}.Release|Any CPU.Build.0 = Release|Any CPU
53 {1D2865A9-CF8E-45F7-B96D-91ED128A32CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 53 {C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54 {1D2865A9-CF8E-45F7-B96D-91ED128A32CF}.Debug|Any CPU.Build.0 = Debug|Any CPU 54 {C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}.Debug|Any CPU.Build.0 = Debug|Any CPU
55 {1D2865A9-CF8E-45F7-B96D-91ED128A32CF}.Release|Any CPU.ActiveCfg = Release|Any CPU 55 {C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}.Release|Any CPU.ActiveCfg = Release|Any CPU
56 {1D2865A9-CF8E-45F7-B96D-91ED128A32CF}.Release|Any CPU.Build.0 = Release|Any CPU 56 {C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}.Release|Any CPU.Build.0 = Release|Any CPU
57 {B48F0D82-2DE5-42B0-9F1D-0F4353FA243A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 57 {BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58 {B48F0D82-2DE5-42B0-9F1D-0F4353FA243A}.Debug|Any CPU.Build.0 = Debug|Any CPU 58 {BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
59 {B48F0D82-2DE5-42B0-9F1D-0F4353FA243A}.Release|Any CPU.ActiveCfg = Release|Any CPU 59 {BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
60 {B48F0D82-2DE5-42B0-9F1D-0F4353FA243A}.Release|Any CPU.Build.0 = Release|Any CPU 60 {BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}.Release|Any CPU.Build.0 = Release|Any CPU
61 {58360A80-9333-4E0F-8F83-3CF937E51633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 61 {8A213DE7-B78F-4631-B232-D36B1B0BAE34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62 {58360A80-9333-4E0F-8F83-3CF937E51633}.Debug|Any CPU.Build.0 = Debug|Any CPU 62 {8A213DE7-B78F-4631-B232-D36B1B0BAE34}.Debug|Any CPU.Build.0 = Debug|Any CPU
63 {58360A80-9333-4E0F-8F83-3CF937E51633}.Release|Any CPU.ActiveCfg = Release|Any CPU 63 {8A213DE7-B78F-4631-B232-D36B1B0BAE34}.Release|Any CPU.ActiveCfg = Release|Any CPU
64 {58360A80-9333-4E0F-8F83-3CF937E51633}.Release|Any CPU.Build.0 = Release|Any CPU 64 {8A213DE7-B78F-4631-B232-D36B1B0BAE34}.Release|Any CPU.Build.0 = Release|Any CPU
65 {FBF3DA4B-5176-4602-AA52-482D077EEC88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 65 {498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66 {FBF3DA4B-5176-4602-AA52-482D077EEC88}.Debug|Any CPU.Build.0 = Debug|Any CPU 66 {498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
67 {FBF3DA4B-5176-4602-AA52-482D077EEC88}.Release|Any CPU.ActiveCfg = Release|Any CPU 67 {498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}.Release|Any CPU.ActiveCfg = Release|Any CPU
68 {FBF3DA4B-5176-4602-AA52-482D077EEC88}.Release|Any CPU.Build.0 = Release|Any CPU 68 {498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}.Release|Any CPU.Build.0 = Release|Any CPU
69 EndGlobalSection 69 {08C84711-1498-461D-8081-02FDD06BBC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70 GlobalSection(SolutionProperties) = preSolution 70 {08C84711-1498-461D-8081-02FDD06BBC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
71 HideSolutionNode = FALSE 71 {08C84711-1498-461D-8081-02FDD06BBC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
72 EndGlobalSection 72 {08C84711-1498-461D-8081-02FDD06BBC4D}.Release|Any CPU.Build.0 = Release|Any CPU
73 {FA317002-FFCB-4066-B107-FCCD5E313DE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74 {FA317002-FFCB-4066-B107-FCCD5E313DE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
75 {FA317002-FFCB-4066-B107-FCCD5E313DE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
76 {FA317002-FFCB-4066-B107-FCCD5E313DE9}.Release|Any CPU.Build.0 = Release|Any CPU
77 {55452604-E7D6-4A66-85DD-A41E570C1CF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78 {55452604-E7D6-4A66-85DD-A41E570C1CF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
79 {55452604-E7D6-4A66-85DD-A41E570C1CF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
80 {55452604-E7D6-4A66-85DD-A41E570C1CF2}.Release|Any CPU.Build.0 = Release|Any CPU
81 {50D8594C-39E2-4695-B28D-AC8ADE15BC5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
82 {50D8594C-39E2-4695-B28D-AC8ADE15BC5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
83 {50D8594C-39E2-4695-B28D-AC8ADE15BC5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
84 {50D8594C-39E2-4695-B28D-AC8ADE15BC5A}.Release|Any CPU.Build.0 = Release|Any CPU
85 EndGlobalSection
86 GlobalSection(SolutionProperties) = preSolution
87 HideSolutionNode = FALSE
88 EndGlobalSection
73EndGlobal 89EndGlobal
diff --git a/Prebuild/src/Core/Targets/VS2005Target.cs b/Prebuild/src/Core/Targets/VS2005Target.cs
index 3cfc8cd..341c12a 100644
--- a/Prebuild/src/Core/Targets/VS2005Target.cs
+++ b/Prebuild/src/Core/Targets/VS2005Target.cs
@@ -458,6 +458,8 @@ namespace Prebuild.Core.Targets
458 458
459 // Assembly References 459 // Assembly References
460 ps.WriteLine(" <ItemGroup>"); 460 ps.WriteLine(" <ItemGroup>");
461 string refPath = ((ReferencePathNode) project.ReferencePaths[0]).Path;
462
461 foreach (ReferenceNode refr in project.References) 463 foreach (ReferenceNode refr in project.References)
462 { 464 {
463 if (!solution.ProjectsTable.ContainsKey(refr.Name)) 465 if (!solution.ProjectsTable.ContainsKey(refr.Name))
@@ -466,16 +468,21 @@ namespace Prebuild.Core.Targets
466 ps.Write(" Include=\""); 468 ps.Write(" Include=\"");
467 ps.Write(refr.Name); 469 ps.Write(refr.Name);
468 470
469 if (!string.IsNullOrEmpty(refr.Version))
470 {
471 ps.Write(", Version=");
472 ps.Write(refr.Version);
473 }
474
475 ps.WriteLine("\" >"); 471 ps.WriteLine("\" >");
476 472
473 string path;
474
475 if( refr.Name.EndsWith(".dll", StringComparison.InvariantCultureIgnoreCase ))
476 {
477 path = Helper.NormalizePath(Path.Combine( refPath, refr.Name), '\\');
478 }
479 else
480 {
481 path = refr.Name + ".dll";
482 }
483
477 // TODO: Allow reference to *.exe files 484 // TODO: Allow reference to *.exe files
478 ps.WriteLine(" <HintPath>{0}</HintPath>", Helper.MakePathRelativeTo(project.FullPath, refr.Path + "\\" + refr.Name + ".dll")); 485 ps.WriteLine(" <HintPath>{0}</HintPath>", path );
479 ps.WriteLine(" <Private>{0}</Private>", refr.LocalCopy); 486 ps.WriteLine(" <Private>{0}</Private>", refr.LocalCopy);
480 ps.WriteLine(" </Reference>"); 487 ps.WriteLine(" </Reference>");
481 } 488 }
@@ -490,7 +497,10 @@ namespace Prebuild.Core.Targets
490 { 497 {
491 ProjectNode refProject = (ProjectNode)solution.ProjectsTable[refr.Name]; 498 ProjectNode refProject = (ProjectNode)solution.ProjectsTable[refr.Name];
492 // TODO: Allow reference to visual basic projects 499 // TODO: Allow reference to visual basic projects
493 ps.WriteLine(" <ProjectReference Include=\"{0}\">", Helper.MakePathRelativeTo(project.FullPath, Helper.MakeFilePath(refProject.FullPath, refProject.Name, "csproj"))); 500 string path =
501 Helper.MakePathRelativeTo(project.FullPath,
502 Helper.MakeFilePath(refProject.FullPath, refProject.Name, "csproj"));
503 ps.WriteLine(" <ProjectReference Include=\"{0}\">", path );
494 //<ProjectReference Include="..\..\RealmForge\Utility\RealmForge.Utility.csproj"> 504 //<ProjectReference Include="..\..\RealmForge\Utility\RealmForge.Utility.csproj">
495 ps.WriteLine(" <Name>{0}</Name>", refProject.Name); 505 ps.WriteLine(" <Name>{0}</Name>", refProject.Name);
496 // <Name>RealmForge.Utility</Name> 506 // <Name>RealmForge.Utility</Name>
diff --git a/prebuild.xml b/prebuild.xml
index 37bef06..2ac874f 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -47,8 +47,8 @@
47 </Configuration> 47 </Configuration>
48 48
49 <ReferencePath>../bin/</ReferencePath> 49 <ReferencePath>../bin/</ReferencePath>
50 <Reference name="System.dll"/> 50 <Reference name="System"/>
51 <Reference name="System.Xml.dll"/> 51 <Reference name="System.Xml"/>
52 <Reference name="libsecondlife.dll"/> 52 <Reference name="libsecondlife.dll"/>
53 <Files> 53 <Files>
54 <Match pattern="*.cs" recurse="true"/> 54 <Match pattern="*.cs" recurse="true"/>
@@ -88,7 +88,7 @@
88 88
89 <ReferencePath>../../bin/</ReferencePath> 89 <ReferencePath>../../bin/</ReferencePath>
90 <Reference name="System" localCopy="false"/> 90 <Reference name="System" localCopy="false"/>
91 <Reference name="System.Xml.dll" localCopy="false" /> 91 <Reference name="System.Xml" localCopy="false" />
92 <Reference name="Axiom.MathLib.dll" localCopy="false"/> 92 <Reference name="Axiom.MathLib.dll" localCopy="false"/>
93 <Reference name="OpenSim.Framework.Console" localCopy="false"/> 93 <Reference name="OpenSim.Framework.Console" localCopy="false"/>
94 <Files> 94 <Files>
@@ -112,7 +112,7 @@
112 <ReferencePath>../../bin/</ReferencePath> 112 <ReferencePath>../../bin/</ReferencePath>
113 <Reference name="System" localCopy="false"/> 113 <Reference name="System" localCopy="false"/>
114 <Reference name="System.Data.dll"/> 114 <Reference name="System.Data.dll"/>
115 <Reference name="System.Xml.dll"/> 115 <Reference name="System.Xml"/>
116 <Reference name="libsecondlife.dll"/> 116 <Reference name="libsecondlife.dll"/>
117 <Reference name="Db4objects.Db4o.dll"/> 117 <Reference name="Db4objects.Db4o.dll"/>
118 <Reference name="OpenSim.Framework"/> 118 <Reference name="OpenSim.Framework"/>
@@ -137,7 +137,7 @@
137 137
138 <ReferencePath>../../bin/</ReferencePath> 138 <ReferencePath>../../bin/</ReferencePath>
139 <Reference name="System" localCopy="false"/> 139 <Reference name="System" localCopy="false"/>
140 <Reference name="System.Xml.dll"/> 140 <Reference name="System.Xml"/>
141 <Reference name="Db4objects.Db4o.dll"/> 141 <Reference name="Db4objects.Db4o.dll"/>
142 <Reference name="libsecondlife.dll"/> 142 <Reference name="libsecondlife.dll"/>
143 <Reference name="OpenSim.Framework"/> 143 <Reference name="OpenSim.Framework"/>
@@ -161,7 +161,7 @@
161 161
162 <ReferencePath>../../bin/</ReferencePath> 162 <ReferencePath>../../bin/</ReferencePath>
163 <Reference name="System" localCopy="false"/> 163 <Reference name="System" localCopy="false"/>
164 <Reference name="System.Xml.dll"/> 164 <Reference name="System.Xml"/>
165 <Reference name="libsecondlife.dll"/> 165 <Reference name="libsecondlife.dll"/>
166 <Reference name="OpenSim.Framework"/> 166 <Reference name="OpenSim.Framework"/>
167 <Reference name="OpenSim.Framework.Console"/> 167 <Reference name="OpenSim.Framework.Console"/>
@@ -229,7 +229,7 @@
229 229
230 <ReferencePath>../bin/</ReferencePath> 230 <ReferencePath>../bin/</ReferencePath>
231 <Reference name="System" localCopy="false"/> 231 <Reference name="System" localCopy="false"/>
232 <Reference name="System.Xml.dll"/> 232 <Reference name="System.Xml"/>
233 <Reference name="libsecondlife.dll"/> 233 <Reference name="libsecondlife.dll"/>
234 <Reference name="Axiom.MathLib.dll"/> 234 <Reference name="Axiom.MathLib.dll"/>
235 <Reference name="Db4objects.Db4o.dll"/> 235 <Reference name="Db4objects.Db4o.dll"/>
@@ -257,7 +257,7 @@
257 257
258 <ReferencePath>../../bin/</ReferencePath> 258 <ReferencePath>../../bin/</ReferencePath>
259 <Reference name="System" localCopy="false"/> 259 <Reference name="System" localCopy="false"/>
260 <Reference name="System.Xml.dll"/> 260 <Reference name="System.Xml"/>
261 <Reference name="Db4objects.Db4o.dll"/> 261 <Reference name="Db4objects.Db4o.dll"/>
262 <Reference name="libsecondlife.dll"/> 262 <Reference name="libsecondlife.dll"/>
263 <Reference name="OpenSim.Framework"/> 263 <Reference name="OpenSim.Framework"/>
@@ -277,7 +277,7 @@
277 277
278 278
279 <!-- Prebuild tool --> 279 <!-- Prebuild tool -->
280 <Solution name="Prebuild" path="./Prebuild/" > 280 <!-- Solution name="Prebuild" path="./Prebuild/" >
281 <Configuration name="Debug"> 281 <Configuration name="Debug">
282 <Options> 282 <Options>
283 <CompilerDefines>DEBUG;TRACE</CompilerDefines> 283 <CompilerDefines>DEBUG;TRACE</CompilerDefines>
@@ -330,7 +330,7 @@
330 <Match pattern="*.cs" recurse="true"/> 330 <Match pattern="*.cs" recurse="true"/>
331 </Files> 331 </Files>
332 </Project> 332 </Project>
333 </Solution> 333 </Solution -->
334</Prebuild> 334</Prebuild>
335 335
336 336
generated by cgit v1.1 at 2024-11-07 07:44:15 +0000