diff options
author | Bob Arnson <bob@firegiant.com> | 2022-09-22 21:26:45 -0400 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2022-09-22 22:57:38 -0400 |
commit | d7d4243b78ca816bd6beb33b499a3b0c85b5a53d (patch) | |
tree | 0a7ddf9383e98d327b71de28edc9f6e9d4b1e23c /src/ext/UI/test/WixToolsetTest.UI | |
parent | d28bb98a6347663684cdf3960e8562eb5a8c4bad (diff) | |
download | wix-d7d4243b78ca816bd6beb33b499a3b0c85b5a53d.tar.gz wix-d7d4243b78ca816bd6beb33b499a3b0c85b5a53d.tar.bz2 wix-d7d4243b78ca816bd6beb33b499a3b0c85b5a53d.zip |
Add WixUI/@InstallDirectory to simplify authoring.
Fixes https://github.com/wixtoolset/issues/issues/6926.
Diffstat (limited to 'src/ext/UI/test/WixToolsetTest.UI')
-rw-r--r-- | src/ext/UI/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs | 4 | ||||
-rw-r--r-- | src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ext/UI/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs b/src/ext/UI/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs index b6f2344a..68e1177d 100644 --- a/src/ext/UI/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs +++ b/src/ext/UI/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs | |||
@@ -1,4 +1,4 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"> | 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" InstallerVersion="200"> | 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200"> |
3 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 3 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
4 | 4 | ||
@@ -12,7 +12,7 @@ | |||
12 | </Component> | 12 | </Component> |
13 | </ComponentGroup> | 13 | </ComponentGroup> |
14 | 14 | ||
15 | <ui:WixUI Id="WixUI_InstallDir" /> | 15 | <ui:WixUI Id="WixUI_InstallDir" InstallDirectory="INSTALLFOLDER" /> |
16 | </Package> | 16 | </Package> |
17 | 17 | ||
18 | <Fragment> | 18 | <Fragment> |
diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs index f93f232c..9c0e2ed6 100644 --- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs +++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs | |||
@@ -138,7 +138,7 @@ namespace WixToolsetTest.UI | |||
138 | var bindFolder = TestData.Get(@"TestData\data"); | 138 | var bindFolder = TestData.Get(@"TestData\data"); |
139 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); | 139 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); |
140 | 140 | ||
141 | var results = build.BuildAndQuery(Build, "Binary", "Dialog", "CustomAction"); | 141 | var results = build.BuildAndQuery(Build, "Binary", "Dialog", "CustomAction", "Property"); |
142 | Assert.Single(results, result => result.StartsWith("Dialog:InstallDirDlg\t")); | 142 | Assert.Single(results, result => result.StartsWith("Dialog:InstallDirDlg\t")); |
143 | WixAssert.CompareLineByLine(new[] | 143 | WixAssert.CompareLineByLine(new[] |
144 | { | 144 | { |
@@ -155,6 +155,10 @@ namespace WixToolsetTest.UI | |||
155 | "CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\tPrintEula\t", | 155 | "CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\tPrintEula\t", |
156 | "CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\tValidatePath\t", | 156 | "CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\tValidatePath\t", |
157 | }, results.Where(r => r.StartsWith("CustomAction:")).ToArray()); | 157 | }, results.Where(r => r.StartsWith("CustomAction:")).ToArray()); |
158 | WixAssert.CompareLineByLine(new[] | ||
159 | { | ||
160 | "Property:WIXUI_INSTALLDIR\tINSTALLFOLDER", | ||
161 | }, results.Where(r => r.StartsWith("Property:WIXUI")).ToArray()); | ||
158 | } | 162 | } |
159 | 163 | ||
160 | [Fact] | 164 | [Fact] |