From 7c04bfdb54ccf5b4b67995c9715a3f7f9e454206 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 7 Apr 2020 11:20:36 +1000
Subject: Fix bugs when compiling UI.wixext

---
 .../DialogsInInstallUISequence/Package.en-us.wxl    | 13 -------------
 .../TestData/DialogsInInstallUISequence/Package.wxs | 21 ---------------------
 .../PackageComponents.wxs                           | 10 +++++++---
 .../DialogsInInstallUISequence/data/test.txt        |  1 -
 .../TestData/TextStyle/SizeLocalized.en-us.wxl      | 13 +++++++++++++
 .../TestData/TextStyle/SizeLocalized.wxs            | 12 ++++++++++++
 6 files changed, 32 insertions(+), 38 deletions(-)
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/Package.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/data/test.txt
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.en-us.wxl
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.wxs

(limited to 'src/test/WixToolsetTest.CoreIntegration/TestData')

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/Package.en-us.wxl
deleted file mode 100644
index 77d46861..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/Package.en-us.wxl
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-  <String Id="CustomFontName"><!-- NameComment -->Tahoma</String>
-  <String Id="CustomFontSize"><!-- SizeComment -->8</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/Package.wxs
deleted file mode 100644
index 6da3dcbe..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/Package.wxs
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Product Id="*" Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Product>
-
-  <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-      </Directory>
-    </Directory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs
index 724c46ed..1101d901 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs
@@ -2,17 +2,21 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <UI Id="CustomDialog">
-            <!-- TODO: compiler can't handle loc strings for number fields -->
-            <TextStyle Id="CustomFont" FaceName="!(loc.CustomFontName)" Size="!(loc.CustomFontSize)" />
             <Dialog Id="FirstDialog" Width="100" Height="100">
                 <Control Id="Title" Type="Text" X="0" Y="0" Width="90" Height="13" TabSkip="no" Text="FirstDialogTitle" />
+                <Control Id="Header" Type="Text" X="0" Y="13" Width="90" Height="13" TabSkip="no" Text="FirstDialogHeader">
+                    <Condition Action="hide">Installed</Condition>
+                    <Condition Action="disable">Installed</Condition>
+                </Control>
             </Dialog>
             <Dialog Id="SecondDialog" Width="100" Height="100">
                 <Control Id="Title" Type="Text" X="0" Y="0" Width="90" Height="13" TabSkip="no" Text="SecondDialogTitle" />
+                <Control Id="OptionalCheckBox" Type="CheckBox" X="0" Y="13" Width="100" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
+                    <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
+                </Control>
             </Dialog>
 
             <InstallUISequence>
-                <!-- TODO: overriding this currently causes a duplicate symbol error -->
                 <Show Dialog="SecondDialog" Before="FirstDialog" Overridable="yes">NOT Installed</Show>
             </InstallUISequence>
         </UI>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.en-us.wxl
new file mode 100644
index 00000000..77d46861
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.en-us.wxl
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+This file contains the declaration of all the localizable strings.
+-->
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+
+  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
+  <String Id="FeatureTitle">MsiPackage</String>
+  <String Id="CustomFontName"><!-- NameComment -->Tahoma</String>
+  <String Id="CustomFontSize"><!-- SizeComment -->8</String>
+
+</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.wxs
new file mode 100644
index 00000000..a591fdd9
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/SizeLocalized.wxs
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents">
+            <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
+        </ComponentGroup>
+
+        <UI Id="CustomUI">
+            <TextStyle Id="CustomFont" FaceName="!(loc.CustomFontName)" Size="!(loc.CustomFontSize)" />
+        </UI>
+    </Fragment>
+</Wix>
-- 
cgit v1.2.3-55-g6feb