aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-06-15 23:21:14 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-06-15 23:25:43 +1000
commitad523168cae1ac40580186b1ac446ea6ead9f188 (patch)
tree1caf626d67a0a4be8eeed24b68f5a9a8751c0b1e
parent98fa23e91bca6d6a67457df056d0cb6cecf12901 (diff)
downloadwix-ad523168cae1ac40580186b1ac446ea6ead9f188.tar.gz
wix-ad523168cae1ac40580186b1ac446ea6ead9f188.tar.bz2
wix-ad523168cae1ac40580186b1ac446ea6ead9f188.zip
Make it impossible for Heat to try to run in-proc.
Diffstat
-rw-r--r--appveyor.cmd36
-rw-r--r--src/WixToolset.BuildTasks/HeatTask_InProc.cs2
-rw-r--r--src/WixToolset.BuildTasks/ToolsetTask.cs2
-rw-r--r--src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj1
4 files changed, 21 insertions, 20 deletions
diff --git a/appveyor.cmd b/appveyor.cmd
index f07255b8..f5141c14 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -4,42 +4,42 @@
4@set _P=%~dp0build\%_C%\publish 4@set _P=%~dp0build\%_C%\publish
5@set _RCO=/S /R:1 /W:1 /NP /XO /NS /NC /NFL /NDL /NJH /NJS 5@set _RCO=/S /R:1 /W:1 /NP /XO /NS /NC /NFL /NDL /NJH /NJS
6 6
7nuget restore || exit /b %ERRORLEVEL% 7nuget restore || exit /b
8 8
9dotnet test -c %_C% src\test\WixToolsetTest.BuildTasks || exit /b %ERRORLEVEL% 9dotnet test -c %_C% src\test\WixToolsetTest.BuildTasks || exit /b
10 10
11dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix || exit /b %ERRORLEVEL% 11dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix || exit /b
12 12
13dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\buildtasks\ -f net461 -r win-x86 src\WixToolset.BuildTasks || exit /b %ERRORLEVEL% 13dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\buildtasks\ -f net461 -r win-x86 src\WixToolset.BuildTasks || exit /b
14dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\heat\ -f net461 -r win-x86 src\heat || exit /b %ERRORLEVEL% 14dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\heat\ -f net461 -r win-x86 src\heat || exit /b
15dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\wix\ -f net461 -r win-x86 src\wix || exit /b %ERRORLEVEL% 15dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\wix\ -f net461 -r win-x86 src\wix || exit /b
16robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\buildtasks %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO% /XF Microsoft.Build.*.dll 16robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\buildtasks %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO% /XF Microsoft.Build.*.dll
17robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\heat %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO% 17robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\heat %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO%
18robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\wix %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO% 18robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\wix %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO%
19 19
20dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\buildtasks\ -f net461 -r win-x64 src\WixToolset.BuildTasks || exit /b %ERRORLEVEL% 20dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\buildtasks\ -f net461 -r win-x64 src\WixToolset.BuildTasks || exit /b
21dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\heat\ -f net461 -r win-x64 src\heat || exit /b %ERRORLEVEL% 21dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\heat\ -f net461 -r win-x64 src\heat || exit /b
22dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\wix\ -f net461 -r win-x64 src\wix || exit /b %ERRORLEVEL% 22dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\wix\ -f net461 -r win-x64 src\wix || exit /b
23robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\buildtasks %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO% /XF Microsoft.Build.*.dll 23robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\buildtasks %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO% /XF Microsoft.Build.*.dll
24robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\heat %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO% 24robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\heat %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO%
25robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\wix %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO% 25robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\wix %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO%
26 26
27dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\buildtasks\ -f netcoreapp2.1 src\WixToolset.BuildTasks || exit /b %ERRORLEVEL% 27dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\buildtasks\ -f netcoreapp2.1 src\WixToolset.BuildTasks || exit /b
28dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\heat\ -f netcoreapp2.1 src\heat || exit /b %ERRORLEVEL% 28dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\heat\ -f netcoreapp2.1 src\heat || exit /b
29dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wix\ -f netcoreapp2.1 src\wix || exit /b %ERRORLEVEL% 29dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wix\ -f netcoreapp2.1 src\wix || exit /b
30robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\buildtasks %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO% /XF Microsoft.Build.*.dll 30robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\buildtasks %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO% /XF Microsoft.Build.*.dll
31robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\heat %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO% 31robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\heat %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO%
32robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wix %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO% 32robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wix %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO%
33 33
34dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\ src\WixToolset.MSBuild || exit /b %ERRORLEVEL% 34dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\ src\WixToolset.MSBuild || exit /b
35dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\broken\net461\ -f net461 -r dne src\wix || exit /b %ERRORLEVEL% 35dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\broken\net461\ -f net461 -r dne src\wix || exit /b
36 36
37dotnet test -c %_C% src\test\WixToolsetTest.MSBuild || exit /b %ERRORLEVEL% 37dotnet test -c %_C% src\test\WixToolsetTest.MSBuild || exit /b
38 38
39dotnet pack -c %_C% src\dotnet-wix || exit /b %ERRORLEVEL% 39dotnet pack -c %_C% src\dotnet-wix || exit /b
40dotnet pack -c %_C% src\WixToolset.MSBuild || exit /b %ERRORLEVEL% 40dotnet pack -c %_C% src\WixToolset.MSBuild || exit /b
41 41
42msbuild -p:Configuration=%_C% .\src\ThmViewerPackage\ThmViewerPackage.wixproj || exit /b %ERRORLEVEL% 42msbuild -p:Configuration=%_C% .\src\ThmViewerPackage\ThmViewerPackage.wixproj || exit /b
43 43
44@popd 44@popd
45@endlocal 45@endlocal
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' ">
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-01 05:29:21 +0000