Undo RepairCondition until a more complete design is done
Rob Mensching committed
Apr 20, 2021 at 02:08 UTC
d7af012f12bb22fa3e862d536c6906ad67316abc
3 files changed
-24
src/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs
-8
@@ -16,7 +16,6 @@ namespace WixToolset.Data
16
new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.RepairCommand), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.UninstallCommand), IntermediateFieldType.String),
18
new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.ExeProtocol), IntermediateFieldType.String),
19
- new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.RepairCondition), IntermediateFieldType.String),
19
},
20
typeof(WixBundleExePackageSymbol));
21
}
@@ -34,7 +33,6 @@ namespace WixToolset.Data.Symbols
33
RepairCommand,
34
UninstallCommand,
35
ExeProtocol,
37
- RepairCondition,
36
}
37
38
[Flags]
@@ -91,12 +89,6 @@ namespace WixToolset.Data.Symbols
89
set => this.Set((int)WixBundleExePackageSymbolFields.ExeProtocol, value);
90
}
91
94
- public string RepairCondition
95
- {
96
- get => (string)this.Fields[(int)WixBundleExePackageSymbolFields.RepairCondition];
97
- set => this.Set((int)WixBundleExePackageSymbolFields.RepairCondition, value);
98
- }
99
-
92
public bool Repairable => !String.IsNullOrEmpty(this.RepairCommand);
93
}
94
}
src/WixToolset.Data/Symbols/WixBundleMsiPackageSymbol.cs
-8
@@ -17,7 +17,6 @@ namespace WixToolset.Data
17
new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductLanguage), IntermediateFieldType.Number),
18
new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductName), IntermediateFieldType.String),
19
new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.Manufacturer), IntermediateFieldType.String),
20
- new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.RepairCondition), IntermediateFieldType.String),
20
},
21
typeof(WixBundleMsiPackageSymbol));
22
}
@@ -36,7 +35,6 @@ namespace WixToolset.Data.Symbols
35
ProductLanguage,
36
ProductName,
37
Manufacturer,
39
- RepairCondition,
38
}
39
40
[Flags]
@@ -100,12 +98,6 @@ namespace WixToolset.Data.Symbols
98
set => this.Set((int)WixBundleMsiPackageSymbolFields.Manufacturer, value);
99
}
100
103
- public string RepairCondition
104
- {
105
- get => (string)this.Fields[(int)WixBundleMsiPackageSymbolFields.RepairCondition];
106
- set => this.Set((int)WixBundleMsiPackageSymbolFields.RepairCondition, value);
107
- }
108
-
101
public bool EnableFeatureSelection => (this.Attributes & WixBundleMsiPackageAttributes.EnableFeatureSelection) == WixBundleMsiPackageAttributes.EnableFeatureSelection;
102
103
public bool ForcePerMachine => (this.Attributes & WixBundleMsiPackageAttributes.ForcePerMachine) == WixBundleMsiPackageAttributes.ForcePerMachine;
src/WixToolset.Data/Symbols/WixBundleMspPackageSymbol.cs
-8
@@ -14,7 +14,6 @@ namespace WixToolset.Data
14
new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.PatchCode), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.Manufacturer), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.PatchXml), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.RepairCondition), IntermediateFieldType.String),
17
},
18
typeof(WixBundleMspPackageSymbol));
19
}
@@ -30,7 +29,6 @@ namespace WixToolset.Data.Symbols
29
PatchCode,
30
Manufacturer,
31
PatchXml,
33
- RepairCondition,
32
}
33
34
[Flags]
@@ -76,12 +74,6 @@ namespace WixToolset.Data.Symbols
74
set => this.Set((int)WixBundleMspPackageSymbolFields.PatchXml, value);
75
}
76
79
- public string RepairCondition
80
- {
81
- get => (string)this.Fields[(int)WixBundleMspPackageSymbolFields.RepairCondition];
82
- set => this.Set((int)WixBundleMspPackageSymbolFields.RepairCondition, value);
83
- }
84
-
77
public bool Slipstream => (this.Attributes & WixBundleMspPackageAttributes.Slipstream) == WixBundleMspPackageAttributes.Slipstream;
78
79
public bool TargetUnspecified => (this.Attributes & WixBundleMspPackageAttributes.TargetUnspecified) == WixBundleMspPackageAttributes.TargetUnspecified;