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
---
 src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/WixToolset.Core')

diff --git a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
index 0e4bba51..562f094f 100644
--- a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
@@ -45,7 +45,7 @@ namespace WixToolset.Core.ExtensibilityServices
             }
             else
             {
-                if (showWarning)
+                if (showWarning && value != currentValue)
                 {
                     this.Messaging.Write(WarningMessages.VariableDeclarationCollision(context.CurrentSourceLineNumber, name, value, currentValue));
                 }
-- 
cgit v1.2.3-55-g6feb