From c3c1d46cd8d833bc7d59ee52a5daf6210679ac05 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 14 May 2020 19:40:26 +1000 Subject: WIXFEAT:6164 Move DisplayInternalUI into BalExtension. --- src/WixToolset.Data/Serialize/wix.cs | 78 ---------------------- .../Tuples/WixBundleMsiPackageTuple.cs | 3 - .../Tuples/WixBundleMspPackageTuple.cs | 3 - 3 files changed, 84 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Data/Serialize/wix.cs b/src/WixToolset.Data/Serialize/wix.cs index 3ff83699..0daa7335 100644 --- a/src/WixToolset.Data/Serialize/wix.cs +++ b/src/WixToolset.Data/Serialize/wix.cs @@ -3772,10 +3772,6 @@ namespace WixToolset.Data.Serialize private bool enableSignatureVerificationFieldSet; - private YesNoType displayInternalUIField; - - private bool displayInternalUIFieldSet; - private YesNoType enableFeatureSelectionField; private bool enableFeatureSelectionFieldSet; @@ -4114,25 +4110,6 @@ namespace WixToolset.Data.Serialize } } - /// - /// Specifies whether the bundle will show the UI authored into the msi package. The default is "no" - /// which means all information is routed to the bootstrapper application to provide a unified installation - /// experience. If "yes" is specified the UI authored into the msi package will be displayed on top of - /// any bootstrapper application UI. - /// - public YesNoType DisplayInternalUI - { - get - { - return this.displayInternalUIField; - } - set - { - this.displayInternalUIFieldSet = true; - this.displayInternalUIField = value; - } - } - /// /// Specifies whether the bundle will allow individual control over the installation state of Features inside /// the msi package. Managing feature selection requires special care to ensure the install, modify, update and @@ -4389,17 +4366,6 @@ namespace WixToolset.Data.Serialize writer.WriteAttributeString("EnableSignatureVerification", "yes"); } } - if (this.displayInternalUIFieldSet) - { - if ((this.displayInternalUIField == YesNoType.no)) - { - writer.WriteAttributeString("DisplayInternalUI", "no"); - } - if ((this.displayInternalUIField == YesNoType.yes)) - { - writer.WriteAttributeString("DisplayInternalUI", "yes"); - } - } if (this.enableFeatureSelectionFieldSet) { if ((this.enableFeatureSelectionField == YesNoType.no)) @@ -4545,11 +4511,6 @@ namespace WixToolset.Data.Serialize this.enableSignatureVerificationField = Enums.ParseYesNoType(value); this.enableSignatureVerificationFieldSet = true; } - if (("DisplayInternalUI" == name)) - { - this.displayInternalUIField = Enums.ParseYesNoType(value); - this.displayInternalUIFieldSet = true; - } if (("EnableFeatureSelection" == name)) { this.enableFeatureSelectionField = Enums.ParseYesNoType(value); @@ -4650,10 +4611,6 @@ namespace WixToolset.Data.Serialize private bool enableSignatureVerificationFieldSet; - private YesNoType displayInternalUIField; - - private bool displayInternalUIFieldSet; - private YesNoDefaultType perMachineField; private bool perMachineFieldSet; @@ -4983,25 +4940,6 @@ namespace WixToolset.Data.Serialize } } - /// - /// Specifies whether the bundle will show the UI authored into the msp package. The default is "no" - /// which means all information is routed to the bootstrapper application to provide a unified installation - /// experience. If "yes" is specified the UI authored into the msp package will be displayed on top of - /// any bootstrapper application UI. - /// - public YesNoType DisplayInternalUI - { - get - { - return this.displayInternalUIField; - } - set - { - this.displayInternalUIFieldSet = true; - this.displayInternalUIField = value; - } - } - /// /// Indicates the package must be executed elevated. The default is "no". /// @@ -5216,17 +5154,6 @@ namespace WixToolset.Data.Serialize writer.WriteAttributeString("EnableSignatureVerification", "yes"); } } - if (this.displayInternalUIFieldSet) - { - if ((this.displayInternalUIField == YesNoType.no)) - { - writer.WriteAttributeString("DisplayInternalUI", "no"); - } - if ((this.displayInternalUIField == YesNoType.yes)) - { - writer.WriteAttributeString("DisplayInternalUI", "yes"); - } - } if (this.perMachineFieldSet) { if ((this.perMachineField == YesNoDefaultType.@default)) @@ -5354,11 +5281,6 @@ namespace WixToolset.Data.Serialize this.enableSignatureVerificationField = Enums.ParseYesNoType(value); this.enableSignatureVerificationFieldSet = true; } - if (("DisplayInternalUI" == name)) - { - this.displayInternalUIField = Enums.ParseYesNoType(value); - this.displayInternalUIFieldSet = true; - } if (("PerMachine" == name)) { this.perMachineField = Enums.ParseYesNoDefaultType(value); diff --git a/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs index 3a205376..163b56ae 100644 --- a/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs +++ b/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs @@ -40,7 +40,6 @@ namespace WixToolset.Data.Tuples [Flags] public enum WixBundleMsiPackageAttributes { - DisplayInternalUI = 0x1, EnableFeatureSelection = 0x4, ForcePerMachine = 0x2, } @@ -99,8 +98,6 @@ namespace WixToolset.Data.Tuples set => this.Set((int)WixBundleMsiPackageTupleFields.Manufacturer, value); } - public bool DisplayInternalUI => (this.Attributes & WixBundleMsiPackageAttributes.DisplayInternalUI) == WixBundleMsiPackageAttributes.DisplayInternalUI; - public bool EnableFeatureSelection => (this.Attributes & WixBundleMsiPackageAttributes.EnableFeatureSelection) == WixBundleMsiPackageAttributes.EnableFeatureSelection; public bool ForcePerMachine => (this.Attributes & WixBundleMsiPackageAttributes.ForcePerMachine) == WixBundleMsiPackageAttributes.ForcePerMachine; diff --git a/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs index 6c5cb38b..7e94ff25 100644 --- a/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs +++ b/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs @@ -34,7 +34,6 @@ namespace WixToolset.Data.Tuples [Flags] public enum WixBundleMspPackageAttributes { - DisplayInternalUI = 0x1, Slipstream = 0x2, TargetUnspecified = 0x4, } @@ -75,8 +74,6 @@ namespace WixToolset.Data.Tuples set => this.Set((int)WixBundleMspPackageTupleFields.PatchXml, value); } - public bool DisplayInternalUI => (this.Attributes & WixBundleMspPackageAttributes.DisplayInternalUI) == WixBundleMspPackageAttributes.DisplayInternalUI; - public bool Slipstream => (this.Attributes & WixBundleMspPackageAttributes.Slipstream) == WixBundleMspPackageAttributes.Slipstream; public bool TargetUnspecified => (this.Attributes & WixBundleMspPackageAttributes.TargetUnspecified) == WixBundleMspPackageAttributes.TargetUnspecified; -- cgit v1.2.3-55-g6feb