From d7af012f12bb22fa3e862d536c6906ad67316abc Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 20 Apr 2021 02:08:09 -0700 Subject: Undo RepairCondition until a more complete design is done --- src/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs | 8 -------- src/WixToolset.Data/Symbols/WixBundleMsiPackageSymbol.cs | 8 -------- src/WixToolset.Data/Symbols/WixBundleMspPackageSymbol.cs | 8 -------- 3 files changed, 24 deletions(-) diff --git a/src/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs b/src/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs index f377adca..8a8cff1b 100644 --- a/src/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs +++ b/src/WixToolset.Data/Symbols/WixBundleExePackageSymbol.cs @@ -16,7 +16,6 @@ namespace WixToolset.Data new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.RepairCommand), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.UninstallCommand), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.ExeProtocol), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.RepairCondition), IntermediateFieldType.String), }, typeof(WixBundleExePackageSymbol)); } @@ -34,7 +33,6 @@ namespace WixToolset.Data.Symbols RepairCommand, UninstallCommand, ExeProtocol, - RepairCondition, } [Flags] @@ -91,12 +89,6 @@ namespace WixToolset.Data.Symbols set => this.Set((int)WixBundleExePackageSymbolFields.ExeProtocol, value); } - public string RepairCondition - { - get => (string)this.Fields[(int)WixBundleExePackageSymbolFields.RepairCondition]; - set => this.Set((int)WixBundleExePackageSymbolFields.RepairCondition, value); - } - public bool Repairable => !String.IsNullOrEmpty(this.RepairCommand); } } diff --git a/src/WixToolset.Data/Symbols/WixBundleMsiPackageSymbol.cs b/src/WixToolset.Data/Symbols/WixBundleMsiPackageSymbol.cs index ef7ba34e..21735f64 100644 --- a/src/WixToolset.Data/Symbols/WixBundleMsiPackageSymbol.cs +++ b/src/WixToolset.Data/Symbols/WixBundleMsiPackageSymbol.cs @@ -17,7 +17,6 @@ namespace WixToolset.Data new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductLanguage), IntermediateFieldType.Number), new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductName), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.Manufacturer), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.RepairCondition), IntermediateFieldType.String), }, typeof(WixBundleMsiPackageSymbol)); } @@ -36,7 +35,6 @@ namespace WixToolset.Data.Symbols ProductLanguage, ProductName, Manufacturer, - RepairCondition, } [Flags] @@ -100,12 +98,6 @@ namespace WixToolset.Data.Symbols set => this.Set((int)WixBundleMsiPackageSymbolFields.Manufacturer, value); } - public string RepairCondition - { - get => (string)this.Fields[(int)WixBundleMsiPackageSymbolFields.RepairCondition]; - set => this.Set((int)WixBundleMsiPackageSymbolFields.RepairCondition, value); - } - public bool EnableFeatureSelection => (this.Attributes & WixBundleMsiPackageAttributes.EnableFeatureSelection) == WixBundleMsiPackageAttributes.EnableFeatureSelection; 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 d4aa19a2..3784c2ff 100644 --- a/src/WixToolset.Data/Symbols/WixBundleMspPackageSymbol.cs +++ b/src/WixToolset.Data/Symbols/WixBundleMspPackageSymbol.cs @@ -14,7 +14,6 @@ namespace WixToolset.Data new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.PatchCode), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.Manufacturer), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.PatchXml), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.RepairCondition), IntermediateFieldType.String), }, typeof(WixBundleMspPackageSymbol)); } @@ -30,7 +29,6 @@ namespace WixToolset.Data.Symbols PatchCode, Manufacturer, PatchXml, - RepairCondition, } [Flags] @@ -76,12 +74,6 @@ namespace WixToolset.Data.Symbols set => this.Set((int)WixBundleMspPackageSymbolFields.PatchXml, value); } - public string RepairCondition - { - get => (string)this.Fields[(int)WixBundleMspPackageSymbolFields.RepairCondition]; - set => this.Set((int)WixBundleMspPackageSymbolFields.RepairCondition, value); - } - public bool Slipstream => (this.Attributes & WixBundleMspPackageAttributes.Slipstream) == WixBundleMspPackageAttributes.Slipstream; public bool TargetUnspecified => (this.Attributes & WixBundleMspPackageAttributes.TargetUnspecified) == WixBundleMspPackageAttributes.TargetUnspecified; -- cgit v1.2.3-55-g6feb