From 3cb9bbe90e329a3550bb55fda5c620f23fc4eb86 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 14 Feb 2023 23:11:29 -0800
Subject: Update some extensions to take advantage of multitargeting project
 references

---
 src/ext/UI/wixlib/Common_Platform.wxi |  2 +-
 src/ext/UI/wixlib/ui.wixproj          | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/ext/UI/wixlib')

diff --git a/src/ext/UI/wixlib/Common_Platform.wxi b/src/ext/UI/wixlib/Common_Platform.wxi
index cd050e06..329abb2e 100644
--- a/src/ext/UI/wixlib/Common_Platform.wxi
+++ b/src/ext/UI/wixlib/Common_Platform.wxi
@@ -13,6 +13,6 @@
     </Fragment>
 
     <Fragment>
-        <Binary Id="WixUiCa$(Suffix)" SourceFile="!(bindpath.$(platform))uica.dll" />
+        <Binary Id="WixUiCa$(Suffix)" SourceFile="!(bindpath.uica.$(platform))uica.dll" />
     </Fragment>
 </Include>
diff --git a/src/ext/UI/wixlib/ui.wixproj b/src/ext/UI/wixlib/ui.wixproj
index ebac0c79..848bc882 100644
--- a/src/ext/UI/wixlib/ui.wixproj
+++ b/src/ext/UI/wixlib/ui.wixproj
@@ -5,6 +5,7 @@
     <BindFiles>true</BindFiles>
     <Cultures>en-us</Cultures>
   </PropertyGroup>
+
   <PropertyGroup>
     <DefineConstants>
       $(DefineConstants);
@@ -17,19 +18,15 @@
       upIco=$(MSBuildProjectDirectory)\Bitmaps\up.ico;
     </DefineConstants>
   </PropertyGroup>
-  <ItemGroup>
-    <BindInputPaths Include="$(OutputPath)x86" BindName="x86" />
-    <BindInputPaths Include="$(OutputPath)x64" BindName="x64" />
-    <BindInputPaths Include="$(OutputPath)arm64" BindName="arm64" />
-  </ItemGroup>
+
   <ItemGroup>
     <Content Include="Common_Platform.wxi" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=x86" />
-    <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=x64" />
-    <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=ARM64" />
+    <ProjectReference Include="..\ca\uica.vcxproj" Platforms="arm64,x86,x64" />
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
-- 
cgit v1.2.3-55-g6feb