From ad523168cae1ac40580186b1ac446ea6ead9f188 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 15 Jun 2020 23:21:14 +1000
Subject: Make it impossible for Heat to try to run in-proc.

---
 src/WixToolset.BuildTasks/HeatTask_InProc.cs           | 2 ++
 src/WixToolset.BuildTasks/ToolsetTask.cs               | 2 +-
 src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.BuildTasks/HeatTask_InProc.cs b/src/WixToolset.BuildTasks/HeatTask_InProc.cs
index a21a8409..48ee9e02 100644
--- a/src/WixToolset.BuildTasks/HeatTask_InProc.cs
+++ b/src/WixToolset.BuildTasks/HeatTask_InProc.cs
@@ -10,6 +10,8 @@ namespace WixToolset.BuildTasks
 
     public partial class HeatTask
     {
+        public override bool RunAsSeparateProcess { get => true; }
+
         protected sealed override string TaskShortName => "HEAT";
 
         protected sealed override Task<int> ExecuteCoreAsync(IWixToolsetCoreServiceProvider coreProvider, string commandLineString, CancellationToken cancellationToken) => throw new NotImplementedException();
diff --git a/src/WixToolset.BuildTasks/ToolsetTask.cs b/src/WixToolset.BuildTasks/ToolsetTask.cs
index ae11254a..6b171eb0 100644
--- a/src/WixToolset.BuildTasks/ToolsetTask.cs
+++ b/src/WixToolset.BuildTasks/ToolsetTask.cs
@@ -29,7 +29,7 @@ namespace WixToolset.BuildTasks
         /// Gets or sets a flag indicating whether the task
         /// should be run as separate process or in-proc.
         /// </summary>
-        public bool RunAsSeparateProcess { get; set; }
+        public virtual bool RunAsSeparateProcess { get; set; }
 
         /// <summary>
         /// Gets or sets whether all warnings should be suppressed.
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index 6709949e..e70a6c66 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -25,7 +25,6 @@
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" />
     <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
-    <PackageReference Include="WixToolset.Harvesters" Version="4.0.*" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1' ">
-- 
cgit v1.2.3-55-g6feb