From ff881bbb67a85db1878add8e7795a263dbb78633 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 3 Jun 2020 20:12:17 +1000 Subject: 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. --- appveyor.cmd | 44 +++++++++++++++-------- appveyor.yml | 2 ++ src/WixToolset.MSBuild/tools/wix.targets | 2 +- src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs | 10 +++--- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/appveyor.cmd b/appveyor.cmd index 99034ca7..2d32a7f0 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -2,6 +2,7 @@ @pushd %~dp0 @set _C=Release @set _P=%~dp0build\%_C%\publish +@set _RCO=/S /R:1 /W:1 /NP /XO nuget restore @@ -10,26 +11,41 @@ dotnet test -c %_C% src\test\WixToolsetTest.WixCop dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix -dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x86\ -f net461 -r win-x86 src\WixToolset.BuildTasks -dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x86\ -f net461 -r win-x86 src\heat -dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x86\ -f net461 -r win-x86 src\wix -dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x86\ -f net461 -r win-x86 src\wixcop -dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x64\ -f net461 -r win-x64 src\WixToolset.BuildTasks -dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x64\ -f net461 -r win-x64 src\heat -dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x64\ -f net461 -r win-x64 src\wix -dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\net461\x64\ -f net461 -r win-x64 src\wixcop -dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\netcoreapp2.1\ -f netcoreapp2.1 src\WixToolset.BuildTasks -dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\netcoreapp2.1\ -f netcoreapp2.1 src\heat -dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\netcoreapp2.1\ -f netcoreapp2.1 src\wix -dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\tools\netcoreapp2.1\ -f netcoreapp2.1 src\wixcop +dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\buildtasks\ -f net461 -r win-x86 src\WixToolset.BuildTasks +dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\heat\ -f net461 -r win-x86 src\heat +dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\wix\ -f net461 -r win-x86 src\wix +dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x86\wixcop\ -f net461 -r win-x86 src\wixcop +robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\buildtasks %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO% +robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\heat %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO% +robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\wix %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO% +robocopy %_P%\WixToolset.MSBuild\separate\net461\x86\wixcop %_P%\WixToolset.MSBuild\tools\net461\x86 %_RCO% + +dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\buildtasks\ -f net461 -r win-x64 src\WixToolset.BuildTasks +dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\heat\ -f net461 -r win-x64 src\heat +dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\wix\ -f net461 -r win-x64 src\wix +dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\net461\x64\wixcop\ -f net461 -r win-x64 src\wixcop +robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\buildtasks %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO% +robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\heat %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO% +robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\wix %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO% +robocopy %_P%\WixToolset.MSBuild\separate\net461\x64\wixcop %_P%\WixToolset.MSBuild\tools\net461\x64 %_RCO% + +dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\buildtasks\ -f netcoreapp2.1 src\WixToolset.BuildTasks +dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\heat\ -f netcoreapp2.1 src\heat +dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wix\ -f netcoreapp2.1 src\wix +dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wixcop\ -f netcoreapp2.1 src\wixcop +robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\buildtasks %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO% +robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\heat %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO% +robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wix %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO% +robocopy %_P%\WixToolset.MSBuild\separate\netcoreapp2.1\wixcop %_P%\WixToolset.MSBuild\tools\netcoreapp2.1 %_RCO% + dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\ src\WixToolset.MSBuild dotnet publish -c %_C% -o %_P%\WixToolset.MSBuild\broken\net461\ -f net461 -r dne src\wix +dotnet test -c %_C% src\test\WixToolsetTest.MSBuild + dotnet pack -c %_C% src\dotnet-wix dotnet pack -c %_C% src\WixToolset.MSBuild -dotnet test -c %_C% src\test\WixToolsetTest.MSBuild - msbuild -p:Configuration=%_C% .\src\ThmViewerPackage\ThmViewerPackage.wixproj @popd diff --git a/appveyor.yml b/appveyor.yml index 522e5af3..01f87f46 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,6 +30,8 @@ nuget: skip_branch_with_pr: true skip_tags: true +test: off + artifacts: - path: build\Release\**\*.nupkg name: nuget diff --git a/src/WixToolset.MSBuild/tools/wix.targets b/src/WixToolset.MSBuild/tools/wix.targets index 233acef0..6914d03e 100644 --- a/src/WixToolset.MSBuild/tools/wix.targets +++ b/src/WixToolset.MSBuild/tools/wix.targets @@ -692,7 +692,7 @@ SuppressIces="$(SuppressIces)" AdditionalCub="$(AdditionalCub)" - RunAsSeparateProcess="false" + RunAsSeparateProcess="$(RunWixToolsOutOfProc)" ToolExe="$(WixToolExe)" ToolPath="$(WixToolDir)" /> diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs index aecc607a..163e8402 100644 --- a/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs +++ b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs @@ -291,11 +291,11 @@ namespace WixToolsetTest.MSBuild [Theory] [InlineData(BuildSystem.DotNetCoreSdk, null)] - //[InlineData(BuildSystem.DotNetCoreSdk, true)] + [InlineData(BuildSystem.DotNetCoreSdk, true)] [InlineData(BuildSystem.MSBuild, null)] - //[InlineData(BuildSystem.MSBuild, true)] + [InlineData(BuildSystem.MSBuild, true)] [InlineData(BuildSystem.MSBuild64, null)] - //[InlineData(BuildSystem.MSBuild64, true)] + [InlineData(BuildSystem.MSBuild64, true)] public void CanBuildSimpleMsiPackageAsWixipl(BuildSystem buildSystem, bool? outOfProc) { var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); @@ -381,8 +381,8 @@ namespace WixToolsetTest.MSBuild [Theory] [InlineData(BuildSystem.DotNetCoreSdk)] - //[InlineData(BuildSystem.MSBuild)] - //[InlineData(BuildSystem.MSBuild64)] + [InlineData(BuildSystem.MSBuild)] + [InlineData(BuildSystem.MSBuild64)] public void ReportsInnerExceptionForUnexpectedExceptions(BuildSystem buildSystem) { var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); -- cgit v1.2.3-55-g6feb