Update to WiX Intermediate Representation

1 files changed, 11 insertions, 9 deletions

diff --git a/src/WixToolset.Core/Link/ReportConflictingSymbolsCommand.cs b/src/WixToolset.Core/Link/ReportConflictingSymbolsCommand.cs
index 39c3a5c2..ac0dd7ec 100644
--- a/src/WixToolset.Core/Link/ReportConflictingSymbolsCommand.cs
+++ b/src/WixToolset.Core/Link/ReportConflictingSymbolsCommand.cs
@@ -6,17 +6,18 @@ namespace WixToolset.Link
     using System.Linq;
     using WixToolset.Data;
 
-    public class ReportConflictingSymbolsCommand : ICommand
+    public class ReportConflictingSymbolsCommand
     {
-        private IEnumerable<Symbol> possibleConflicts;
-        private IEnumerable<Section> resolvedSections;
-
-        public ReportConflictingSymbolsCommand(IEnumerable<Symbol> possibleConflicts, IEnumerable<Section> resolvedSections)
+        public ReportConflictingSymbolsCommand(IEnumerable<Symbol> possibleConflicts, IEnumerable<IntermediateSection> resolvedSections)
         {
-            this.possibleConflicts = possibleConflicts;
-            this.resolvedSections = resolvedSections;
+            this.PossibleConflicts = possibleConflicts;
+            this.ResolvedSections = resolvedSections;
         }
 
+        private  IEnumerable<Symbol> PossibleConflicts { get; }
+
+        private IEnumerable<IntermediateSection> ResolvedSections { get; }
+
         public void Execute()
         {
             // Do a quick check if there are any possibly conflicting symbols that don't come from tables that allow
@@ -25,10 +26,11 @@ namespace WixToolset.Link
             // symbols are in sections we actually referenced. From the resulting set, show an error for each duplicate
             // (aka: conflicting) symbol. This should catch any rows with colliding primary keys (since symbols are based
             // on the primary keys of rows).
-            List<Symbol> illegalDuplicates = possibleConflicts.Where(s => "WixAction" != s.Row.Table.Name && "WixVariable" != s.Row.Table.Name).ToList();
+            var illegalDuplicates = this.PossibleConflicts.Where(s => s.Row.Definition.Type != TupleDefinitionType.WixAction && s.Row.Definition.Type != TupleDefinitionType.WixVariable).ToList();
             if (0 < illegalDuplicates.Count)
             {
-                HashSet<Section> referencedSections = new HashSet<Section>(resolvedSections);
+                var referencedSections = new HashSet<IntermediateSection>(this.ResolvedSections);
+
                 foreach (Symbol referencedDuplicateSymbol in illegalDuplicates.Where(s => referencedSections.Contains(s.Section)))
                 {
                     List<Symbol> actuallyReferencedDuplicateSymbols = referencedDuplicateSymbol.PossiblyConflictingSymbols.Where(s => referencedSections.Contains(s.Section)).ToList();