From 976534ee824bf2a5cbc86764d1edf595ac30087b Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 20 Dec 2020 14:28:49 -0600
Subject: 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.
---
 appveyor.cmd                                       | 2 +-
 src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 1 +
 src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 1 +
 src/wixext/WixToolset.Bal.wixext.csproj            | 2 +-
 src/wixext/WixToolset.Bal.wixext.nuspec            | 4 +++-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/appveyor.cmd b/appveyor.cmd
index fe525614..b3b08545 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -10,7 +10,7 @@ msbuild -p:Configuration=%_C% src\test\examples\examples.proj || exit /b
 dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b
 dotnet test -c %_C% --no-build src\test\WixToolsetTest.ManagedHost || exit /b
 
-msbuild -p:Configuration=%_C% -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b
+msbuild -p:Configuration=%_C% -p:SkipReferencesToPack=true -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b
 msbuild -p:Configuration=%_C% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b
 
 @popd
diff --git a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj
index 8849ddbf..f347ca0b 100644
--- a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj
+++ b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj
@@ -8,6 +8,7 @@
     <Description>WiX Toolset .NET Core BA Host</Description>
     <Title>WiX Toolset .NET Core BA Host</Title>
     <DebugType>embedded</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
index 87b632d7..32d130bd 100644
--- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
@@ -9,6 +9,7 @@
     <Description>Managed Bootstrapper Application entry point</Description>
     <DebugType>embedded</DebugType>
     <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>
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 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
+    <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' and '$(SkipReferencesToPack)'!='true' " />
   </ItemGroup>
 
   <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 @@
 
     <file src="netstandard2.0\$id$.dll" target="tools" />
 
-    <file src="Win32\*.pdb" target="pdbs\Win32" />
+    <file src="x86\*.pdb" target="pdbs\x86" />
+    <file src="x64\*.pdb" target="pdbs\x64" />
+    <file src="ARM64\*.pdb" target="pdbs\ARM64" />
   </files>
 </package>
-- 
cgit v1.2.3-55-g6feb