diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-14 19:40:26 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-16 21:29:09 +1000 |
| commit | c3c1d46cd8d833bc7d59ee52a5daf6210679ac05 (patch) | |
| tree | 60ebd22b64262343211e74445ed6af61d611d3b5 /src | |
| parent | 20e2190443f2e47dae1cb8c6fc1abb4d2e213e6b (diff) | |
| download | wix-c3c1d46cd8d833bc7d59ee52a5daf6210679ac05.tar.gz wix-c3c1d46cd8d833bc7d59ee52a5daf6210679ac05.tar.bz2 wix-c3c1d46cd8d833bc7d59ee52a5daf6210679ac05.zip | |
WIXFEAT:6164 Move DisplayInternalUI into BalExtension.
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Data/Serialize/wix.cs | 78 | ||||
| -rw-r--r-- | src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs | 3 | ||||
| -rw-r--r-- | src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs | 3 |
3 files changed, 0 insertions, 84 deletions
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 | |||
| 3772 | 3772 | ||
| 3773 | private bool enableSignatureVerificationFieldSet; | 3773 | private bool enableSignatureVerificationFieldSet; |
| 3774 | 3774 | ||
| 3775 | private YesNoType displayInternalUIField; | ||
| 3776 | |||
| 3777 | private bool displayInternalUIFieldSet; | ||
| 3778 | |||
| 3779 | private YesNoType enableFeatureSelectionField; | 3775 | private YesNoType enableFeatureSelectionField; |
| 3780 | 3776 | ||
| 3781 | private bool enableFeatureSelectionFieldSet; | 3777 | private bool enableFeatureSelectionFieldSet; |
| @@ -4115,25 +4111,6 @@ namespace WixToolset.Data.Serialize | |||
| 4115 | } | 4111 | } |
| 4116 | 4112 | ||
| 4117 | /// <summary> | 4113 | /// <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 | |||
| 4136 | /// <summary> | ||
| 4137 | /// Specifies whether the bundle will allow individual control over the installation state of Features inside | 4114 | /// Specifies whether the bundle will allow individual control over the installation state of Features inside |
| 4138 | /// the msi package. Managing feature selection requires special care to ensure the install, modify, update and | 4115 | /// the msi package. Managing feature selection requires special care to ensure the install, modify, update and |
| 4139 | /// uninstall behavior of the package is always correct. The default is "no". | 4116 | /// uninstall behavior of the package is always correct. The default is "no". |
| @@ -4389,17 +4366,6 @@ namespace WixToolset.Data.Serialize | |||
| 4389 | writer.WriteAttributeString("EnableSignatureVerification", "yes"); | 4366 | writer.WriteAttributeString("EnableSignatureVerification", "yes"); |
| 4390 | } | 4367 | } |
| 4391 | } | 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 | } | ||
| 4403 | if (this.enableFeatureSelectionFieldSet) | 4369 | if (this.enableFeatureSelectionFieldSet) |
| 4404 | { | 4370 | { |
| 4405 | if ((this.enableFeatureSelectionField == YesNoType.no)) | 4371 | if ((this.enableFeatureSelectionField == YesNoType.no)) |
| @@ -4545,11 +4511,6 @@ namespace WixToolset.Data.Serialize | |||
| 4545 | this.enableSignatureVerificationField = Enums.ParseYesNoType(value); | 4511 | this.enableSignatureVerificationField = Enums.ParseYesNoType(value); |
| 4546 | this.enableSignatureVerificationFieldSet = true; | 4512 | this.enableSignatureVerificationFieldSet = true; |
| 4547 | } | 4513 | } |
| 4548 | if (("DisplayInternalUI" == name)) | ||
| 4549 | { | ||
| 4550 | this.displayInternalUIField = Enums.ParseYesNoType(value); | ||
| 4551 | this.displayInternalUIFieldSet = true; | ||
| 4552 | } | ||
| 4553 | if (("EnableFeatureSelection" == name)) | 4514 | if (("EnableFeatureSelection" == name)) |
| 4554 | { | 4515 | { |
| 4555 | this.enableFeatureSelectionField = Enums.ParseYesNoType(value); | 4516 | this.enableFeatureSelectionField = Enums.ParseYesNoType(value); |
| @@ -4650,10 +4611,6 @@ namespace WixToolset.Data.Serialize | |||
| 4650 | 4611 | ||
| 4651 | private bool enableSignatureVerificationFieldSet; | 4612 | private bool enableSignatureVerificationFieldSet; |
| 4652 | 4613 | ||
| 4653 | private YesNoType displayInternalUIField; | ||
| 4654 | |||
| 4655 | private bool displayInternalUIFieldSet; | ||
| 4656 | |||
| 4657 | private YesNoDefaultType perMachineField; | 4614 | private YesNoDefaultType perMachineField; |
| 4658 | 4615 | ||
| 4659 | private bool perMachineFieldSet; | 4616 | private bool perMachineFieldSet; |
| @@ -4984,25 +4941,6 @@ namespace WixToolset.Data.Serialize | |||
| 4984 | } | 4941 | } |
| 4985 | 4942 | ||
| 4986 | /// <summary> | 4943 | /// <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 | |||
| 5005 | /// <summary> | ||
| 5006 | /// Indicates the package must be executed elevated. The default is "no". | 4944 | /// Indicates the package must be executed elevated. The default is "no". |
| 5007 | /// </summary> | 4945 | /// </summary> |
| 5008 | public YesNoDefaultType PerMachine | 4946 | public YesNoDefaultType PerMachine |
| @@ -5216,17 +5154,6 @@ namespace WixToolset.Data.Serialize | |||
| 5216 | writer.WriteAttributeString("EnableSignatureVerification", "yes"); | 5154 | writer.WriteAttributeString("EnableSignatureVerification", "yes"); |
| 5217 | } | 5155 | } |
| 5218 | } | 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 | } | ||
| 5230 | if (this.perMachineFieldSet) | 5157 | if (this.perMachineFieldSet) |
| 5231 | { | 5158 | { |
| 5232 | if ((this.perMachineField == YesNoDefaultType.@default)) | 5159 | if ((this.perMachineField == YesNoDefaultType.@default)) |
| @@ -5354,11 +5281,6 @@ namespace WixToolset.Data.Serialize | |||
| 5354 | this.enableSignatureVerificationField = Enums.ParseYesNoType(value); | 5281 | this.enableSignatureVerificationField = Enums.ParseYesNoType(value); |
| 5355 | this.enableSignatureVerificationFieldSet = true; | 5282 | this.enableSignatureVerificationFieldSet = true; |
| 5356 | } | 5283 | } |
| 5357 | if (("DisplayInternalUI" == name)) | ||
| 5358 | { | ||
| 5359 | this.displayInternalUIField = Enums.ParseYesNoType(value); | ||
| 5360 | this.displayInternalUIFieldSet = true; | ||
| 5361 | } | ||
| 5362 | if (("PerMachine" == name)) | 5284 | if (("PerMachine" == name)) |
| 5363 | { | 5285 | { |
| 5364 | this.perMachineField = Enums.ParseYesNoDefaultType(value); | 5286 | 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 | |||
| 40 | [Flags] | 40 | [Flags] |
| 41 | public enum WixBundleMsiPackageAttributes | 41 | public enum WixBundleMsiPackageAttributes |
| 42 | { | 42 | { |
| 43 | DisplayInternalUI = 0x1, | ||
| 44 | EnableFeatureSelection = 0x4, | 43 | EnableFeatureSelection = 0x4, |
| 45 | ForcePerMachine = 0x2, | 44 | ForcePerMachine = 0x2, |
| 46 | } | 45 | } |
| @@ -99,8 +98,6 @@ namespace WixToolset.Data.Tuples | |||
| 99 | set => this.Set((int)WixBundleMsiPackageTupleFields.Manufacturer, value); | 98 | set => this.Set((int)WixBundleMsiPackageTupleFields.Manufacturer, value); |
| 100 | } | 99 | } |
| 101 | 100 | ||
| 102 | public bool DisplayInternalUI => (this.Attributes & WixBundleMsiPackageAttributes.DisplayInternalUI) == WixBundleMsiPackageAttributes.DisplayInternalUI; | ||
| 103 | |||
| 104 | public bool EnableFeatureSelection => (this.Attributes & WixBundleMsiPackageAttributes.EnableFeatureSelection) == WixBundleMsiPackageAttributes.EnableFeatureSelection; | 101 | public bool EnableFeatureSelection => (this.Attributes & WixBundleMsiPackageAttributes.EnableFeatureSelection) == WixBundleMsiPackageAttributes.EnableFeatureSelection; |
| 105 | 102 | ||
| 106 | public bool ForcePerMachine => (this.Attributes & WixBundleMsiPackageAttributes.ForcePerMachine) == WixBundleMsiPackageAttributes.ForcePerMachine; | 103 | 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 | |||
| 34 | [Flags] | 34 | [Flags] |
| 35 | public enum WixBundleMspPackageAttributes | 35 | public enum WixBundleMspPackageAttributes |
| 36 | { | 36 | { |
| 37 | DisplayInternalUI = 0x1, | ||
| 38 | Slipstream = 0x2, | 37 | Slipstream = 0x2, |
| 39 | TargetUnspecified = 0x4, | 38 | TargetUnspecified = 0x4, |
| 40 | } | 39 | } |
| @@ -75,8 +74,6 @@ namespace WixToolset.Data.Tuples | |||
| 75 | set => this.Set((int)WixBundleMspPackageTupleFields.PatchXml, value); | 74 | set => this.Set((int)WixBundleMspPackageTupleFields.PatchXml, value); |
| 76 | } | 75 | } |
| 77 | 76 | ||
| 78 | public bool DisplayInternalUI => (this.Attributes & WixBundleMspPackageAttributes.DisplayInternalUI) == WixBundleMspPackageAttributes.DisplayInternalUI; | ||
| 79 | |||
| 80 | public bool Slipstream => (this.Attributes & WixBundleMspPackageAttributes.Slipstream) == WixBundleMspPackageAttributes.Slipstream; | 77 | public bool Slipstream => (this.Attributes & WixBundleMspPackageAttributes.Slipstream) == WixBundleMspPackageAttributes.Slipstream; |
| 81 | 78 | ||
| 82 | public bool TargetUnspecified => (this.Attributes & WixBundleMspPackageAttributes.TargetUnspecified) == WixBundleMspPackageAttributes.TargetUnspecified; | 79 | public bool TargetUnspecified => (this.Attributes & WixBundleMspPackageAttributes.TargetUnspecified) == WixBundleMspPackageAttributes.TargetUnspecified; |
