aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-01-06 15:12:05 -0800
committerRob Mensching <rob@firegiant.com>2021-01-06 15:24:56 -0800
commitbf30546113c5f1ffc4cf917b560c5a0451eda37d (patch)
treea240d04f7a413593576fb1919a5c4d3a6a720480
parent0d1851c79901ba6ddbba9bb63f758760fe5be994 (diff)
downloadwix-bf30546113c5f1ffc4cf917b560c5a0451eda37d.tar.gz
wix-bf30546113c5f1ffc4cf917b560c5a0451eda37d.tar.bz2
wix-bf30546113c5f1ffc4cf917b560c5a0451eda37d.zip
Default MSI packages to compressed
-rw-r--r--src/WixToolset.Core/Compiler_2.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs
index 6fd1b3c8..d2a6bb83 100644
--- a/src/WixToolset.Core/Compiler_2.cs
+++ b/src/WixToolset.Core/Compiler_2.cs
@@ -26,6 +26,7 @@ namespace WixToolset.Core
26 private void ParsePackageElement(XElement node) 26 private void ParsePackageElement(XElement node)
27 { 27 {
28 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); 28 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
29 var compressed = YesNoDefaultType.Default;
29 var sourceBits = 0; 30 var sourceBits = 0;
30 var codepage = 65001; 31 var codepage = 65001;
31 var productCode = "*"; 32 var productCode = "*";
@@ -55,10 +56,7 @@ namespace WixToolset.Core
55 codepage = this.Core.GetAttributeCodePageValue(sourceLineNumbers, attrib); 56 codepage = this.Core.GetAttributeCodePageValue(sourceLineNumbers, attrib);
56 break; 57 break;
57 case "Compressed": 58 case "Compressed":
58 if (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib)) 59 compressed = this.Core.GetAttributeYesNoDefaultValue(sourceLineNumbers, attrib);
59 {
60 sourceBits |= 2;
61 }
62 break; 60 break;
63 case "InstallerVersion": 61 case "InstallerVersion":
64 msiVersion = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue); 62 msiVersion = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue);
@@ -160,6 +158,11 @@ namespace WixToolset.Core
160 this.Core.Write(ErrorMessages.InvalidProductVersion(sourceLineNumbers, version)); 158 this.Core.Write(ErrorMessages.InvalidProductVersion(sourceLineNumbers, version));
161 } 159 }
162 160
161 if (compressed != YesNoDefaultType.No)
162 {
163 sourceBits |= 2;
164 }
165
163 if (this.Core.EncounteredError) 166 if (this.Core.EncounteredError)
164 { 167 {
165 return; 168 return;