Add UTF-8, no-prefix, and Unicode characters.
Bob Arnson committed
Apr 27, 2024 at 23:37 UTC
f9569df0316d0ee4b0564eb900154cdca50a75f0
2 files changed
+6
-4
src/ext/UI/test/WixToolsetTest.UI/TestData/InstallDir_SpecialDlg/Package.wxs
+5
-3
@@ -1,5 +1,5 @@
1
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
2
- <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
2
+ <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Codepage="65001">
3
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
4
5
<Feature Id="ProductFeature" Title="MsiPackage">
@@ -24,6 +24,8 @@
24
<Fragment>
25
<UI>
26
<Dialog Id="SpecialDlg" Width="370" Height="270" Title="My Special Dialog">
27
+ <Control Id="Bitmap" Type="Bitmap" X="92" Y="80" Width="185" Height="117" TabSkip="no" Text="WixUI_Bmp_Dialog" />
28
+ <Control Id="GotoBlog" Type="Hyperlink" Transparent="yes" X="96" Y="121" Width="178" Height="17" Text='Visit <a href="https://www.firegiant.com/blog/">the FireGiant blog!</a>' />
29
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
30
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="!(loc.WixUINext)" />
31
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
@@ -32,8 +34,8 @@
34
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
35
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
36
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
35
- <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="My Special Dialog" />
36
- <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="A dialog where special stuff happens" />
37
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="My Special Dialog & Stuff" />
38
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="✔ A dialog where special stuff happens" />
39
</Dialog>
40
</UI>
41
</Fragment>
src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
+1
-1
@@ -405,7 +405,7 @@ namespace WixToolsetTest.UI
405
"InstallUISequence:WelcomeDlg\tNOT Installed OR PATCH\t1297",
406
}, results.Where(r => r.StartsWith("InstallUISequence:AdvancedWelcome") || r.StartsWith("InstallUISequence:Welcome")).ToArray());
407
408
- Assert.Equal(8, results.Where(result => result.StartsWith("Control:") && result.Contains("SpecialDlg")).Count());
408
+ Assert.Equal(10, results.Where(result => result.StartsWith("Control:") && result.Contains("SpecialDlg")).Count());
409
Assert.Equal(5, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("SpecialDlg")).Count());
410
Assert.Single(results.Where(result => result.StartsWith("Dialog:") && result.Contains("SpecialDlg")));
411
}