diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-20 14:28:49 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-20 14:37:59 -0600 |
commit | 976534ee824bf2a5cbc86764d1edf595ac30087b (patch) | |
tree | c7a7b75fdd01db069996dc3edbd8e13a343695a7 /src/wixext | |
parent | 32b3088eeaaf94eae561886a4235b13aa564a620 (diff) | |
download | wix-976534ee824bf2a5cbc86764d1edf595ac30087b.tar.gz wix-976534ee824bf2a5cbc86764d1edf595ac30087b.tar.bz2 wix-976534ee824bf2a5cbc86764d1edf595ac30087b.zip |
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.
Diffstat (limited to 'src/wixext')
-rw-r--r-- | src/wixext/WixToolset.Bal.wixext.csproj | 2 | ||||
-rw-r--r-- | src/wixext/WixToolset.Bal.wixext.nuspec | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj index c0a674da..6933e62a 100644 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ b/src/wixext/WixToolset.Bal.wixext.csproj | |||
@@ -23,7 +23,7 @@ | |||
23 | </ItemGroup> | 23 | </ItemGroup> |
24 | 24 | ||
25 | <ItemGroup> | 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> | 27 | </ItemGroup> |
28 | 28 | ||
29 | <ItemGroup> | 29 | <ItemGroup> |
diff --git a/src/wixext/WixToolset.Bal.wixext.nuspec b/src/wixext/WixToolset.Bal.wixext.nuspec index 011ba138..d9e704ae 100644 --- a/src/wixext/WixToolset.Bal.wixext.nuspec +++ b/src/wixext/WixToolset.Bal.wixext.nuspec | |||
@@ -19,6 +19,8 @@ | |||
19 | 19 | ||
20 | <file src="netstandard2.0\$id$.dll" target="tools" /> | 20 | <file src="netstandard2.0\$id$.dll" target="tools" /> |
21 | 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" /> | ||
23 | </files> | 25 | </files> |
24 | </package> | 26 | </package> |