aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2017-10-02 00:01:51 -0700
committerRob Mensching <rob@firegiant.com>2017-10-02 00:01:51 -0700
commitc83d610e2008abfab622b8200313e4a8b2d56967 (patch)
treebf1b892933c71e374561f56e838126a9b202e54e
parent953d1f8ce380f8d85aff9b098e50a56c832e13f9 (diff)
downloadwix-c83d610e2008abfab622b8200313e4a8b2d56967.tar.gz
wix-c83d610e2008abfab622b8200313e4a8b2d56967.tar.bz2
wix-c83d610e2008abfab622b8200313e4a8b2d56967.zip
Automatically add referenced projects' output folder as bind paths
-rw-r--r--src/WixToolset.BuildTasks/CreateProjectReferenceDefineConstants.cs1
-rw-r--r--src/WixToolset.BuildTasks/wix.targets4
2 files changed, 5 insertions, 0 deletions
diff --git a/src/WixToolset.BuildTasks/CreateProjectReferenceDefineConstants.cs b/src/WixToolset.BuildTasks/CreateProjectReferenceDefineConstants.cs
index 5eae0850..7cda6b01 100644
--- a/src/WixToolset.BuildTasks/CreateProjectReferenceDefineConstants.cs
+++ b/src/WixToolset.BuildTasks/CreateProjectReferenceDefineConstants.cs
@@ -145,6 +145,7 @@ namespace WixToolset.BuildTasks
145 { 145 {
146 outputItems.Add(new TaskItem(String.Format(CultureInfo.InvariantCulture, "{0}={1}", define.Key, define.Value))); 146 outputItems.Add(new TaskItem(String.Format(CultureInfo.InvariantCulture, "{0}={1}", define.Key, define.Value)));
147 } 147 }
148
148 this.defineConstants = outputItems.ToArray(); 149 this.defineConstants = outputItems.ToArray();
149 150
150 return true; 151 return true;
diff --git a/src/WixToolset.BuildTasks/wix.targets b/src/WixToolset.BuildTasks/wix.targets
index 4da03c6f..d1373c32 100644
--- a/src/WixToolset.BuildTasks/wix.targets
+++ b/src/WixToolset.BuildTasks/wix.targets
@@ -793,6 +793,10 @@
793 793
794 <Output TaskParameter="DefineConstants" PropertyName="ProjectReferenceDefineConstants" /> 794 <Output TaskParameter="DefineConstants" PropertyName="ProjectReferenceDefineConstants" />
795 </CreateProjectReferenceDefineConstants> 795 </CreateProjectReferenceDefineConstants>
796
797 <ItemGroup>
798 <LinkerBindInputPaths Include="%(_ResolvedProjectReferencePaths.RootDir)%(_ResolvedProjectReferencePaths.Directory)" />
799 </ItemGroup>
796 </Target> 800 </Target>
797 801
798 <!-- 802 <!--