Make it impossible for Heat to try to run in-proc.
Sean Hall committed
Jun 15, 2020 at 23:21 UTC
ad523168cae1ac40580186b1ac446ea6ead9f188
4 files changed
+21
-20
appveyor.cmd
+18
-18
@@ -4,42 +4,42 @@
4
@set _P=%~dp0build\%_C%\publish
5
@set _RCO=/S /R:1 /W:1 /NP /XO /NS /NC /NFL /NDL /NJH /NJS
6
7
-nuget restore || exit /b %ERRORLEVEL%
7
+nuget restore || exit /b
8
9
-dotnet test -c %_C% src\test\WixToolsetTest.BuildTasks || exit /b %ERRORLEVEL%
9
+dotnet test -c %_C% src\test\WixToolsetTest.BuildTasks || exit /b
10
11
-dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix || exit /b %ERRORLEVEL%
11
+dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix || exit /b
12
13
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\buildtasks\ -f net461 -r win-x86 src\WixToolset.BuildTasks || exit /b %ERRORLEVEL%
14
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\heat\ -f net461 -r win-x86 src\heat || exit /b %ERRORLEVEL%
15
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\wix\ -f net461 -r win-x86 src\wix || exit /b %ERRORLEVEL%
13
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\buildtasks\ -f net461 -r win-x86 src\WixToolset.BuildTasks || exit /b
14
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\heat\ -f net461 -r win-x86 src\heat || exit /b
15
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\wix\ -f net461 -r win-x86 src\wix || exit /b
16
robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\buildtasks %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO% /XF Microsoft.Build.*.dll
17
robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\heat %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO%
18
robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\wix %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO%
19
20
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\buildtasks\ -f net461 -r win-x64 src\WixToolset.BuildTasks || exit /b %ERRORLEVEL%
21
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\heat\ -f net461 -r win-x64 src\heat || exit /b %ERRORLEVEL%
22
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\wix\ -f net461 -r win-x64 src\wix || exit /b %ERRORLEVEL%
20
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\buildtasks\ -f net461 -r win-x64 src\WixToolset.BuildTasks || exit /b
21
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\heat\ -f net461 -r win-x64 src\heat || exit /b
22
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\wix\ -f net461 -r win-x64 src\wix || exit /b
23
robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\buildtasks %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO% /XF Microsoft.Build.*.dll
24
robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\heat %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO%
25
robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\wix %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO%
26
27
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\buildtasks\ -f netcoreapp2.1 src\WixToolset.BuildTasks || exit /b %ERRORLEVEL%
28
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\heat\ -f netcoreapp2.1 src\heat || exit /b %ERRORLEVEL%
29
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wix\ -f netcoreapp2.1 src\wix || exit /b %ERRORLEVEL%
27
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\buildtasks\ -f netcoreapp2.1 src\WixToolset.BuildTasks || exit /b
28
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\heat\ -f netcoreapp2.1 src\heat || exit /b
29
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wix\ -f netcoreapp2.1 src\wix || exit /b
30
robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\buildtasks %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO% /XF Microsoft.Build.*.dll
31
robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\heat %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO%
32
robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wix %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO%
33
34
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\ src\WixToolset.MSBuild || exit /b %ERRORLEVEL%
35
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\broken\net461\ -f net461 -r dne src\wix || exit /b %ERRORLEVEL%
34
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\ src\WixToolset.MSBuild || exit /b
35
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\broken\net461\ -f net461 -r dne src\wix || exit /b
36
37
-dotnet test -c %_C% src\test\WixToolsetTest.MSBuild || exit /b %ERRORLEVEL%
37
+dotnet test -c %_C% src\test\WixToolsetTest.MSBuild || exit /b
38
39
-dotnet pack -c %_C% src\dotnet-wix || exit /b %ERRORLEVEL%
40
-dotnet pack -c %_C% src\WixToolset.MSBuild || exit /b %ERRORLEVEL%
39
+dotnet pack -c %_C% src\dotnet-wix || exit /b
40
+dotnet pack -c %_C% src\WixToolset.MSBuild || exit /b
41
42
-msbuild -p:Configuration=%_C% .\src\ThmViewerPackage\ThmViewerPackage.wixproj || exit /b %ERRORLEVEL%
42
+msbuild -p:Configuration=%_C% .\src\ThmViewerPackage\ThmViewerPackage.wixproj || exit /b
43
44
@popd
45
@endlocal
src/WixToolset.BuildTasks/HeatTask_InProc.cs
+2
@@ -10,6 +10,8 @@ namespace WixToolset.BuildTasks
10
11
public partial class HeatTask
12
{
13
+ public override bool RunAsSeparateProcess { get => true; }
14
+
15
protected sealed override string TaskShortName => "HEAT";
16
17
protected sealed override Task<int> ExecuteCoreAsync(IWixToolsetCoreServiceProvider coreProvider, string commandLineString, CancellationToken cancellationToken) => throw new NotImplementedException();
src/WixToolset.BuildTasks/ToolsetTask.cs
+1
-1
@@ -29,7 +29,7 @@ namespace WixToolset.BuildTasks
29
/// Gets or sets a flag indicating whether the task
30
/// should be run as separate process or in-proc.
31
/// </summary>
32
- public bool RunAsSeparateProcess { get; set; }
32
+ public virtual bool RunAsSeparateProcess { get; set; }
33
34
/// <summary>
35
/// Gets or sets whether all warnings should be suppressed.
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
-1
@@ -25,7 +25,6 @@
25
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" />
26
<PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
27
<PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
28
- <PackageReference Include="WixToolset.Harvesters" Version="4.0.*" />
28
</ItemGroup>
29
30
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1' ">