diff options
| author | Bob Arnson <bob@firegiant.com> | 2019-11-10 18:19:36 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2019-11-10 18:31:56 -0500 |
| commit | df709d87c25945c10b9d29273dd90b6df6359a99 (patch) | |
| tree | cd4cfca3ce6f548988a35cf38b7e428e3600505e /src/test | |
| parent | e29c25090e26c8cca52232d580528840d1161b73 (diff) | |
| download | wix-df709d87c25945c10b9d29273dd90b6df6359a99.tar.gz wix-df709d87c25945c10b9d29273dd90b6df6359a99.tar.bz2 wix-df709d87c25945c10b9d29273dd90b6df6359a99.zip | |
Clean up upgrade properties; support <?ifdef $()?>
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs index 9f5e3f34..57c24f57 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs | |||
| @@ -6,9 +6,11 @@ | |||
| 6 | <?define Bar = "Bar" ?> | 6 | <?define Bar = "Bar" ?> |
| 7 | <?define Bar = "Baz" ?> | 7 | <?define Bar = "Baz" ?> |
| 8 | 8 | ||
| 9 | <?ifdef $(sys.WIXVERSION) ?> | ||
| 9 | <?if $(sys.WIXMAJORVERSION) >= 4 AND $(sys.WIXMAJORVERSION) < 5 ?> | 10 | <?if $(sys.WIXMAJORVERSION) >= 4 AND $(sys.WIXMAJORVERSION) < 5 ?> |
| 10 | <?warning WiX v4 is in effect! ?> | 11 | <?warning WiX v4 is in effect! ?> |
| 11 | <?endif?> | 12 | <?endif?> |
| 13 | <?endif?> | ||
| 12 | 14 | ||
| 13 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 15 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 14 | <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | 16 | <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |