1 files changed, 2 insertions, 2 deletions
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)"

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 @@
415	<Target Name="HarvestFile"	415	<Target Name="HarvestFile"
416	DependsOnTargets="$(HarvestFileDependsOn)"	416	DependsOnTargets="$(HarvestFileDependsOn)"
417	Inputs="@(HarvestFile);%(HarvestFile.Transforms)"	417	Inputs="@(HarvestFile);%(HarvestFile.Transforms)"
418	Outputs="$(IntermediateOutputPath)_%(HarvestFile.Filename)_file.wxs"	418	Outputs="@(HarvestFile->'$(IntermediateOutputPath)_%(ComponentGroupName)_%(DirectoryRefId)_%(Filename)%(Extension)_file.wxs')"
419	Condition=" '@(HarvestFile)' != '' ">	419	Condition=" '@(HarvestFile)' != '' ">
420		420
421	<HeatFile	421	<HeatFile
@@ -427,7 +427,7 @@
427	VerboseOutput="$(HarvestFileVerboseOutput)"	427	VerboseOutput="$(HarvestFileVerboseOutput)"
428	AutogenerateGuids="$(HarvestFileAutogenerateGuids)"	428	AutogenerateGuids="$(HarvestFileAutogenerateGuids)"
429	GenerateGuidsNow="$(HarvestFileGenerateGuidsNow)"	429	GenerateGuidsNow="$(HarvestFileGenerateGuidsNow)"
430	OutputFile="$(IntermediateOutputPath)_%(HarvestFile.Filename)_file.wxs"	430	OutputFile="$(IntermediateOutputPath)_%(HarvestFile.ComponentGroupName)_%(HarvestFile.DirectoryRefId)_%(HarvestFile.Filename)%(HarvestFile.Extension)_file.wxs"
431	SuppressFragments="$(HarvestFileSuppressFragments)"	431	SuppressFragments="$(HarvestFileSuppressFragments)"
432	SuppressUniqueIds="$(HarvestFileSuppressUniqueIds)"	432	SuppressUniqueIds="$(HarvestFileSuppressUniqueIds)"
433	Transforms="%(HarvestFile.Transforms)"	433	Transforms="%(HarvestFile.Transforms)"