Force managed host projects to be AnyCpu.
Update WixToolset.Bal.wixext to where it shouldn't rebuild during packing so the tests were run on the shipped code. Add 64-bit symbols and use x86 symbols to match the wixlib bind path.
Sean Hall committed
Dec 20, 2020 at 14:28 UTC
976534ee824bf2a5cbc86764d1edf595ac30087b
5 files changed
+7
-3
appveyor.cmd
+1
-1
@@ -10,7 +10,7 @@ msbuild -p:Configuration=%_C% src\test\examples\examples.proj || exit /b
10
dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b
11
dotnet test -c %_C% --no-build src\test\WixToolsetTest.ManagedHost || exit /b
12
13
-msbuild -p:Configuration=%_C% -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b
13
+msbuild -p:Configuration=%_C% -p:SkipReferencesToPack=true -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b
14
msbuild -p:Configuration=%_C% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b
15
16
@popd
src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj
+1
@@ -8,6 +8,7 @@
8
<Description>WiX Toolset .NET Core BA Host</Description>
9
<Title>WiX Toolset .NET Core BA Host</Title>
10
<DebugType>embedded</DebugType>
11
+ <PlatformTarget>AnyCPU</PlatformTarget>
12
</PropertyGroup>
13
14
<ItemGroup>
src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+1
@@ -9,6 +9,7 @@
9
<Description>Managed Bootstrapper Application entry point</Description>
10
<DebugType>embedded</DebugType>
11
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
12
+ <PlatformTarget>AnyCPU</PlatformTarget>
13
</PropertyGroup>
14
15
<ItemGroup>
src/wixext/WixToolset.Bal.wixext.csproj
+1
-1
@@ -23,7 +23,7 @@
23
</ItemGroup>
24
25
<ItemGroup>
26
- <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
26
+ <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' and '$(SkipReferencesToPack)'!='true' " />
27
</ItemGroup>
28
29
<ItemGroup>
src/wixext/WixToolset.Bal.wixext.nuspec
+3
-1
@@ -19,6 +19,8 @@
19
20
<file src="netstandard2.0\$id$.dll" target="tools" />
21
22
- <file src="Win32\*.pdb" target="pdbs\Win32" />
22
+ <file src="x86\*.pdb" target="pdbs\x86" />
23
+ <file src="x64\*.pdb" target="pdbs\x64" />
24
+ <file src="ARM64\*.pdb" target="pdbs\ARM64" />
25
</files>
26
</package>