diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-26 14:55:01 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-26 14:55:01 -0700 |
| commit | cc20def99bbd0b28f19d90aee50d67f674738505 (patch) | |
| tree | d73260b1088990e829183cb4562d5b326a2b8ec7 /src/test/WixToolsetTest.Util/TestData/CloseApplication | |
| parent | c95213afde7af57af4b2bbaa2d29344accbebf01 (diff) | |
| download | wix-cc20def99bbd0b28f19d90aee50d67f674738505.tar.gz wix-cc20def99bbd0b28f19d90aee50d67f674738505.tar.bz2 wix-cc20def99bbd0b28f19d90aee50d67f674738505.zip | |
Remove use of inner text conversions for Util.wixext
Also, convert all test code to modern expectation
Diffstat (limited to 'src/test/WixToolsetTest.Util/TestData/CloseApplication')
| -rw-r--r-- | src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs | 6 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs index 688ce39d..ec54a472 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs | |||
| @@ -1,7 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 2 | <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |
| 3 | xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
| 4 | <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | ||
| 5 | <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> | 3 | <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> |
| 6 | 4 | ||
| 7 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | 5 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> |
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs index 4f9e6a9d..49f29600 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | ||
| 3 | xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
| 4 | <Fragment> | 2 | <Fragment> |
| 5 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | 3 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> |
| 6 | <Component> | 4 | <Component> |