* vaseline + duct-tape.

2 files changed, 22 insertions, 20 deletions

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

                 }

 

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

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

                 {

                         string ret = "";

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

                         {

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

-                                

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

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

+

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

                                 

                                 return finalPath;

                         }

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

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

                         {

-                                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;

-                        }

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

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

+

+                return finalPath;

+            }

                         else

                         {

                                 ProjectNode project = (ProjectNode)refr.Parent;

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

                                         if (refr.LocalCopy)

                                         {

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

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

                                         }

                                 }

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

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

                                 foreach(ReferenceNode refr in project.References)

                                 {

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

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

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

                                 }

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

diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index c1ab9b2..3727947 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -1,4 +1,4 @@
-<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>

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

     <DelaySign>false</DelaySign>

     <OutputType>Exe</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>Prebuild</RootNamespace>

     <StartupObject>Prebuild.Prebuild</StartupObject>

     <FileUpgradeFlags>

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

     </ConfigurationOverrideFile>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

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

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -60,15 +63,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>

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

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

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