Remove invalid package reference from Payload symbol

Part of fix for wixtoolset/issues#6370

2 files changed, 2 insertions, 9 deletions

diff --git a/src/WixToolset.Data/Symbols/WixBundlePayloadSymbol.cs b/src/WixToolset.Data/Symbols/WixBundlePayloadSymbol.cs
index f267531a..82b75285 100644
--- a/src/WixToolset.Data/Symbols/WixBundlePayloadSymbol.cs
+++ b/src/WixToolset.Data/Symbols/WixBundlePayloadSymbol.cs
@@ -21,7 +21,6 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Version), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Hash), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContainerRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PackageRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContentFile), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.EmbeddedId), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.LayoutOnly), IntermediateFieldType.Bool),
@@ -49,7 +48,6 @@ namespace WixToolset.Data.Symbols
         Version,
         Hash,
         ContainerRef,
-        PackageRef,
         ContentFile,
         EmbeddedId,
         LayoutOnly,
@@ -135,12 +133,6 @@ namespace WixToolset.Data.Symbols
             set => this.Set((int)WixBundlePayloadSymbolFields.ContainerRef, value);
         }
 
-        public string PackageRef
-        {
-            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.PackageRef];
-            set => this.Set((int)WixBundlePayloadSymbolFields.PackageRef, value);
-        }
-
         public bool ContentFile
         {
             get => (bool)this.Fields[(int)WixBundlePayloadSymbolFields.ContentFile];
diff --git a/src/WixToolset.Data/Symbols/WixGroupSymbol.cs b/src/WixToolset.Data/Symbols/WixGroupSymbol.cs
index babcff23..f8adf78d 100644
--- a/src/WixToolset.Data/Symbols/WixGroupSymbol.cs
+++ b/src/WixToolset.Data/Symbols/WixGroupSymbol.cs
@@ -21,7 +21,7 @@ namespace WixToolset.Data
 
 namespace WixToolset.Data.Symbols
 {
-    using System;
+    using System.Diagnostics;
 
     public enum WixGroupSymbolFields
     {
@@ -31,6 +31,7 @@ namespace WixToolset.Data.Symbols
         ChildType,
     }
 
+    [DebuggerDisplay("WixGroupSymbol {ParentType} {ParentId,nq} -> {ChildType} {ChildId,nq}")]
     public class WixGroupSymbol : IntermediateSymbol
     {
         public WixGroupSymbol() : base(SymbolDefinitions.WixGroup, null, null)