Add compiler extension to handle platforms.

Custom actions to print EULA and validate install directories are
defined in WixUIExtension compiler extension, to handle
platform-specific custom actions referred to from `DoAction` control
events. This is the least-worst solution, given the `DoAction` approach
used in the WixUI authoring and anyone customizing a WixUI set.

10 files changed, 24 insertions, 43 deletions

diff --git a/src/ext/UI/wixlib/Common_Platform.wxi b/src/ext/UI/wixlib/Common_Platform.wxi
index ffaa7114..0c03629c 100644
--- a/src/ext/UI/wixlib/Common_Platform.wxi
+++ b/src/ext/UI/wixlib/Common_Platform.wxi
@@ -2,18 +2,15 @@
 
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include caSuffix.wxi ?>
-    <Fragment>
-    <!-- print EULA functionality -->
-        <CustomAction Id="WixUIPrintEula$(var.Suffix)" DllEntry="PrintEula" Return="ignore" Execute="immediate" BinaryRef="WixUIWixca$(var.Suffix)" />
-    </Fragment>
+    <?include ..\..\caDecor.wxi ?>
 
-    <Fragment>
-    <!-- Validate install directory -->
-        <CustomAction Id="WixUIValidatePath$(var.Suffix)" DllEntry="ValidatePath" Return="ignore" Execute="immediate" BinaryRef="WixUIWixca$(var.Suffix)" />
-    </Fragment>
+    <!-- 
+      Custom actions to print EULA amd validate install directories are defined
+      in WixUIExtension compiler extension, to handle platform-specific custom
+      actions referred to from `DoAction` control events.
+    -->
 
     <Fragment>
-        <Binary Id="WixUIWixca$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))uica.dll" />
+        <Binary Id="WixUiCa$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))uica.dll" />
     </Fragment>
 </Include>
diff --git a/src/ext/UI/wixlib/Common_arm64.wxs b/src/ext/UI/wixlib/Common_arm64.wxs
new file mode 100644
index 00000000..61dd5ddd
--- /dev/null
+++ b/src/ext/UI/wixlib/Common_arm64.wxs
@@ -0,0 +1,7 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?define platform=arm64 ?>
+    <?include Common_Platform.wxi ?>
+</Wix>
diff --git a/src/ext/UI/wixlib/Common_x64.wxs b/src/ext/UI/wixlib/Common_x64.wxs
new file mode 100644
index 00000000..89204605
--- /dev/null
+++ b/src/ext/UI/wixlib/Common_x64.wxs
@@ -0,0 +1,7 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?define platform=x64 ?>
+    <?include Common_Platform.wxi ?>
+</Wix>
diff --git a/src/ext/UI/wixlib/WixUI_Advanced.wxs b/src/ext/UI/wixlib/WixUI_Advanced.wxs
index 7d1f4df0..2ea7a97d 100644
--- a/src/ext/UI/wixlib/WixUI_Advanced.wxs
+++ b/src/ext/UI/wixlib/WixUI_Advanced.wxs
@@ -53,7 +53,6 @@ Todo:
             <TextStyle Id="WixUI_Font_Emphasized" FaceName="!(loc.Advanced_Font_FaceName)" Size="!(loc.Advanced_Font_Emphasized_Size)" Bold="yes" />
 
             <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="Advanced" />
 
             <DialogRef Id="BrowseDlg" />
             <DialogRef Id="DiskCostDlg" />
diff --git a/src/ext/UI/wixlib/WixUI_FeatureTree.wxs b/src/ext/UI/wixlib/WixUI_FeatureTree.wxs
index e999f2fe..6f36bdb8 100644
--- a/src/ext/UI/wixlib/WixUI_FeatureTree.wxs
+++ b/src/ext/UI/wixlib/WixUI_FeatureTree.wxs
@@ -29,7 +29,6 @@ Patch dialog sequence:
             <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
 
             <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="FeatureTree" />
 
             <DialogRef Id="ErrorDlg" />
             <DialogRef Id="FatalError" />
diff --git a/src/ext/UI/wixlib/WixUI_InstallDir.wxs b/src/ext/UI/wixlib/WixUI_InstallDir.wxs
index afe7820f..f8eb3b11 100644
--- a/src/ext/UI/wixlib/WixUI_InstallDir.wxs
+++ b/src/ext/UI/wixlib/WixUI_InstallDir.wxs
@@ -30,7 +30,6 @@ Patch dialog sequence:
             <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
 
             <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="InstallDir" />
 
             <DialogRef Id="BrowseDlg" />
             <DialogRef Id="DiskCostDlg" />
diff --git a/src/ext/UI/wixlib/WixUI_Minimal.wxs b/src/ext/UI/wixlib/WixUI_Minimal.wxs
index 08dba96d..8ac9751f 100644
--- a/src/ext/UI/wixlib/WixUI_Minimal.wxs
+++ b/src/ext/UI/wixlib/WixUI_Minimal.wxs
@@ -24,7 +24,6 @@ Patch dialog sequence:
             <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
 
             <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="Minimal" />
 
             <DialogRef Id="ErrorDlg" />
             <DialogRef Id="FatalError" />
diff --git a/src/ext/UI/wixlib/WixUI_Mondo.wxs b/src/ext/UI/wixlib/WixUI_Mondo.wxs
index 2d53b9dd..6a4b15b1 100644
--- a/src/ext/UI/wixlib/WixUI_Mondo.wxs
+++ b/src/ext/UI/wixlib/WixUI_Mondo.wxs
@@ -31,7 +31,6 @@ Patch dialog sequence:
             <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
 
             <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="Mondo" />
 
             <DialogRef Id="ErrorDlg" />
             <DialogRef Id="FatalError" />
diff --git a/src/ext/UI/wixlib/caSuffix.wxi b/src/ext/UI/wixlib/caSuffix.wxi
deleted file mode 100644
index 18436269..00000000
--- a/src/ext/UI/wixlib/caSuffix.wxi
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?ifndef platform ?>
-        <?error Required value "platform" not defined in include caSuffix.wxi ?>
-    <?endif?>
-
-    <?ifdef Suffix ?>
-        <?undef Suffix ?>
-        <?undef DeferredSuffix ?>
-    <?endif?>
-
-    <?if $(var.platform)="x86" ?>
-        <?define Suffix="" ?>
-        <?define DeferredSuffix="" ?>
-    <?endif?>
-
-    <?if $(var.platform)="x64" ?>
-        <?define Suffix="_x64" ?>
-        <?define DeferredSuffix="_64" ?>
-    <?endif?>
-
-    <?if $(var.platform)="arm" ?>
-        <?define Suffix="_ARM" ?>
-        <?define DeferredSuffix="_ARM" ?>
-    <?endif?>
-</Include>
diff --git a/src/ext/UI/wixlib/ui.wixproj b/src/ext/UI/wixlib/ui.wixproj
index 2b335f01..ead77af4 100644
--- a/src/ext/UI/wixlib/ui.wixproj
+++ b/src/ext/UI/wixlib/ui.wixproj
@@ -27,7 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=x64" />
+    <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=ARM64" />
   </ItemGroup>
 
   <ItemGroup>