diff options
author | Rob Mensching <rob@firegiant.com> | 2017-09-28 00:16:57 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2017-09-28 00:16:57 -0700 |
commit | e576d34c3f88b5da033d2516d1c16b0df9491523 (patch) | |
tree | 2afd5eb805af8e3beded90bb4238debde1cd34dc | |
parent | 5d6c31d1f5e0b8a46f41d4f321e878adba156bb2 (diff) | |
download | wix-e576d34c3f88b5da033d2516d1c16b0df9491523.tar.gz wix-e576d34c3f88b5da033d2516d1c16b0df9491523.tar.bz2 wix-e576d34c3f88b5da033d2516d1c16b0df9491523.zip |
Fix summary information codepage
Turns out UTF-8 is not a supported codepage for summary information
streams. Not completely surprising.
-rw-r--r-- | src/WixToolset.Core/Common.cs | 2 | ||||
-rw-r--r-- | src/WixToolset.Core/Compiler.cs | 4 | ||||
-rw-r--r-- | src/WixToolset.Core/WixToolset.Core.csproj | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/WixToolset.Core/Common.cs b/src/WixToolset.Core/Common.cs index 0404de5e..a2881984 100644 --- a/src/WixToolset.Core/Common.cs +++ b/src/WixToolset.Core/Common.cs | |||
@@ -191,7 +191,7 @@ namespace WixToolset | |||
191 | return -1; | 191 | return -1; |
192 | } | 192 | } |
193 | 193 | ||
194 | encoding = Encoding.GetEncoding(codePage); | 194 | encoding = CodePagesEncodingProvider.Instance.GetEncoding(codePage); |
195 | } | 195 | } |
196 | else | 196 | else |
197 | { | 197 | { |
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 00618152..ed7cb60e 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
@@ -10781,7 +10781,7 @@ namespace WixToolset | |||
10781 | private void ParsePackageElement(XElement node, string productAuthor, string moduleId) | 10781 | private void ParsePackageElement(XElement node, string productAuthor, string moduleId) |
10782 | { | 10782 | { |
10783 | SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 10783 | SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
10784 | string codepage = "65001"; | 10784 | string codepage = "1252"; |
10785 | string comments = String.Format(CultureInfo.InvariantCulture, "This installer database contains the logic and data required to install {0}.", this.activeName); | 10785 | string comments = String.Format(CultureInfo.InvariantCulture, "This installer database contains the logic and data required to install {0}.", this.activeName); |
10786 | string keywords = "Installer"; | 10786 | string keywords = "Installer"; |
10787 | int msiVersion = 100; // lowest released version, really should be specified | 10787 | int msiVersion = 100; // lowest released version, really should be specified |
@@ -11422,7 +11422,7 @@ namespace WixToolset | |||
11422 | private void ParsePatchInformationElement(XElement node) | 11422 | private void ParsePatchInformationElement(XElement node) |
11423 | { | 11423 | { |
11424 | SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 11424 | SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
11425 | string codepage = "65001"; | 11425 | string codepage = "1252"; |
11426 | string comments = null; | 11426 | string comments = null; |
11427 | string keywords = "Installer,Patching,PCP,Database"; | 11427 | string keywords = "Installer,Patching,PCP,Database"; |
11428 | int msiVersion = 1; // Should always be 1 for patches | 11428 | int msiVersion = 1; // Should always be 1 for patches |
diff --git a/src/WixToolset.Core/WixToolset.Core.csproj b/src/WixToolset.Core/WixToolset.Core.csproj index de7f004e..20c9d84c 100644 --- a/src/WixToolset.Core/WixToolset.Core.csproj +++ b/src/WixToolset.Core/WixToolset.Core.csproj | |||
@@ -36,6 +36,7 @@ | |||
36 | 36 | ||
37 | <ItemGroup> | 37 | <ItemGroup> |
38 | <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" /> | 38 | <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" /> |
39 | <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" /> | ||
39 | </ItemGroup> | 40 | </ItemGroup> |
40 | 41 | ||
41 | <ItemGroup> | 42 | <ItemGroup> |