4 files changed, 20 insertions, 7 deletions

diff --git a/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs b/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
index 1c2ca8eb..a4b2bee3 100644
--- a/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
+++ b/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
@@ -38,10 +38,17 @@ namespace WixToolset.Core.Link
         /// </summary>
         public IEnumerable<SymbolWithSection> PossibleConflicts { get; private set; }
 
+        /// <summary>
+        /// Gets the collection of redundant symbols that should not be included
+        /// in the final output.
+        /// </summary>
+        public ISet<IntermediateSymbol> RedundantSymbols { get; private set; }
+
         public void Execute()
         {
             var symbolsByName = new Dictionary<string, SymbolWithSection>();
             var possibleConflicts = new HashSet<SymbolWithSection>();
+            var redundantSymbols = new HashSet<IntermediateSymbol>();
 
             if (!Enum.TryParse(this.ExpectedOutputType.ToString(), out SectionType expectedEntrySectionType))
             {
@@ -91,13 +98,13 @@ namespace WixToolset.Core.Link
                             // Ensure identical symbol's symbol is marked redundant to ensure (should the symbol be
                             // referenced into the final output) it will not add duplicate primary keys during
                             // the .IDT importing.
-                            //symbol.Row.Redundant = true; - TODO: remove this
                             existingSymbol.AddRedundant(symbolWithSection);
+                            redundantSymbols.Add(symbolWithSection.Symbol);
                         }
                         else
                         {
                             existingSymbol.AddPossibleConflict(symbolWithSection);
-                            possibleConflicts.Add(existingSymbol);
+                            possibleConflicts.Add(symbolWithSection);
                         }
                     }
                 }
@@ -105,6 +112,7 @@ namespace WixToolset.Core.Link
 
             this.SymbolsByName = symbolsByName;
             this.PossibleConflicts = possibleConflicts;
+            this.RedundantSymbols = redundantSymbols;
         }
     }
 }
diff --git a/src/WixToolset.Core/Link/IntermediateSymbolExtensions.cs b/src/WixToolset.Core/Link/IntermediateSymbolExtensions.cs
index db53f1ce..cbf48abe 100644
--- a/src/WixToolset.Core/Link/IntermediateSymbolExtensions.cs
+++ b/src/WixToolset.Core/Link/IntermediateSymbolExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
 namespace WixToolset.Core.Link
 {
@@ -9,10 +9,10 @@ namespace WixToolset.Core.Link
         public static bool IsIdentical(this IntermediateSymbol first, IntermediateSymbol second)
         {
             var identical = (first.Definition.Type == second.Definition.Type &&
-                             first.Definition.Name == second.Definition.Name &&
+                             (first.Definition.Type != SymbolDefinitionType.MustBeFromAnExtension || first.Definition.Name == second.Definition.Name) &&
                              first.Definition.FieldDefinitions.Length == second.Definition.FieldDefinitions.Length);
 
-            for (int i = 0; identical && i < first.Definition.FieldDefinitions.Length; ++i)
+            for (var i = 0; identical && i < first.Definition.FieldDefinitions.Length; ++i)
             {
                 var firstField = first[i];
                 var secondField = second[i];
diff --git a/src/WixToolset.Core/Link/ResolveReferencesCommand.cs b/src/WixToolset.Core/Link/ResolveReferencesCommand.cs
index 90b61e8b..2bdd5646 100644
--- a/src/WixToolset.Core/Link/ResolveReferencesCommand.cs
+++ b/src/WixToolset.Core/Link/ResolveReferencesCommand.cs
@@ -170,9 +170,9 @@ namespace WixToolset.Core.Link
                 case AccessModifier.Public:
                     return true;
                 case AccessModifier.Internal:
-                    return symbolWithSection.Section.CompilationId.Equals(referencingSection.CompilationId) || (null != symbolWithSection.Section.LibraryId && symbolWithSection.Section.LibraryId.Equals(referencingSection.LibraryId));
+                    return symbolWithSection.Section.CompilationId == referencingSection.CompilationId || (null != symbolWithSection.Section.LibraryId && symbolWithSection.Section.LibraryId == referencingSection.LibraryId);
                 case AccessModifier.Protected:
-                    return symbolWithSection.Section.CompilationId.Equals(referencingSection.CompilationId);
+                    return symbolWithSection.Section.CompilationId == referencingSection.CompilationId;
                 case AccessModifier.Private:
                     return referencingSection == symbolWithSection.Section;
                 default:
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs
index e9f9554c..431ba4c7 100644
--- a/src/WixToolset.Core/Linker.cs
+++ b/src/WixToolset.Core/Linker.cs
@@ -226,6 +226,11 @@ namespace WixToolset.Core
 
                     foreach (var symbol in section.Symbols)
                     {
+                        if (find.RedundantSymbols.Contains(symbol))
+                        {
+                            continue;
+                        }
+
                         var copySymbol = true; // by default, copy symbols.
 
                         // handle special tables