From a2614e6e11108abba52b9eca8f460d9ab57513f5 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@joyofsetup.com>
Date: Mon, 3 Sep 2018 18:19:08 -0400
Subject: Warn on preprocessor variable redefinition only when the values are
 different.

Fixes wixtoolset/issues#5853
---
 .../TestData/Variables/Package.wxs                 | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs

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

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs
new file mode 100644
index 00000000..896b7e3f
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<?define Foo = "Foo" ?>
+<?define Foo = "Foo" ?>
+
+<?define Bar = "Bar" ?>
+<?define Bar = "Baz" ?>
+
+<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">
+    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
+
+    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+    <MediaTemplate />
+
+    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
+      <ComponentGroupRef Id="ProductComponents" />
+    </Feature>
+  </Product>
+
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+      </Directory>
+    </Directory>
+  </Fragment>
+</Wix>
-- 
cgit v1.2.3-55-g6feb