Fix summary information codepage
Turns out UTF-8 is not a supported codepage for summary information streams. Not completely surprising.
Rob Mensching committed
Sep 28, 2017 at 00:16 UTC
e576d34c3f88b5da033d2516d1c16b0df9491523
3 files changed
+4
-3
src/WixToolset.Core/Common.cs
+1
-1
@@ -191,7 +191,7 @@ namespace WixToolset
191
return -1;
192
}
193
194
- encoding = Encoding.GetEncoding(codePage);
194
+ encoding = CodePagesEncodingProvider.Instance.GetEncoding(codePage);
195
}
196
else
197
{
src/WixToolset.Core/Compiler.cs
+2
-2
@@ -10781,7 +10781,7 @@ namespace WixToolset
10781
private void ParsePackageElement(XElement node, string productAuthor, string moduleId)
10782
{
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);
10786
string keywords = "Installer";
10787
int msiVersion = 100; // lowest released version, really should be specified
@@ -11422,7 +11422,7 @@ namespace WixToolset
11422
private void ParsePatchInformationElement(XElement node)
11423
{
11424
SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
11425
- string codepage = "65001";
11425
+ string codepage = "1252";
11426
string comments = null;
11427
string keywords = "Installer,Patching,PCP,Database";
11428
int msiVersion = 1; // Should always be 1 for patches
src/WixToolset.Core/WixToolset.Core.csproj
+1
@@ -36,6 +36,7 @@
36
37
<ItemGroup>
38
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
39
+ <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
40
</ItemGroup>
41
42
<ItemGroup>