diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-15 23:21:14 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-15 23:25:43 +1000 |
| commit | ad523168cae1ac40580186b1ac446ea6ead9f188 (patch) | |
| tree | 1caf626d67a0a4be8eeed24b68f5a9a8751c0b1e /src | |
| parent | 98fa23e91bca6d6a67457df056d0cb6cecf12901 (diff) | |
| download | wix-ad523168cae1ac40580186b1ac446ea6ead9f188.tar.gz wix-ad523168cae1ac40580186b1ac446ea6ead9f188.tar.bz2 wix-ad523168cae1ac40580186b1ac446ea6ead9f188.zip | |
Make it impossible for Heat to try to run in-proc.
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.BuildTasks/HeatTask_InProc.cs | 2 | ||||
| -rw-r--r-- | src/WixToolset.BuildTasks/ToolsetTask.cs | 2 | ||||
| -rw-r--r-- | src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | 1 |
3 files changed, 3 insertions, 2 deletions
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 | |||
| 10 | 10 | ||
| 11 | public partial class HeatTask | 11 | public partial class HeatTask |
| 12 | { | 12 | { |
| 13 | public override bool RunAsSeparateProcess { get => true; } | ||
| 14 | |||
| 13 | protected sealed override string TaskShortName => "HEAT"; | 15 | protected sealed override string TaskShortName => "HEAT"; |
| 14 | 16 | ||
| 15 | protected sealed override Task<int> ExecuteCoreAsync(IWixToolsetCoreServiceProvider coreProvider, string commandLineString, CancellationToken cancellationToken) => throw new NotImplementedException(); | 17 | 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 | |||
| 29 | /// Gets or sets a flag indicating whether the task | 29 | /// Gets or sets a flag indicating whether the task |
| 30 | /// should be run as separate process or in-proc. | 30 | /// should be run as separate process or in-proc. |
| 31 | /// </summary> | 31 | /// </summary> |
| 32 | public bool RunAsSeparateProcess { get; set; } | 32 | public virtual bool RunAsSeparateProcess { get; set; } |
| 33 | 33 | ||
| 34 | /// <summary> | 34 | /// <summary> |
| 35 | /// Gets or sets whether all warnings should be suppressed. | 35 | /// 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 @@ | |||
| 25 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" /> | 25 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" /> |
| 26 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | 26 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> |
| 27 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | 27 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> |
| 28 | <PackageReference Include="WixToolset.Harvesters" Version="4.0.*" /> | ||
| 29 | </ItemGroup> | 28 | </ItemGroup> |
| 30 | 29 | ||
| 31 | <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1' "> | 30 | <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1' "> |