Reenable RunAsSeparateProcess.
Publish the parts of WixToolset.MSBuild to individual folders and then manually recombine them, because otherwise dotnet publish was mysteriously bringing in the wrong versions of dlls. Disable tests in appveyor.yml because Appveyor was running the tests again at the end of the build.
Sean Hall committed
Jun 3, 2020 at 20:12 UTC
ff881bbb67a85db1878add8e7795a263dbb78633
4 files changed
+38
-20
appveyor.cmd
+30
-14
@@ -2,6 +2,7 @@
2
@pushd %~dp0
3
@set _C=Release
4
@set _P=%~dp0build\%_C%\publish
5
+@set _RCO=/S /R:1 /W:1 /NP /XO
6
7
nuget restore
8
@@ -10,26 +11,41 @@ dotnet test -c %_C% src\test\WixToolsetTest.WixCop
11
12
dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix
13
13
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x86\ -f net461 -r win-x86 src\WixToolset.BuildTasks
14
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x86\ -f net461 -r win-x86 src\heat
15
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x86\ -f net461 -r win-x86 src\wix
16
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x86\ -f net461 -r win-x86 src\wixcop
17
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x64\ -f net461 -r win-x64 src\WixToolset.BuildTasks
18
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x64\ -f net461 -r win-x64 src\heat
19
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x64\ -f net461 -r win-x64 src\wix
20
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x64\ -f net461 -r win-x64 src\wixcop
21
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\netcoreapp2.1\ -f netcoreapp2.1 src\WixToolset.BuildTasks
22
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\netcoreapp2.1\ -f netcoreapp2.1 src\heat
23
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\netcoreapp2.1\ -f netcoreapp2.1 src\wix
24
-dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\netcoreapp2.1\ -f netcoreapp2.1 src\wixcop
14
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\buildtasks\ -f net461 -r win-x86 src\WixToolset.BuildTasks
15
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\heat\ -f net461 -r win-x86 src\heat
16
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\wix\ -f net461 -r win-x86 src\wix
17
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\wixcop\ -f net461 -r win-x86 src\wixcop
18
+robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\buildtasks %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO%
19
+robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\heat %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO%
20
+robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\wix %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO%
21
+robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\wixcop %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO%
22
+
23
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\buildtasks\ -f net461 -r win-x64 src\WixToolset.BuildTasks
24
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\heat\ -f net461 -r win-x64 src\heat
25
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\wix\ -f net461 -r win-x64 src\wix
26
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\wixcop\ -f net461 -r win-x64 src\wixcop
27
+robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\buildtasks %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO%
28
+robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\heat %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO%
29
+robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\wix %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO%
30
+robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\wixcop %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO%
31
+
32
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\buildtasks\ -f netcoreapp2.1 src\WixToolset.BuildTasks
33
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\heat\ -f netcoreapp2.1 src\heat
34
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wix\ -f netcoreapp2.1 src\wix
35
+dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wixcop\ -f netcoreapp2.1 src\wixcop
36
+robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\buildtasks %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO%
37
+robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\heat %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO%
38
+robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wix %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO%
39
+robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wixcop %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO%
40
+
41
dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\ src\WixToolset.MSBuild
42
dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\broken\net461\ -f net461 -r dne src\wix
43
44
+dotnet test -c %_C% src\test\WixToolsetTest.MSBuild
45
+
46
dotnet pack -c %_C% src\dotnet-wix
47
dotnet pack -c %_C% src\WixToolset.MSBuild
48
31
-dotnet test -c %_C% src\test\WixToolsetTest.MSBuild
32
-
49
msbuild -p:Configuration=%_C% .\src\ThmViewerPackage\ThmViewerPackage.wixproj
50
51
@popd
appveyor.yml
+2
@@ -30,6 +30,8 @@ nuget:
30
skip_branch_with_pr: true
31
skip_tags: true
32
33
+test: off
34
+
35
artifacts:
36
- path: build\Release\**\*.nupkg
37
name: nuget
src/WixToolset.MSBuild/tools/wix.targets
+1
-1
@@ -692,7 +692,7 @@
692
SuppressIces="$(SuppressIces)"
693
AdditionalCub="$(AdditionalCub)"
694
695
- RunAsSeparateProcess="false"
695
+ RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
696
ToolExe="$(WixToolExe)"
697
ToolPath="$(WixToolDir)" />
698
src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs
+5
-5
@@ -291,11 +291,11 @@ namespace WixToolsetTest.MSBuild
291
292
[Theory]
293
[InlineData(BuildSystem.DotNetCoreSdk, null)]
294
- //[InlineData(BuildSystem.DotNetCoreSdk, true)]
294
+ [InlineData(BuildSystem.DotNetCoreSdk, true)]
295
[InlineData(BuildSystem.MSBuild, null)]
296
- //[InlineData(BuildSystem.MSBuild, true)]
296
+ [InlineData(BuildSystem.MSBuild, true)]
297
[InlineData(BuildSystem.MSBuild64, null)]
298
- //[InlineData(BuildSystem.MSBuild64, true)]
298
+ [InlineData(BuildSystem.MSBuild64, true)]
299
public void CanBuildSimpleMsiPackageAsWixipl(BuildSystem buildSystem, bool? outOfProc)
300
{
301
var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage");
@@ -381,8 +381,8 @@ namespace WixToolsetTest.MSBuild
381
382
[Theory]
383
[InlineData(BuildSystem.DotNetCoreSdk)]
384
- //[InlineData(BuildSystem.MSBuild)]
385
- //[InlineData(BuildSystem.MSBuild64)]
384
+ [InlineData(BuildSystem.MSBuild)]
385
+ [InlineData(BuildSystem.MSBuild64)]
386
public void ReportsInnerExceptionForUnexpectedExceptions(BuildSystem buildSystem)
387
{
388
var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage");