Remove invalid package reference from Payload symbol
Part of fix for wixtoolset/issues#6370
Rob Mensching committed
Mar 23, 2021 at 01:22 UTC
f2b9979b1d1922cf3f45d4317fda224f192ae533
2 files changed
+2
-9
src/WixToolset.Data/Symbols/WixBundlePayloadSymbol.cs
-8
@@ -21,7 +21,6 @@ namespace WixToolset.Data
21
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Version), IntermediateFieldType.String),
22
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Hash), IntermediateFieldType.String),
23
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContainerRef), IntermediateFieldType.String),
24
- new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PackageRef), IntermediateFieldType.String),
24
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContentFile), IntermediateFieldType.Bool),
25
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.EmbeddedId), IntermediateFieldType.String),
26
new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.LayoutOnly), IntermediateFieldType.Bool),
@@ -49,7 +48,6 @@ namespace WixToolset.Data.Symbols
48
Version,
49
Hash,
50
ContainerRef,
52
- PackageRef,
51
ContentFile,
52
EmbeddedId,
53
LayoutOnly,
@@ -135,12 +133,6 @@ namespace WixToolset.Data.Symbols
133
set => this.Set((int)WixBundlePayloadSymbolFields.ContainerRef, value);
134
}
135
138
- public string PackageRef
139
- {
140
- get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.PackageRef];
141
- set => this.Set((int)WixBundlePayloadSymbolFields.PackageRef, value);
142
- }
143
-
136
public bool ContentFile
137
{
138
get => (bool)this.Fields[(int)WixBundlePayloadSymbolFields.ContentFile];
src/WixToolset.Data/Symbols/WixGroupSymbol.cs
+2
-1
@@ -21,7 +21,7 @@ namespace WixToolset.Data
21
22
namespace WixToolset.Data.Symbols
23
{
24
- using System;
24
+ using System.Diagnostics;
25
26
public enum WixGroupSymbolFields
27
{
@@ -31,6 +31,7 @@ namespace WixToolset.Data.Symbols
31
ChildType,
32
}
33
34
+ [DebuggerDisplay("WixGroupSymbol {ParentType} {ParentId,nq} -> {ChildType} {ChildId,nq}")]
35
public class WixGroupSymbol : IntermediateSymbol
36
{
37
public WixGroupSymbol() : base(SymbolDefinitions.WixGroup, null, null)