From ed8fbdf2bfedca8981b6b352568a7303e791a5b5 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Thu, 14 May 2020 19:46:07 +1000
Subject: WIXFEAT:6164 Move DisplayInternalUI into BalExtension.

---
 .../Bundles/CreateBootstrapperApplicationManifestCommand.cs        | 4 ----
 src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs      | 2 --
 src/WixToolset.Core/Compiler_Bundle.cs                             | 7 -------
 3 files changed, 13 deletions(-)

diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
index cdab21fb..84c02ac9 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
@@ -126,8 +126,6 @@ namespace WixToolset.Core.Burn.Bundles
 
                 if (package.SpecificPackageTuple is WixBundleMsiPackageTuple msiPackage)
                 {
-                    writer.WriteAttributeString("DisplayInternalUI", msiPackage.DisplayInternalUI ? "yes" : "no");
-
                     if (!String.IsNullOrEmpty(msiPackage.ProductCode))
                     {
                         writer.WriteAttributeString("ProductCode", msiPackage.ProductCode);
@@ -140,8 +138,6 @@ namespace WixToolset.Core.Burn.Bundles
                 }
                 else if (package.SpecificPackageTuple is WixBundleMspPackageTuple mspPackage)
                 {
-                    writer.WriteAttributeString("DisplayInternalUI", mspPackage.DisplayInternalUI ? "yes" : "no");
-
                     if (!String.IsNullOrEmpty(mspPackage.PatchCode))
                     {
                         writer.WriteAttributeString("ProductCode", mspPackage.PatchCode);
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
index 205bd1f8..9453c7e3 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
@@ -410,7 +410,6 @@ namespace WixToolset.Core.Burn.Bundles
                         writer.WriteAttributeString("ProductCode", msiPackage.ProductCode);
                         writer.WriteAttributeString("Language", msiPackage.ProductLanguage.ToString(CultureInfo.InvariantCulture));
                         writer.WriteAttributeString("Version", msiPackage.ProductVersion);
-                        writer.WriteAttributeString("DisplayInternalUI", msiPackage.DisplayInternalUI ? "yes" : "no");
                         if (!String.IsNullOrEmpty(msiPackage.UpgradeCode))
                         {
                             writer.WriteAttributeString("UpgradeCode", msiPackage.UpgradeCode);
@@ -420,7 +419,6 @@ namespace WixToolset.Core.Burn.Bundles
                     {
                         writer.WriteAttributeString("PatchCode", mspPackage.PatchCode);
                         writer.WriteAttributeString("PatchXml", mspPackage.PatchXml);
-                        writer.WriteAttributeString("DisplayInternalUI", mspPackage.DisplayInternalUI ? "yes" : "no");
 
                         // If there is still a chance that all of our patches will target a narrow set of
                         // product codes, add the patch list to the overall list.
diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs
index a0fe1608..ee6866b9 100644
--- a/src/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/WixToolset.Core/Compiler_Bundle.cs
@@ -1735,7 +1735,6 @@ namespace WixToolset.Core
             string msuKB = null;
             var enableSignatureVerification = YesNoType.No;
             var compressed = YesNoDefaultType.Default;
-            var displayInternalUI = YesNoType.NotSet;
             var enableFeatureSelection = YesNoType.NotSet;
             var forcePerMachine = YesNoType.NotSet;
             RemotePayload remotePayload = null;
@@ -1805,10 +1804,6 @@ namespace WixToolset.Core
                     case "DisplayName":
                         displayName = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                         break;
-                    case "DisplayInternalUI":
-                        displayInternalUI = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
-                        allowed = (packageType == WixBundlePackageType.Msi || packageType == WixBundlePackageType.Msp);
-                        break;
                     case "EnableFeatureSelection":
                         enableFeatureSelection = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
                         allowed = (packageType == WixBundlePackageType.Msi);
@@ -2139,7 +2134,6 @@ namespace WixToolset.Core
 
                 case WixBundlePackageType.Msi:
                     WixBundleMsiPackageAttributes msiAttributes = 0;
-                    msiAttributes |= (YesNoType.Yes == displayInternalUI) ? WixBundleMsiPackageAttributes.DisplayInternalUI : 0;
                     msiAttributes |= (YesNoType.Yes == enableFeatureSelection) ? WixBundleMsiPackageAttributes.EnableFeatureSelection : 0;
                     msiAttributes |= (YesNoType.Yes == forcePerMachine) ? WixBundleMsiPackageAttributes.ForcePerMachine : 0;
 
@@ -2151,7 +2145,6 @@ namespace WixToolset.Core
 
                 case WixBundlePackageType.Msp:
                     WixBundleMspPackageAttributes mspAttributes = 0;
-                    mspAttributes |= (YesNoType.Yes == displayInternalUI) ? WixBundleMspPackageAttributes.DisplayInternalUI : 0;
                     mspAttributes |= (YesNoType.Yes == slipstream) ? WixBundleMspPackageAttributes.Slipstream : 0;
 
                     this.Core.AddTuple(new WixBundleMspPackageTuple(sourceLineNumbers, id)
-- 
cgit v1.2.3-55-g6feb