From b9ba35486245a65cd8e376cc7a808f6fa7d41682 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 9 Dec 2020 12:51:21 -0600
Subject: WIXFEAT:6209 - Add x64 and ARM64 versions of built-in BAs.

---
 src/wixlib/bal.wixproj | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'src/wixlib')

diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
index 38cdf242..8c88c3ce 100644
--- a/src/wixlib/bal.wixproj
+++ b/src/wixlib/bal.wixproj
@@ -9,14 +9,28 @@
     <BindInputPaths Include="..\wixstdba\Resources\" />
     <BindInputPaths Include="$(OutputPath)netcoreapp3.0" />
     <BindInputPaths Include="$(OutputPath)" />
-    <BindInputPaths Include="$(OutputPath)Win32" BindName="x86" />
+    <BindInputPaths Include="$(OutputPath)x86" BindName="x86" />
+    <BindInputPaths Include="$(OutputPath)x64" BindName="x64" />
+    <BindInputPaths Include="$(OutputPath)arm64" BindName="arm64" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\dnchost\dnchost.vcxproj" />
-    <ProjectReference Include="..\mbahost\mbahost.vcxproj" />
-    <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" />
+    <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=ARM64" />
+    <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=ARM64" />
+    <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=ARM64" />
+    <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x64" />
+    <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x64" />
+    <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x64" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
   </ItemGroup>
+  <!-- Workaround for bug in ProjectReferenceDefineConstants, they're not needed for this project anyway -->
+  <Target Name="ClearProjectReferenceDefineConstants" AfterTargets="CalculateDefineConstants">
+    <PropertyGroup>
+      <ProjectReferenceDefineConstants></ProjectReferenceDefineConstants>
+    </PropertyGroup>
+  </Target>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb