From df709d87c25945c10b9d29273dd90b6df6359a99 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 10 Nov 2019 18:19:36 -0500
Subject: Clean up upgrade properties; support <?ifdef $()?>

---
 src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/Variables')

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 @@
 <?define Bar = "Bar" ?>
 <?define Bar = "Baz" ?>
 
+<?ifdef $(sys.WIXVERSION) ?>
 <?if $(sys.WIXMAJORVERSION) >= 4 AND $(sys.WIXMAJORVERSION) < 5 ?>
   <?warning WiX v4 is in effect! ?>
 <?endif?>
+<?endif?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-- 
cgit v1.2.3-55-g6feb