Fix handling of suppress modularization

Partially fixes wixtoolset/issues#5944

2 files changed, 13 insertions, 4 deletions

diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 384f8795..7113c3b5 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -728,14 +728,17 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var symbol = this.Core.AddSymbol(new BinarySymbol(sourceLineNumbers, id)
+                this.Core.AddSymbol(new BinarySymbol(sourceLineNumbers, id)
                 {
                     Data = new IntermediateFieldPathValue { Path = sourceFile }
                 });
 
                 if (YesNoType.Yes == suppressModularization)
                 {
-                    this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers, id));
+                    this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers)
+                    {
+                        SuppressIdentifier = id.Id
+                    });
                 }
             }
 
@@ -3502,7 +3505,10 @@ namespace WixToolset.Core
 
                 if (YesNoType.Yes == suppressModularization)
                 {
-                    this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers, id));
+                    this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers)
+                    {
+                        SuppressIdentifier = id.Id
+                    });
                 }
             }
         }
diff --git a/src/WixToolset.Core/Compiler_Package.cs b/src/WixToolset.Core/Compiler_Package.cs
index d2728e9c..7a842ef0 100644
--- a/src/WixToolset.Core/Compiler_Package.cs
+++ b/src/WixToolset.Core/Compiler_Package.cs
@@ -1515,7 +1515,10 @@ namespace WixToolset.Core
             {
                 this.Core.Write(WarningMessages.PropertyModularizationSuppressed(sourceLineNumbers));
 
-                this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers, id));
+                this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers)
+                {
+                    SuppressIdentifier = id.Id
+                });
             }
         }