From e576d34c3f88b5da033d2516d1c16b0df9491523 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 28 Sep 2017 00:16:57 -0700 Subject: Fix summary information codepage Turns out UTF-8 is not a supported codepage for summary information streams. Not completely surprising. --- src/WixToolset.Core/Common.cs | 2 +- src/WixToolset.Core/Compiler.cs | 4 ++-- 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 return -1; } - encoding = Encoding.GetEncoding(codePage); + encoding = CodePagesEncodingProvider.Instance.GetEncoding(codePage); } else { 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 private void ParsePackageElement(XElement node, string productAuthor, string moduleId) { SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); - string codepage = "65001"; + string codepage = "1252"; string comments = String.Format(CultureInfo.InvariantCulture, "This installer database contains the logic and data required to install {0}.", this.activeName); string keywords = "Installer"; int msiVersion = 100; // lowest released version, really should be specified @@ -11422,7 +11422,7 @@ namespace WixToolset private void ParsePatchInformationElement(XElement node) { SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); - string codepage = "65001"; + string codepage = "1252"; string comments = null; string keywords = "Installer,Patching,PCP,Database"; 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 @@ + -- cgit v1.2.3-55-g6feb