3 files changed, 28 insertions, 31 deletions

diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index 0f35f18..5505224 100644
--- a/Prebuild/Prebuild.sln
+++ b/Prebuild/Prebuild.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 9.00

 # Visual Studio 2005

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}"

 EndProject

 Global

   GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -8,10 +8,10 @@ Global
     Release|Any CPU = Release|Any CPU

   EndGlobalSection

   GlobalSection(ProjectConfigurationPlatforms) = postSolution

-    {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release|Any CPU.Build.0 = Release|Any CPU

+    {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+    {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.Build.0 = Debug|Any CPU

+    {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.ActiveCfg = Release|Any CPU

+    {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.Build.0 = Release|Any CPU

   EndGlobalSection

   GlobalSection(SolutionProperties) = preSolution

     HideSolutionNode = FALSE

diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs
index 0f0deb2..bd366dc 100644
--- a/Prebuild/src/Core/Targets/NAntTarget.cs
+++ b/Prebuild/src/Core/Targets/NAntTarget.cs
@@ -77,16 +77,16 @@ namespace Prebuild.Core.Targets
                         return tmpPath;

                 }

 

-                private static string BuildReference(SolutionNode solution, ProjectNode currentProject, ReferenceNode refr)

+                private static string BuildReference(SolutionNode solution, ReferenceNode refr)

                 {

                         string ret = "";

                         if(solution.ProjectsTable.ContainsKey(refr.Name))

                         {

-                                ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];

-

-                string finalPath = Helper.NormalizePath(((ReferencePathNode)currentProject.ReferencePaths[0]).Path + refr.Name + ".dll", '/');

-                                

-                                return finalPath;

+                                ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];                           

+                                string fileRef = FindFileReference(refr.Name, project);

+                                string finalPath = Helper.NormalizePath(Helper.MakeFilePath(project.FullPath + "/${build.dir}/", refr.Name, "dll"), '/');

+                                ret += finalPath;

+                                return ret;

                         }

                         else

                         {

@@ -126,11 +126,12 @@ namespace Prebuild.Core.Targets
                         string ret = "";

                         if(solution.ProjectsTable.ContainsKey(refr.Name))

                         {

-                                ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];

-                string finalPath = Helper.NormalizePath(((ReferencePathNode)project.ReferencePaths[0]).Path, '/');

-

-                return finalPath;

-            }

+                                ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];                           

+                                string fileRef = FindFileReference(refr.Name, project);

+                                string finalPath = Helper.NormalizePath(Helper.MakeReferencePath(project.FullPath + "/${build.dir}/"), '/');

+                                ret += finalPath;

+                                return ret;

+                        }

                         else

                         {

                                 ProjectNode project = (ProjectNode)refr.Parent;

@@ -225,7 +226,7 @@ namespace Prebuild.Core.Targets
                                 {

                                         if (refr.LocalCopy)

                                         {

-                                                ss.WriteLine("                <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr))+"\" />", '/'));

+                                                ss.WriteLine("                <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr))+"\" />", '/'));

                                         }

                                 }

                                 ss.WriteLine("            </fileset>");

@@ -315,8 +316,7 @@ namespace Prebuild.Core.Targets
                                 ss.WriteLine("                </lib>");

                                 foreach(ReferenceNode refr in project.References)

                                 {

-                                    string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/');

-                                        ss.WriteLine("                <include name=\""+ path + "\" />" );

+                                        ss.WriteLine("                <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr))+"\" />", '/'));

                                 }

                                 ss.WriteLine("            </references>");

                 

diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index 3727947..eddfe74 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -1,9 +1,9 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{6A56621D-A328-4E23-96E3-0514A3817BAF}</ProjectGuid>

+    <ProjectGuid>{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ApplicationIcon>App.ico</ApplicationIcon>

@@ -17,8 +17,7 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Exe</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>Prebuild</RootNamespace>

     <StartupObject>Prebuild.Prebuild</StartupObject>

     <FileUpgradeFlags>

@@ -31,8 +30,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -50,8 +48,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -63,15 +60,15 @@
     <NoWarn>1595</NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System.EnterpriseServices">

+    <Reference Include="System.EnterpriseServices" >

       <HintPath>System.EnterpriseServices.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml">

+    <Reference Include="System.Xml" >

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System">

+    <Reference Include="System" >

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -205,4 +202,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>
\ No newline at end of file
+</Project>