diff options
| author | Rob Mensching <rob@firegiant.com> | 2023-11-06 23:08:10 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2023-11-07 14:27:27 -0800 |
| commit | 2781774e3f67bad1bef68e6ed32ab301179de531 (patch) | |
| tree | f101bdfaae18282b7d70204badf92b7e3d9cb65d /src/api | |
| parent | 646f43b1258ec8f0f45b11ecaf7121b620b3b616 (diff) | |
| download | wix-2781774e3f67bad1bef68e6ed32ab301179de531.tar.gz wix-2781774e3f67bad1bef68e6ed32ab301179de531.tar.bz2 wix-2781774e3f67bad1bef68e6ed32ab301179de531.zip | |
Avoid use of Encoding.WindowsCodePage
Fixes 7612
Diffstat (limited to 'src/api')
| -rw-r--r-- | src/api/wix/WixToolset.Data/ErrorMessages.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/api/wix/WixToolset.Data/ErrorMessages.cs b/src/api/wix/WixToolset.Data/ErrorMessages.cs index bc63247e..77433e6d 100644 --- a/src/api/wix/WixToolset.Data/ErrorMessages.cs +++ b/src/api/wix/WixToolset.Data/ErrorMessages.cs | |||
| @@ -867,12 +867,12 @@ namespace WixToolset.Data | |||
| 867 | 867 | ||
| 868 | public static Message IllegalCodepage(int codepage) | 868 | public static Message IllegalCodepage(int codepage) |
| 869 | { | 869 | { |
| 870 | return Message(null, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, PatchCreation/@Codepage, or WixLocalization/@Codepage.", codepage); | 870 | return Message(null, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, or WixLocalization/@Codepage.", codepage); |
| 871 | } | 871 | } |
| 872 | 872 | ||
| 873 | public static Message IllegalCodepage(SourceLineNumber sourceLineNumbers, int codepage) | 873 | public static Message IllegalCodepage(SourceLineNumber sourceLineNumbers, int codepage) |
| 874 | { | 874 | { |
| 875 | return Message(sourceLineNumbers, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, PatchCreation/@Codepage, or WixLocalization/@Codepage.", codepage); | 875 | return Message(sourceLineNumbers, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, or WixLocalization/@Codepage.", codepage); |
| 876 | } | 876 | } |
| 877 | 877 | ||
| 878 | public static Message IllegalCodepageAttribute(SourceLineNumber sourceLineNumbers, string codepage, string elementName, string attributeName) | 878 | public static Message IllegalCodepageAttribute(SourceLineNumber sourceLineNumbers, string codepage, string elementName, string attributeName) |
| @@ -1318,7 +1318,7 @@ namespace WixToolset.Data | |||
| 1318 | 1318 | ||
| 1319 | public static Message InvalidStringForCodepage(SourceLineNumber sourceLineNumbers, string codepage) | 1319 | public static Message InvalidStringForCodepage(SourceLineNumber sourceLineNumbers, string codepage) |
| 1320 | { | 1320 | { |
| 1321 | return Message(sourceLineNumbers, Ids.InvalidStringForCodepage, "A string was provided with characters that are not available in the specified database code page '{0}'. Either change these characters to ones that exist in the database's code page, or update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, PatchCreation/@Codepage, or WixLocalization/@Codepage.", codepage); | 1321 | return Message(sourceLineNumbers, Ids.InvalidStringForCodepage, "A string was provided with characters that are not available in the specified database code page '{0}'. Either change these characters to ones that exist in the database's code page, or update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, or WixLocalization/@Codepage.", codepage); |
| 1322 | } | 1322 | } |
| 1323 | 1323 | ||
| 1324 | public static Message InvalidStubExe(string filename) | 1324 | public static Message InvalidStubExe(string filename) |