WIXFEAT:6164 Move DisplayInternalUI into BalExtension.
Sean Hall committed
May 14, 2020 at 19:46 UTC
ed8fbdf2bfedca8981b6b352568a7303e791a5b5
3 files changed
-13
src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
-4
@@ -126,8 +126,6 @@ namespace WixToolset.Core.Burn.Bundles
126
127
if (package.SpecificPackageTuple is WixBundleMsiPackageTuple msiPackage)
128
{
129
- writer.WriteAttributeString("DisplayInternalUI", msiPackage.DisplayInternalUI ? "yes" : "no");
130
-
129
if (!String.IsNullOrEmpty(msiPackage.ProductCode))
130
{
131
writer.WriteAttributeString("ProductCode", msiPackage.ProductCode);
@@ -140,8 +138,6 @@ namespace WixToolset.Core.Burn.Bundles
138
}
139
else if (package.SpecificPackageTuple is WixBundleMspPackageTuple mspPackage)
140
{
143
- writer.WriteAttributeString("DisplayInternalUI", mspPackage.DisplayInternalUI ? "yes" : "no");
144
-
141
if (!String.IsNullOrEmpty(mspPackage.PatchCode))
142
{
143
writer.WriteAttributeString("ProductCode", mspPackage.PatchCode);
src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
-2
@@ -410,7 +410,6 @@ namespace WixToolset.Core.Burn.Bundles
410
writer.WriteAttributeString("ProductCode", msiPackage.ProductCode);
411
writer.WriteAttributeString("Language", msiPackage.ProductLanguage.ToString(CultureInfo.InvariantCulture));
412
writer.WriteAttributeString("Version", msiPackage.ProductVersion);
413
- writer.WriteAttributeString("DisplayInternalUI", msiPackage.DisplayInternalUI ? "yes" : "no");
413
if (!String.IsNullOrEmpty(msiPackage.UpgradeCode))
414
{
415
writer.WriteAttributeString("UpgradeCode", msiPackage.UpgradeCode);
@@ -420,7 +419,6 @@ namespace WixToolset.Core.Burn.Bundles
419
{
420
writer.WriteAttributeString("PatchCode", mspPackage.PatchCode);
421
writer.WriteAttributeString("PatchXml", mspPackage.PatchXml);
423
- writer.WriteAttributeString("DisplayInternalUI", mspPackage.DisplayInternalUI ? "yes" : "no");
422
423
// If there is still a chance that all of our patches will target a narrow set of
424
// product codes, add the patch list to the overall list.
src/WixToolset.Core/Compiler_Bundle.cs
-7
@@ -1735,7 +1735,6 @@ namespace WixToolset.Core
1735
string msuKB = null;
1736
var enableSignatureVerification = YesNoType.No;
1737
var compressed = YesNoDefaultType.Default;
1738
- var displayInternalUI = YesNoType.NotSet;
1738
var enableFeatureSelection = YesNoType.NotSet;
1739
var forcePerMachine = YesNoType.NotSet;
1740
RemotePayload remotePayload = null;
@@ -1805,10 +1804,6 @@ namespace WixToolset.Core
1804
case "DisplayName":
1805
displayName = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
1806
break;
1808
- case "DisplayInternalUI":
1809
- displayInternalUI = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
1810
- allowed = (packageType == WixBundlePackageType.Msi || packageType == WixBundlePackageType.Msp);
1811
- break;
1807
case "EnableFeatureSelection":
1808
enableFeatureSelection = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
1809
allowed = (packageType == WixBundlePackageType.Msi);
@@ -2139,7 +2134,6 @@ namespace WixToolset.Core
2134
2135
case WixBundlePackageType.Msi:
2136
WixBundleMsiPackageAttributes msiAttributes = 0;
2142
- msiAttributes |= (YesNoType.Yes == displayInternalUI) ? WixBundleMsiPackageAttributes.DisplayInternalUI : 0;
2137
msiAttributes |= (YesNoType.Yes == enableFeatureSelection) ? WixBundleMsiPackageAttributes.EnableFeatureSelection : 0;
2138
msiAttributes |= (YesNoType.Yes == forcePerMachine) ? WixBundleMsiPackageAttributes.ForcePerMachine : 0;
2139
@@ -2151,7 +2145,6 @@ namespace WixToolset.Core
2145
2146
case WixBundlePackageType.Msp:
2147
WixBundleMspPackageAttributes mspAttributes = 0;
2154
- mspAttributes |= (YesNoType.Yes == displayInternalUI) ? WixBundleMspPackageAttributes.DisplayInternalUI : 0;
2148
mspAttributes |= (YesNoType.Yes == slipstream) ? WixBundleMspPackageAttributes.Slipstream : 0;
2149
2150
this.Core.AddTuple(new WixBundleMspPackageTuple(sourceLineNumbers, id)