diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-10 15:15:02 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-04-12 10:11:51 -0700 |
commit | c9c92ff83b24d6ed055032f62e833090ea4f8d9c (patch) | |
tree | aa835598df0dc81aa5c211042415f30ce5b9ba45 /src | |
parent | 98c54e6a6dbf6dd8944eef12fa43a5cf79a2895d (diff) | |
download | wix-c9c92ff83b24d6ed055032f62e833090ea4f8d9c.tar.gz wix-c9c92ff83b24d6ed055032f62e833090ea4f8d9c.tar.bz2 wix-c9c92ff83b24d6ed055032f62e833090ea4f8d9c.zip |
Add support for RepairCondition on Exe, Msi and Msp packages
Diffstat (limited to 'src')
3 files changed, 24 insertions, 0 deletions
diff --git a/src/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs b/src/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs index 8a8cff1b..f377adca 100644 --- a/src/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs +++ b/src/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs | |||
@@ -16,6 +16,7 @@ namespace WixToolset.Data | |||
16 | new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.RepairCommand), IntermediateFieldType.String), | 16 | new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.RepairCommand), IntermediateFieldType.String), |
17 | new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.UninstallCommand), IntermediateFieldType.String), | 17 | new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.UninstallCommand), IntermediateFieldType.String), |
18 | new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.ExeProtocol), IntermediateFieldType.String), | 18 | new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.ExeProtocol), IntermediateFieldType.String), |
19 | new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.RepairCondition), IntermediateFieldType.String), | ||
19 | }, | 20 | }, |
20 | typeof(WixBundleExePackageSymbol)); | 21 | typeof(WixBundleExePackageSymbol)); |
21 | } | 22 | } |
@@ -33,6 +34,7 @@ namespace WixToolset.Data.Symbols | |||
33 | RepairCommand, | 34 | RepairCommand, |
34 | UninstallCommand, | 35 | UninstallCommand, |
35 | ExeProtocol, | 36 | ExeProtocol, |
37 | RepairCondition, | ||
36 | } | 38 | } |
37 | 39 | ||
38 | [Flags] | 40 | [Flags] |
@@ -89,6 +91,12 @@ namespace WixToolset.Data.Symbols | |||
89 | set => this.Set((int)WixBundleExePackageSymbolFields.ExeProtocol, value); | 91 | set => this.Set((int)WixBundleExePackageSymbolFields.ExeProtocol, value); |
90 | } | 92 | } |
91 | 93 | ||
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); | 100 | public bool Repairable => !String.IsNullOrEmpty(this.RepairCommand); |
93 | } | 101 | } |
94 | } | 102 | } |
diff --git a/src/WixToolset.Data/Symbols/WixBundleMsiPackageSymbol.cs b/src/WixToolset.Data/Symbols/WixBundleMsiPackageSymbol.cs index 21735f64..ef7ba34e 100644 --- a/src/WixToolset.Data/Symbols/WixBundleMsiPackageSymbol.cs +++ b/src/WixToolset.Data/Symbols/WixBundleMsiPackageSymbol.cs | |||
@@ -17,6 +17,7 @@ namespace WixToolset.Data | |||
17 | new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductLanguage), IntermediateFieldType.Number), | 17 | new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductLanguage), IntermediateFieldType.Number), |
18 | new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductName), IntermediateFieldType.String), | 18 | new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductName), IntermediateFieldType.String), |
19 | new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.Manufacturer), IntermediateFieldType.String), | 19 | new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.Manufacturer), IntermediateFieldType.String), |
20 | new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.RepairCondition), IntermediateFieldType.String), | ||
20 | }, | 21 | }, |
21 | typeof(WixBundleMsiPackageSymbol)); | 22 | typeof(WixBundleMsiPackageSymbol)); |
22 | } | 23 | } |
@@ -35,6 +36,7 @@ namespace WixToolset.Data.Symbols | |||
35 | ProductLanguage, | 36 | ProductLanguage, |
36 | ProductName, | 37 | ProductName, |
37 | Manufacturer, | 38 | Manufacturer, |
39 | RepairCondition, | ||
38 | } | 40 | } |
39 | 41 | ||
40 | [Flags] | 42 | [Flags] |
@@ -98,6 +100,12 @@ namespace WixToolset.Data.Symbols | |||
98 | set => this.Set((int)WixBundleMsiPackageSymbolFields.Manufacturer, value); | 100 | set => this.Set((int)WixBundleMsiPackageSymbolFields.Manufacturer, value); |
99 | } | 101 | } |
100 | 102 | ||
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; | 109 | public bool EnableFeatureSelection => (this.Attributes & WixBundleMsiPackageAttributes.EnableFeatureSelection) == WixBundleMsiPackageAttributes.EnableFeatureSelection; |
102 | 110 | ||
103 | public bool ForcePerMachine => (this.Attributes & WixBundleMsiPackageAttributes.ForcePerMachine) == WixBundleMsiPackageAttributes.ForcePerMachine; | 111 | public bool ForcePerMachine => (this.Attributes & WixBundleMsiPackageAttributes.ForcePerMachine) == WixBundleMsiPackageAttributes.ForcePerMachine; |
diff --git a/src/WixToolset.Data/Symbols/WixBundleMspPackageSymbol.cs b/src/WixToolset.Data/Symbols/WixBundleMspPackageSymbol.cs index 3784c2ff..d4aa19a2 100644 --- a/src/WixToolset.Data/Symbols/WixBundleMspPackageSymbol.cs +++ b/src/WixToolset.Data/Symbols/WixBundleMspPackageSymbol.cs | |||
@@ -14,6 +14,7 @@ namespace WixToolset.Data | |||
14 | new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.PatchCode), IntermediateFieldType.String), | 14 | new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.PatchCode), IntermediateFieldType.String), |
15 | new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.Manufacturer), IntermediateFieldType.String), | 15 | new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.Manufacturer), IntermediateFieldType.String), |
16 | new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.PatchXml), IntermediateFieldType.String), | 16 | new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.PatchXml), IntermediateFieldType.String), |
17 | new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.RepairCondition), IntermediateFieldType.String), | ||
17 | }, | 18 | }, |
18 | typeof(WixBundleMspPackageSymbol)); | 19 | typeof(WixBundleMspPackageSymbol)); |
19 | } | 20 | } |
@@ -29,6 +30,7 @@ namespace WixToolset.Data.Symbols | |||
29 | PatchCode, | 30 | PatchCode, |
30 | Manufacturer, | 31 | Manufacturer, |
31 | PatchXml, | 32 | PatchXml, |
33 | RepairCondition, | ||
32 | } | 34 | } |
33 | 35 | ||
34 | [Flags] | 36 | [Flags] |
@@ -74,6 +76,12 @@ namespace WixToolset.Data.Symbols | |||
74 | set => this.Set((int)WixBundleMspPackageSymbolFields.PatchXml, value); | 76 | set => this.Set((int)WixBundleMspPackageSymbolFields.PatchXml, value); |
75 | } | 77 | } |
76 | 78 | ||
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; | 85 | public bool Slipstream => (this.Attributes & WixBundleMspPackageAttributes.Slipstream) == WixBundleMspPackageAttributes.Slipstream; |
78 | 86 | ||
79 | public bool TargetUnspecified => (this.Attributes & WixBundleMspPackageAttributes.TargetUnspecified) == WixBundleMspPackageAttributes.TargetUnspecified; | 87 | public bool TargetUnspecified => (this.Attributes & WixBundleMspPackageAttributes.TargetUnspecified) == WixBundleMspPackageAttributes.TargetUnspecified; |