WIXFEAT:6164 Move DisplayInternalUI into BalExtension.
Sean Hall committed
May 14, 2020 at 19:40 UTC
c3c1d46cd8d833bc7d59ee52a5daf6210679ac05
3 files changed
-84
src/WixToolset.Data/Serialize/wix.cs
-78
@@ -3772,10 +3772,6 @@ namespace WixToolset.Data.Serialize
3772
3773
private bool enableSignatureVerificationFieldSet;
3774
3775
- private YesNoType displayInternalUIField;
3776
-
3777
- private bool displayInternalUIFieldSet;
3778
-
3775
private YesNoType enableFeatureSelectionField;
3776
3777
private bool enableFeatureSelectionFieldSet;
@@ -4114,25 +4110,6 @@ namespace WixToolset.Data.Serialize
4110
}
4111
}
4112
4117
- /// <summary>
4118
- /// Specifies whether the bundle will show the UI authored into the msi package. The default is "no"
4119
- /// which means all information is routed to the bootstrapper application to provide a unified installation
4120
- /// experience. If "yes" is specified the UI authored into the msi package will be displayed on top of
4121
- /// any bootstrapper application UI.
4122
- /// </summary>
4123
- public YesNoType DisplayInternalUI
4124
- {
4125
- get
4126
- {
4127
- return this.displayInternalUIField;
4128
- }
4129
- set
4130
- {
4131
- this.displayInternalUIFieldSet = true;
4132
- this.displayInternalUIField = value;
4133
- }
4134
- }
4135
-
4113
/// <summary>
4114
/// Specifies whether the bundle will allow individual control over the installation state of Features inside
4115
/// the msi package. Managing feature selection requires special care to ensure the install, modify, update and
@@ -4389,17 +4366,6 @@ namespace WixToolset.Data.Serialize
4366
writer.WriteAttributeString("EnableSignatureVerification", "yes");
4367
}
4368
}
4392
- if (this.displayInternalUIFieldSet)
4393
- {
4394
- if ((this.displayInternalUIField == YesNoType.no))
4395
- {
4396
- writer.WriteAttributeString("DisplayInternalUI", "no");
4397
- }
4398
- if ((this.displayInternalUIField == YesNoType.yes))
4399
- {
4400
- writer.WriteAttributeString("DisplayInternalUI", "yes");
4401
- }
4402
- }
4369
if (this.enableFeatureSelectionFieldSet)
4370
{
4371
if ((this.enableFeatureSelectionField == YesNoType.no))
@@ -4545,11 +4511,6 @@ namespace WixToolset.Data.Serialize
4511
this.enableSignatureVerificationField = Enums.ParseYesNoType(value);
4512
this.enableSignatureVerificationFieldSet = true;
4513
}
4548
- if (("DisplayInternalUI" == name))
4549
- {
4550
- this.displayInternalUIField = Enums.ParseYesNoType(value);
4551
- this.displayInternalUIFieldSet = true;
4552
- }
4514
if (("EnableFeatureSelection" == name))
4515
{
4516
this.enableFeatureSelectionField = Enums.ParseYesNoType(value);
@@ -4650,10 +4611,6 @@ namespace WixToolset.Data.Serialize
4611
4612
private bool enableSignatureVerificationFieldSet;
4613
4653
- private YesNoType displayInternalUIField;
4654
-
4655
- private bool displayInternalUIFieldSet;
4656
-
4614
private YesNoDefaultType perMachineField;
4615
4616
private bool perMachineFieldSet;
@@ -4983,25 +4940,6 @@ namespace WixToolset.Data.Serialize
4940
}
4941
}
4942
4986
- /// <summary>
4987
- /// Specifies whether the bundle will show the UI authored into the msp package. The default is "no"
4988
- /// which means all information is routed to the bootstrapper application to provide a unified installation
4989
- /// experience. If "yes" is specified the UI authored into the msp package will be displayed on top of
4990
- /// any bootstrapper application UI.
4991
- /// </summary>
4992
- public YesNoType DisplayInternalUI
4993
- {
4994
- get
4995
- {
4996
- return this.displayInternalUIField;
4997
- }
4998
- set
4999
- {
5000
- this.displayInternalUIFieldSet = true;
5001
- this.displayInternalUIField = value;
5002
- }
5003
- }
5004
-
4943
/// <summary>
4944
/// Indicates the package must be executed elevated. The default is "no".
4945
/// </summary>
@@ -5216,17 +5154,6 @@ namespace WixToolset.Data.Serialize
5154
writer.WriteAttributeString("EnableSignatureVerification", "yes");
5155
}
5156
}
5219
- if (this.displayInternalUIFieldSet)
5220
- {
5221
- if ((this.displayInternalUIField == YesNoType.no))
5222
- {
5223
- writer.WriteAttributeString("DisplayInternalUI", "no");
5224
- }
5225
- if ((this.displayInternalUIField == YesNoType.yes))
5226
- {
5227
- writer.WriteAttributeString("DisplayInternalUI", "yes");
5228
- }
5229
- }
5157
if (this.perMachineFieldSet)
5158
{
5159
if ((this.perMachineField == YesNoDefaultType.@default))
@@ -5354,11 +5281,6 @@ namespace WixToolset.Data.Serialize
5281
this.enableSignatureVerificationField = Enums.ParseYesNoType(value);
5282
this.enableSignatureVerificationFieldSet = true;
5283
}
5357
- if (("DisplayInternalUI" == name))
5358
- {
5359
- this.displayInternalUIField = Enums.ParseYesNoType(value);
5360
- this.displayInternalUIFieldSet = true;
5361
- }
5284
if (("PerMachine" == name))
5285
{
5286
this.perMachineField = Enums.ParseYesNoDefaultType(value);
src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
-3
@@ -40,7 +40,6 @@ namespace WixToolset.Data.Tuples
40
[Flags]
41
public enum WixBundleMsiPackageAttributes
42
{
43
- DisplayInternalUI = 0x1,
43
EnableFeatureSelection = 0x4,
44
ForcePerMachine = 0x2,
45
}
@@ -99,8 +98,6 @@ namespace WixToolset.Data.Tuples
98
set => this.Set((int)WixBundleMsiPackageTupleFields.Manufacturer, value);
99
}
100
102
- public bool DisplayInternalUI => (this.Attributes & WixBundleMsiPackageAttributes.DisplayInternalUI) == WixBundleMsiPackageAttributes.DisplayInternalUI;
103
-
101
public bool EnableFeatureSelection => (this.Attributes & WixBundleMsiPackageAttributes.EnableFeatureSelection) == WixBundleMsiPackageAttributes.EnableFeatureSelection;
102
103
public bool ForcePerMachine => (this.Attributes & WixBundleMsiPackageAttributes.ForcePerMachine) == WixBundleMsiPackageAttributes.ForcePerMachine;
src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
-3
@@ -34,7 +34,6 @@ namespace WixToolset.Data.Tuples
34
[Flags]
35
public enum WixBundleMspPackageAttributes
36
{
37
- DisplayInternalUI = 0x1,
37
Slipstream = 0x2,
38
TargetUnspecified = 0x4,
39
}
@@ -75,8 +74,6 @@ namespace WixToolset.Data.Tuples
74
set => this.Set((int)WixBundleMspPackageTupleFields.PatchXml, value);
75
}
76
78
- public bool DisplayInternalUI => (this.Attributes & WixBundleMspPackageAttributes.DisplayInternalUI) == WixBundleMspPackageAttributes.DisplayInternalUI;
79
-
77
public bool Slipstream => (this.Attributes & WixBundleMspPackageAttributes.Slipstream) == WixBundleMspPackageAttributes.Slipstream;
78
79
public bool TargetUnspecified => (this.Attributes & WixBundleMspPackageAttributes.TargetUnspecified) == WixBundleMspPackageAttributes.TargetUnspecified;