diff options
| author | Bob Arnson <bob@joyofsetup.com> | 2018-09-03 18:19:08 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@joyofsetup.com> | 2018-09-03 18:19:08 -0400 |
| commit | a2614e6e11108abba52b9eca8f460d9ab57513f5 (patch) | |
| tree | 77df973d12040f1b3cb30d96c6516b9e0f73dc31 /src/WixToolset.Core | |
| parent | c72297466821e6ca856866cd48726c919554b580 (diff) | |
| download | wix-a2614e6e11108abba52b9eca8f460d9ab57513f5.tar.gz wix-a2614e6e11108abba52b9eca8f460d9ab57513f5.tar.bz2 wix-a2614e6e11108abba52b9eca8f460d9ab57513f5.zip | |
Warn on preprocessor variable redefinition only when the values are different.
Fixes wixtoolset/issues#5853
Diffstat (limited to 'src/WixToolset.Core')
| -rw-r--r-- | src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 45 | } | 45 | } |
| 46 | else | 46 | else |
| 47 | { | 47 | { |
| 48 | if (showWarning) | 48 | if (showWarning && value != currentValue) |
| 49 | { | 49 | { |
| 50 | this.Messaging.Write(WarningMessages.VariableDeclarationCollision(context.CurrentSourceLineNumber, name, value, currentValue)); | 50 | this.Messaging.Write(WarningMessages.VariableDeclarationCollision(context.CurrentSourceLineNumber, name, value, currentValue)); |
| 51 | } | 51 | } |