From 0b9fd5ae84460d943e685b9821473f356a66bd3b Mon Sep 17 00:00:00 2001
From: paulomorgado <470455+paulomorgado@users.noreply.github.com>
Date: Mon, 25 May 2020 13:13:25 +0100
Subject: Allow more than one harvested file and files differing by extension
 add component and directory for more disambiguation Fix HarvestFile Ouput
 added unit tests

---
 src/WixToolset.BuildTasks/wix.harvest.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/WixToolset.BuildTasks')

diff --git a/src/WixToolset.BuildTasks/wix.harvest.targets b/src/WixToolset.BuildTasks/wix.harvest.targets
index a8be17df..5dd2f729 100644
--- a/src/WixToolset.BuildTasks/wix.harvest.targets
+++ b/src/WixToolset.BuildTasks/wix.harvest.targets
@@ -415,7 +415,7 @@
   <Target Name="HarvestFile"
     DependsOnTargets="$(HarvestFileDependsOn)"
     Inputs="@(HarvestFile);%(HarvestFile.Transforms)"
-    Outputs="$(IntermediateOutputPath)_%(HarvestFile.Filename)_file.wxs"
+    Outputs="@(HarvestFile->'$(IntermediateOutputPath)_%(ComponentGroupName)_%(DirectoryRefId)_%(Filename)%(Extension)_file.wxs')"
     Condition=" '@(HarvestFile)' != '' ">
 
     <HeatFile
@@ -427,7 +427,7 @@
       VerboseOutput="$(HarvestFileVerboseOutput)"
       AutogenerateGuids="$(HarvestFileAutogenerateGuids)"
       GenerateGuidsNow="$(HarvestFileGenerateGuidsNow)"
-      OutputFile="$(IntermediateOutputPath)_%(HarvestFile.Filename)_file.wxs"
+      OutputFile="$(IntermediateOutputPath)_%(HarvestFile.ComponentGroupName)_%(HarvestFile.DirectoryRefId)_%(HarvestFile.Filename)%(HarvestFile.Extension)_file.wxs"
       SuppressFragments="$(HarvestFileSuppressFragments)"
       SuppressUniqueIds="$(HarvestFileSuppressUniqueIds)"
       Transforms="%(HarvestFile.Transforms)"
-- 
cgit v1.2.3-55-g6feb