From 96a6da15f677d1364ab25ebaaae78329db25d7a3 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Fri, 23 Mar 2007 13:57:34 +0000 Subject: * Hopefully got vs2005 target to gen refs correctly --- .../OpenSim.Config.SimConfigDb4o.csproj | 25 ++-- .../OpenSim.Framework.Console.csproj | 5 +- OpenSim.Framework/OpenSim.Framework.csproj | 15 ++- .../Local/OpenSim.GridInterfaces.Local.csproj | 22 ++-- .../Remote/OpenSim.GridInterfaces.Remote.csproj | 19 +-- .../OpenSim.Physics.BasicPhysicsPlugin.csproj | 11 +- .../OpenSim.Physics.BasicPhysicsPlugin.csproj.user | 12 -- .../Manager/OpenSim.Physics.Manager.csproj | 16 ++- .../PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj | 46 ++++--- .../OpenSim.Storage.LocalStorageDb4o.csproj | 22 ++-- OpenSim.sln | 134 ++++++++++++--------- Prebuild/src/Core/Targets/VS2005Target.cs | 26 ++-- prebuild.xml | 20 +-- 13 files changed, 209 insertions(+), 164 deletions(-) delete mode 100644 OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user 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 @@ Local 8.0.50727 2.0 - {C077B28B-2F8D-4BD9-8E47-84C51B3A7358} + {C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648} Debug AnyCPU @@ -59,31 +59,38 @@ - \System.dll + System.dll + False - \System.Data.dll.dll + ..\..\bin\System.Data.dll + False - - \System.Xml.dll.dll + + System.Xml.dll + False - \libsecondlife.dll.dll + ..\..\bin\libsecondlife.dll + False - \Db4objects.Db4o.dll.dll + ..\..\bin\Db4objects.Db4o.dll + False OpenSim.Framework - {1D2865A9-CF8E-45F7-B96D-91ED128A32CF} + {08C84711-1498-461D-8081-02FDD06BBC4D} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False OpenSim.Framework.Console - {C8405E1A-EC19-48B6-9C8C-CA03624B9916} + {FCDE59EA-602A-4705-BBC1-A228522669E4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False 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 @@ Local 8.0.50727 2.0 - {C8405E1A-EC19-48B6-9C8C-CA03624B9916} + {FCDE59EA-602A-4705-BBC1-A228522669E4} Debug AnyCPU @@ -59,7 +59,8 @@ - \System.dll + System.dll + False 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 @@ Local 8.0.50727 2.0 - {1D2865A9-CF8E-45F7-B96D-91ED128A32CF} + {08C84711-1498-461D-8081-02FDD06BBC4D} Debug AnyCPU @@ -58,14 +58,17 @@ - - \System.dll.dll + + System.dll + False - - \System.Xml.dll.dll + + System.Xml.dll + False - \libsecondlife.dll.dll + ..\bin\libsecondlife.dll + False 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 @@ Local 8.0.50727 2.0 - {FBF3DA4B-5176-4602-AA52-482D077EEC88} + {55452604-E7D6-4A66-85DD-A41E570C1CF2} Debug AnyCPU @@ -59,28 +59,34 @@ - \System.dll + System.dll + False - - \System.Xml.dll.dll + + System.Xml.dll + False - \Db4objects.Db4o.dll.dll + ..\..\bin\Db4objects.Db4o.dll + False - \libsecondlife.dll.dll + ..\..\bin\libsecondlife.dll + False OpenSim.Framework - {1D2865A9-CF8E-45F7-B96D-91ED128A32CF} + {08C84711-1498-461D-8081-02FDD06BBC4D} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False OpenSim.Framework.Console - {C8405E1A-EC19-48B6-9C8C-CA03624B9916} + {FCDE59EA-602A-4705-BBC1-A228522669E4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False 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 @@ Local 8.0.50727 2.0 - {2AF1E37E-064D-4590-8D7E-B6390F721BAE} + {8A213DE7-B78F-4631-B232-D36B1B0BAE34} Debug AnyCPU @@ -59,25 +59,30 @@ - \System.dll + System.dll + False - - \System.Xml.dll.dll + + System.Xml.dll + False - \libsecondlife.dll.dll + ..\..\bin\libsecondlife.dll + False OpenSim.Framework - {1D2865A9-CF8E-45F7-B96D-91ED128A32CF} + {08C84711-1498-461D-8081-02FDD06BBC4D} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False OpenSim.Framework.Console - {C8405E1A-EC19-48B6-9C8C-CA03624B9916} + {FCDE59EA-602A-4705-BBC1-A228522669E4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False 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 @@ Local 8.0.50727 2.0 - {00594B9E-29A5-4B9C-AEBD-0AD08C73CFE8} + {BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2} Debug AnyCPU @@ -59,17 +59,20 @@ - \System.dll + System.dll + False - \Axiom.MathLib.dll.dll + ..\..\bin\Axiom.MathLib.dll + False OpenSim.Physics.Manager - {58360A80-9333-4E0F-8F83-3CF937E51633} + {FA317002-FFCB-4066-B107-FCCD5E313DE9} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False 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 @@ - - - Debug - AnyCPU - C:\Documents and Settings\Stefan\My Documents\Projects\source\opensim\branches\zircon\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - 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 @@ Local 8.0.50727 2.0 - {58360A80-9333-4E0F-8F83-3CF937E51633} + {FA317002-FFCB-4066-B107-FCCD5E313DE9} Debug AnyCPU @@ -59,20 +59,24 @@ - \System.dll + System.dll + False - - \System.Xml.dll.dll + + System.Xml.dll + False - \Axiom.MathLib.dll.dll + ..\..\bin\Axiom.MathLib.dll + False OpenSim.Framework.Console - {C8405E1A-EC19-48B6-9C8C-CA03624B9916} + {FCDE59EA-602A-4705-BBC1-A228522669E4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False 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 @@ - + Local 8.0.50727 2.0 - {CBE1E31D-D7E3-4791-A616-F00173BBC26A} + {40308959-8EF3-4818-8CE6-47C158CFBD34} Debug AnyCPU - - + OpenSim.Physics.PhysXPlugin @@ -16,11 +15,9 @@ IE50 false Library - - + OpenSim.Physics.PhysXPlugin - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,26 +55,28 @@ False False 4 - - + - - False - ..\..\bin\PhysX_Wrapper_Dotnet.dll + + System.dll + False - - \System.dll + + ..\..\bin\Axiom.MathLib.dll + False - - \Axiom.MathLib.dll.dll + + ..\..\bin\PhysX_Wrapper_Dotnet.dll + False OpenSim.Physics.Manager - {58360A80-9333-4E0F-8F83-3CF937E51633} + {FA317002-FFCB-4066-B107-FCCD5E313DE9} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False @@ -98,4 +94,4 @@ - \ No newline at end of file + 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 @@ Local 8.0.50727 2.0 - {2B5E9FF0-DE71-41DA-AC6A-B8E2D2D0AE09} + {498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68} Debug AnyCPU @@ -59,28 +59,34 @@ - \System.dll + System.dll + False - - \System.Xml.dll.dll + + System.Xml.dll + False - \Db4objects.Db4o.dll.dll + ..\..\bin\Db4objects.Db4o.dll + False - \libsecondlife.dll.dll + ..\..\bin\libsecondlife.dll + False OpenSim.Framework - {1D2865A9-CF8E-45F7-B96D-91ED128A32CF} + {08C84711-1498-461D-8081-02FDD06BBC4D} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False OpenSim.Framework.Console - {C8405E1A-EC19-48B6-9C8C-CA03624B9916} + {FCDE59EA-602A-4705-BBC1-A228522669E4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False diff --git a/OpenSim.sln b/OpenSim.sln index c64c145..a92e45d 100644 --- a/OpenSim.sln +++ b/OpenSim.sln @@ -1,73 +1,89 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{CBE1E31D-D7E3-4791-A616-F00173BBC26A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{40308959-8EF3-4818-8CE6-47C158CFBD34}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{C8405E1A-EC19-48B6-9C8C-CA03624B9916}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{FCDE59EA-602A-4705-BBC1-A228522669E4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C077B28B-2F8D-4BD9-8E47-84C51B3A7358}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{00594B9E-29A5-4B9C-AEBD-0AD08C73CFE8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{2AF1E37E-064D-4590-8D7E-B6390F721BAE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{8A213DE7-B78F-4631-B232-D36B1B0BAE34}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{2B5E9FF0-DE71-41DA-AC6A-B8E2D2D0AE09}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{1D2865A9-CF8E-45F7-B96D-91ED128A32CF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{08C84711-1498-461D-8081-02FDD06BBC4D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{B48F0D82-2DE5-42B0-9F1D-0F4353FA243A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{FA317002-FFCB-4066-B107-FCCD5E313DE9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{58360A80-9333-4E0F-8F83-3CF937E51633}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{55452604-E7D6-4A66-85DD-A41E570C1CF2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{FBF3DA4B-5176-4602-AA52-482D077EEC88}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim.RegionServer\OpenSim.csproj", "{50D8594C-39E2-4695-B28D-AC8ADE15BC5A}" EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CBE1E31D-D7E3-4791-A616-F00173BBC26A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBE1E31D-D7E3-4791-A616-F00173BBC26A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBE1E31D-D7E3-4791-A616-F00173BBC26A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBE1E31D-D7E3-4791-A616-F00173BBC26A}.Release|Any CPU.Build.0 = Release|Any CPU - {C8405E1A-EC19-48B6-9C8C-CA03624B9916}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8405E1A-EC19-48B6-9C8C-CA03624B9916}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8405E1A-EC19-48B6-9C8C-CA03624B9916}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8405E1A-EC19-48B6-9C8C-CA03624B9916}.Release|Any CPU.Build.0 = Release|Any CPU - {C077B28B-2F8D-4BD9-8E47-84C51B3A7358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C077B28B-2F8D-4BD9-8E47-84C51B3A7358}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C077B28B-2F8D-4BD9-8E47-84C51B3A7358}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C077B28B-2F8D-4BD9-8E47-84C51B3A7358}.Release|Any CPU.Build.0 = Release|Any CPU - {00594B9E-29A5-4B9C-AEBD-0AD08C73CFE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00594B9E-29A5-4B9C-AEBD-0AD08C73CFE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00594B9E-29A5-4B9C-AEBD-0AD08C73CFE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00594B9E-29A5-4B9C-AEBD-0AD08C73CFE8}.Release|Any CPU.Build.0 = Release|Any CPU - {2AF1E37E-064D-4590-8D7E-B6390F721BAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2AF1E37E-064D-4590-8D7E-B6390F721BAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2AF1E37E-064D-4590-8D7E-B6390F721BAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2AF1E37E-064D-4590-8D7E-B6390F721BAE}.Release|Any CPU.Build.0 = Release|Any CPU - {2B5E9FF0-DE71-41DA-AC6A-B8E2D2D0AE09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B5E9FF0-DE71-41DA-AC6A-B8E2D2D0AE09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B5E9FF0-DE71-41DA-AC6A-B8E2D2D0AE09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B5E9FF0-DE71-41DA-AC6A-B8E2D2D0AE09}.Release|Any CPU.Build.0 = Release|Any CPU - {1D2865A9-CF8E-45F7-B96D-91ED128A32CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D2865A9-CF8E-45F7-B96D-91ED128A32CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D2865A9-CF8E-45F7-B96D-91ED128A32CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D2865A9-CF8E-45F7-B96D-91ED128A32CF}.Release|Any CPU.Build.0 = Release|Any CPU - {B48F0D82-2DE5-42B0-9F1D-0F4353FA243A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B48F0D82-2DE5-42B0-9F1D-0F4353FA243A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B48F0D82-2DE5-42B0-9F1D-0F4353FA243A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B48F0D82-2DE5-42B0-9F1D-0F4353FA243A}.Release|Any CPU.Build.0 = Release|Any CPU - {58360A80-9333-4E0F-8F83-3CF937E51633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58360A80-9333-4E0F-8F83-3CF937E51633}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58360A80-9333-4E0F-8F83-3CF937E51633}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58360A80-9333-4E0F-8F83-3CF937E51633}.Release|Any CPU.Build.0 = Release|Any CPU - {FBF3DA4B-5176-4602-AA52-482D077EEC88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBF3DA4B-5176-4602-AA52-482D077EEC88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBF3DA4B-5176-4602-AA52-482D077EEC88}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBF3DA4B-5176-4602-AA52-482D077EEC88}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + ({40308959-8EF3-4818-8CE6-47C158CFBD34}).3 = ({FA317002-FFCB-4066-B107-FCCD5E313DE9}) + ({C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}).5 = ({08C84711-1498-461D-8081-02FDD06BBC4D}) + ({C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}).6 = ({FCDE59EA-602A-4705-BBC1-A228522669E4}) + ({BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}).2 = ({FA317002-FFCB-4066-B107-FCCD5E313DE9}) + ({8A213DE7-B78F-4631-B232-D36B1B0BAE34}).3 = ({08C84711-1498-461D-8081-02FDD06BBC4D}) + ({8A213DE7-B78F-4631-B232-D36B1B0BAE34}).4 = ({FCDE59EA-602A-4705-BBC1-A228522669E4}) + ({498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}).4 = ({08C84711-1498-461D-8081-02FDD06BBC4D}) + ({498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}).5 = ({FCDE59EA-602A-4705-BBC1-A228522669E4}) + ({FA317002-FFCB-4066-B107-FCCD5E313DE9}).3 = ({FCDE59EA-602A-4705-BBC1-A228522669E4}) + ({55452604-E7D6-4A66-85DD-A41E570C1CF2}).4 = ({08C84711-1498-461D-8081-02FDD06BBC4D}) + ({55452604-E7D6-4A66-85DD-A41E570C1CF2}).5 = ({FCDE59EA-602A-4705-BBC1-A228522669E4}) + ({50D8594C-39E2-4695-B28D-AC8ADE15BC5A}).5 = ({FCDE59EA-602A-4705-BBC1-A228522669E4}) + ({50D8594C-39E2-4695-B28D-AC8ADE15BC5A}).6 = ({FA317002-FFCB-4066-B107-FCCD5E313DE9}) + ({50D8594C-39E2-4695-B28D-AC8ADE15BC5A}).7 = ({08C84711-1498-461D-8081-02FDD06BBC4D}) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {40308959-8EF3-4818-8CE6-47C158CFBD34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {40308959-8EF3-4818-8CE6-47C158CFBD34}.Debug|Any CPU.Build.0 = Debug|Any CPU + {40308959-8EF3-4818-8CE6-47C158CFBD34}.Release|Any CPU.ActiveCfg = Release|Any CPU + {40308959-8EF3-4818-8CE6-47C158CFBD34}.Release|Any CPU.Build.0 = Release|Any CPU + {FCDE59EA-602A-4705-BBC1-A228522669E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FCDE59EA-602A-4705-BBC1-A228522669E4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FCDE59EA-602A-4705-BBC1-A228522669E4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FCDE59EA-602A-4705-BBC1-A228522669E4}.Release|Any CPU.Build.0 = Release|Any CPU + {C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C8A6D58C-E2CD-4AA7-BD04-B1DBBF8BA648}.Release|Any CPU.Build.0 = Release|Any CPU + {BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}.Release|Any CPU.Build.0 = Release|Any CPU + {8A213DE7-B78F-4631-B232-D36B1B0BAE34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A213DE7-B78F-4631-B232-D36B1B0BAE34}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A213DE7-B78F-4631-B232-D36B1B0BAE34}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A213DE7-B78F-4631-B232-D36B1B0BAE34}.Release|Any CPU.Build.0 = Release|Any CPU + {498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}.Debug|Any CPU.Build.0 = Debug|Any CPU + {498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}.Release|Any CPU.ActiveCfg = Release|Any CPU + {498EDDA3-B51E-4AC1-8B40-26C4AD0D9C68}.Release|Any CPU.Build.0 = Release|Any CPU + {08C84711-1498-461D-8081-02FDD06BBC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08C84711-1498-461D-8081-02FDD06BBC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08C84711-1498-461D-8081-02FDD06BBC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08C84711-1498-461D-8081-02FDD06BBC4D}.Release|Any CPU.Build.0 = Release|Any CPU + {FA317002-FFCB-4066-B107-FCCD5E313DE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA317002-FFCB-4066-B107-FCCD5E313DE9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA317002-FFCB-4066-B107-FCCD5E313DE9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA317002-FFCB-4066-B107-FCCD5E313DE9}.Release|Any CPU.Build.0 = Release|Any CPU + {55452604-E7D6-4A66-85DD-A41E570C1CF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {55452604-E7D6-4A66-85DD-A41E570C1CF2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {55452604-E7D6-4A66-85DD-A41E570C1CF2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {55452604-E7D6-4A66-85DD-A41E570C1CF2}.Release|Any CPU.Build.0 = Release|Any CPU + {50D8594C-39E2-4695-B28D-AC8ADE15BC5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50D8594C-39E2-4695-B28D-AC8ADE15BC5A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50D8594C-39E2-4695-B28D-AC8ADE15BC5A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50D8594C-39E2-4695-B28D-AC8ADE15BC5A}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal 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 // Assembly References ps.WriteLine(" "); + string refPath = ((ReferencePathNode) project.ReferencePaths[0]).Path; + foreach (ReferenceNode refr in project.References) { if (!solution.ProjectsTable.ContainsKey(refr.Name)) @@ -466,16 +468,21 @@ namespace Prebuild.Core.Targets ps.Write(" Include=\""); ps.Write(refr.Name); - if (!string.IsNullOrEmpty(refr.Version)) - { - ps.Write(", Version="); - ps.Write(refr.Version); - } - ps.WriteLine("\" >"); + string path; + + if( refr.Name.EndsWith(".dll", StringComparison.InvariantCultureIgnoreCase )) + { + path = Helper.NormalizePath(Path.Combine( refPath, refr.Name), '\\'); + } + else + { + path = refr.Name + ".dll"; + } + // TODO: Allow reference to *.exe files - ps.WriteLine(" {0}", Helper.MakePathRelativeTo(project.FullPath, refr.Path + "\\" + refr.Name + ".dll")); + ps.WriteLine(" {0}", path ); ps.WriteLine(" {0}", refr.LocalCopy); ps.WriteLine(" "); } @@ -490,7 +497,10 @@ namespace Prebuild.Core.Targets { ProjectNode refProject = (ProjectNode)solution.ProjectsTable[refr.Name]; // TODO: Allow reference to visual basic projects - ps.WriteLine(" ", Helper.MakePathRelativeTo(project.FullPath, Helper.MakeFilePath(refProject.FullPath, refProject.Name, "csproj"))); + string path = + Helper.MakePathRelativeTo(project.FullPath, + Helper.MakeFilePath(refProject.FullPath, refProject.Name, "csproj")); + ps.WriteLine(" ", path ); // ps.WriteLine(" {0}", refProject.Name); // RealmForge.Utility diff --git a/prebuild.xml b/prebuild.xml index 37bef06..2ac874f 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -47,8 +47,8 @@ ../bin/ - - + + @@ -88,7 +88,7 @@ ../../bin/ - + @@ -112,7 +112,7 @@ ../../bin/ - + @@ -137,7 +137,7 @@ ../../bin/ - + @@ -161,7 +161,7 @@ ../../bin/ - + @@ -229,7 +229,7 @@ ../bin/ - + @@ -257,7 +257,7 @@ ../../bin/ - + @@ -277,7 +277,7 @@ - + -- cgit v1.1