diff options
| author | Bob Arnson <bob@firegiant.com> | 2024-02-03 22:52:23 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2024-02-05 09:18:49 -0500 |
| commit | eb2f85d7ee5ad5c91af0943ffe936ee8ccfdab0d (patch) | |
| tree | 8091380699b20d139f36539eac5061af24a03078 /src/ext | |
| parent | bf1e74b78ebe345908c3cb09280194798f63835a (diff) | |
| download | wix-eb2f85d7ee5ad5c91af0943ffe936ee8ccfdab0d.tar.gz wix-eb2f85d7ee5ad5c91af0943ffe936ee8ccfdab0d.tar.bz2 wix-eb2f85d7ee5ad5c91af0943ffe936ee8ccfdab0d.zip | |
Improve error when virtual action symbols collide.
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs index 8e054256..8dba33b4 100644 --- a/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs +++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> |
| 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"> |
| 3 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | 3 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> |
| 4 | 4 | ||
| @@ -7,11 +7,15 @@ | |||
| 7 | </Feature> | 7 | </Feature> |
| 8 | 8 | ||
| 9 | <util:CloseApplication Id="CloseMyApp" CloseMessage="yes" Property="MYAPPISRUNNING" Target="explorer.exe" /> | 9 | <util:CloseApplication Id="CloseMyApp" CloseMessage="yes" Property="MYAPPISRUNNING" Target="explorer.exe" /> |
| 10 | |||
| 11 | <InstallExecuteSequence> | ||
| 12 | <Custom Action="override Wix4CloseApplications_$(sys.BUILDARCHSHORT)" After="InstallInitialize" /> | ||
| 13 | </InstallExecuteSequence> | ||
| 10 | </Package> | 14 | </Package> |
| 11 | 15 | ||
| 12 | <Fragment> | 16 | <Fragment> |
| 13 | <StandardDirectory Id="ProgramFilesFolder"> | 17 | <StandardDirectory Id="ProgramFilesFolder"> |
| 14 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 18 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
| 15 | </StandardDirectory> | 19 | </StandardDirectory> |
| 16 | </Fragment> | 20 | </Fragment> |
| 17 | </Wix> | 21 | </Wix> |