diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-14 19:46:07 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-16 21:33:56 +1000 |
commit | ed8fbdf2bfedca8981b6b352568a7303e791a5b5 (patch) | |
tree | 551e36a369f05a6549211172bdcbb1bc53acd0d4 /src | |
parent | 61d92179d024a55351903e17ee18a6126ab65f83 (diff) | |
download | wix-ed8fbdf2bfedca8981b6b352568a7303e791a5b5.tar.gz wix-ed8fbdf2bfedca8981b6b352568a7303e791a5b5.tar.bz2 wix-ed8fbdf2bfedca8981b6b352568a7303e791a5b5.zip |
WIXFEAT:6164 Move DisplayInternalUI into BalExtension.
Diffstat (limited to 'src')
3 files changed, 0 insertions, 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 | |||
126 | 126 | ||
127 | if (package.SpecificPackageTuple is WixBundleMsiPackageTuple msiPackage) | 127 | if (package.SpecificPackageTuple is WixBundleMsiPackageTuple msiPackage) |
128 | { | 128 | { |
129 | writer.WriteAttributeString("DisplayInternalUI", msiPackage.DisplayInternalUI ? "yes" : "no"); | ||
130 | |||
131 | if (!String.IsNullOrEmpty(msiPackage.ProductCode)) | 129 | if (!String.IsNullOrEmpty(msiPackage.ProductCode)) |
132 | { | 130 | { |
133 | writer.WriteAttributeString("ProductCode", msiPackage.ProductCode); | 131 | writer.WriteAttributeString("ProductCode", msiPackage.ProductCode); |
@@ -140,8 +138,6 @@ namespace WixToolset.Core.Burn.Bundles | |||
140 | } | 138 | } |
141 | else if (package.SpecificPackageTuple is WixBundleMspPackageTuple mspPackage) | 139 | else if (package.SpecificPackageTuple is WixBundleMspPackageTuple mspPackage) |
142 | { | 140 | { |
143 | writer.WriteAttributeString("DisplayInternalUI", mspPackage.DisplayInternalUI ? "yes" : "no"); | ||
144 | |||
145 | if (!String.IsNullOrEmpty(mspPackage.PatchCode)) | 141 | if (!String.IsNullOrEmpty(mspPackage.PatchCode)) |
146 | { | 142 | { |
147 | writer.WriteAttributeString("ProductCode", mspPackage.PatchCode); | 143 | 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 | |||
410 | writer.WriteAttributeString("ProductCode", msiPackage.ProductCode); | 410 | writer.WriteAttributeString("ProductCode", msiPackage.ProductCode); |
411 | writer.WriteAttributeString("Language", msiPackage.ProductLanguage.ToString(CultureInfo.InvariantCulture)); | 411 | writer.WriteAttributeString("Language", msiPackage.ProductLanguage.ToString(CultureInfo.InvariantCulture)); |
412 | writer.WriteAttributeString("Version", msiPackage.ProductVersion); | 412 | writer.WriteAttributeString("Version", msiPackage.ProductVersion); |
413 | writer.WriteAttributeString("DisplayInternalUI", msiPackage.DisplayInternalUI ? "yes" : "no"); | ||
414 | if (!String.IsNullOrEmpty(msiPackage.UpgradeCode)) | 413 | if (!String.IsNullOrEmpty(msiPackage.UpgradeCode)) |
415 | { | 414 | { |
416 | writer.WriteAttributeString("UpgradeCode", msiPackage.UpgradeCode); | 415 | writer.WriteAttributeString("UpgradeCode", msiPackage.UpgradeCode); |
@@ -420,7 +419,6 @@ namespace WixToolset.Core.Burn.Bundles | |||
420 | { | 419 | { |
421 | writer.WriteAttributeString("PatchCode", mspPackage.PatchCode); | 420 | writer.WriteAttributeString("PatchCode", mspPackage.PatchCode); |
422 | writer.WriteAttributeString("PatchXml", mspPackage.PatchXml); | 421 | writer.WriteAttributeString("PatchXml", mspPackage.PatchXml); |
423 | writer.WriteAttributeString("DisplayInternalUI", mspPackage.DisplayInternalUI ? "yes" : "no"); | ||
424 | 422 | ||
425 | // If there is still a chance that all of our patches will target a narrow set of | 423 | // If there is still a chance that all of our patches will target a narrow set of |
426 | // product codes, add the patch list to the overall list. | 424 | // 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 | |||
1735 | string msuKB = null; | 1735 | string msuKB = null; |
1736 | var enableSignatureVerification = YesNoType.No; | 1736 | var enableSignatureVerification = YesNoType.No; |
1737 | var compressed = YesNoDefaultType.Default; | 1737 | var compressed = YesNoDefaultType.Default; |
1738 | var displayInternalUI = YesNoType.NotSet; | ||
1739 | var enableFeatureSelection = YesNoType.NotSet; | 1738 | var enableFeatureSelection = YesNoType.NotSet; |
1740 | var forcePerMachine = YesNoType.NotSet; | 1739 | var forcePerMachine = YesNoType.NotSet; |
1741 | RemotePayload remotePayload = null; | 1740 | RemotePayload remotePayload = null; |
@@ -1805,10 +1804,6 @@ namespace WixToolset.Core | |||
1805 | case "DisplayName": | 1804 | case "DisplayName": |
1806 | displayName = this.Core.GetAttributeValue(sourceLineNumbers, attrib); | 1805 | displayName = this.Core.GetAttributeValue(sourceLineNumbers, attrib); |
1807 | break; | 1806 | break; |
1808 | case "DisplayInternalUI": | ||
1809 | displayInternalUI = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); | ||
1810 | allowed = (packageType == WixBundlePackageType.Msi || packageType == WixBundlePackageType.Msp); | ||
1811 | break; | ||
1812 | case "EnableFeatureSelection": | 1807 | case "EnableFeatureSelection": |
1813 | enableFeatureSelection = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); | 1808 | enableFeatureSelection = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); |
1814 | allowed = (packageType == WixBundlePackageType.Msi); | 1809 | allowed = (packageType == WixBundlePackageType.Msi); |
@@ -2139,7 +2134,6 @@ namespace WixToolset.Core | |||
2139 | 2134 | ||
2140 | case WixBundlePackageType.Msi: | 2135 | case WixBundlePackageType.Msi: |
2141 | WixBundleMsiPackageAttributes msiAttributes = 0; | 2136 | WixBundleMsiPackageAttributes msiAttributes = 0; |
2142 | msiAttributes |= (YesNoType.Yes == displayInternalUI) ? WixBundleMsiPackageAttributes.DisplayInternalUI : 0; | ||
2143 | msiAttributes |= (YesNoType.Yes == enableFeatureSelection) ? WixBundleMsiPackageAttributes.EnableFeatureSelection : 0; | 2137 | msiAttributes |= (YesNoType.Yes == enableFeatureSelection) ? WixBundleMsiPackageAttributes.EnableFeatureSelection : 0; |
2144 | msiAttributes |= (YesNoType.Yes == forcePerMachine) ? WixBundleMsiPackageAttributes.ForcePerMachine : 0; | 2138 | msiAttributes |= (YesNoType.Yes == forcePerMachine) ? WixBundleMsiPackageAttributes.ForcePerMachine : 0; |
2145 | 2139 | ||
@@ -2151,7 +2145,6 @@ namespace WixToolset.Core | |||
2151 | 2145 | ||
2152 | case WixBundlePackageType.Msp: | 2146 | case WixBundlePackageType.Msp: |
2153 | WixBundleMspPackageAttributes mspAttributes = 0; | 2147 | WixBundleMspPackageAttributes mspAttributes = 0; |
2154 | mspAttributes |= (YesNoType.Yes == displayInternalUI) ? WixBundleMspPackageAttributes.DisplayInternalUI : 0; | ||
2155 | mspAttributes |= (YesNoType.Yes == slipstream) ? WixBundleMspPackageAttributes.Slipstream : 0; | 2148 | mspAttributes |= (YesNoType.Yes == slipstream) ? WixBundleMspPackageAttributes.Slipstream : 0; |
2156 | 2149 | ||
2157 | this.Core.AddTuple(new WixBundleMspPackageTuple(sourceLineNumbers, id) | 2150 | this.Core.AddTuple(new WixBundleMspPackageTuple(sourceLineNumbers, id) |