aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Compiler_Bundle.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/Compiler_Bundle.cs')
-rw-r--r--src/WixToolset.Core/Compiler_Bundle.cs7
1 files changed, 0 insertions, 7 deletions
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)