diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-10-25 00:23:42 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-25 00:25:53 -0700 |
| commit | 6c1ae2593faab59e1a01c96794e0835a6fcd0626 (patch) | |
| tree | c15fcb9a1f1c5bec846ba61f1f3dcd9a152bf701 /src/WixToolset.Data/ErrorMessages.cs | |
| parent | 0078364515ba1f7570f43d47e43bd359918cafd0 (diff) | |
| download | wix-6c1ae2593faab59e1a01c96794e0835a6fcd0626.tar.gz wix-6c1ae2593faab59e1a01c96794e0835a6fcd0626.tar.bz2 wix-6c1ae2593faab59e1a01c96794e0835a6fcd0626.zip | |
Implement WixOutput with support for multiple streams of data
Diffstat (limited to 'src/WixToolset.Data/ErrorMessages.cs')
| -rw-r--r-- | src/WixToolset.Data/ErrorMessages.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/WixToolset.Data/ErrorMessages.cs b/src/WixToolset.Data/ErrorMessages.cs index 33cccdd2..3fa23a74 100644 --- a/src/WixToolset.Data/ErrorMessages.cs +++ b/src/WixToolset.Data/ErrorMessages.cs | |||
| @@ -198,9 +198,9 @@ namespace WixToolset.Data | |||
| 198 | return Message(sourceLineNumbers, Ids.ConditionExpected, "The {0} element's inner text cannot be an empty string or completely whitespace. If you don't want a condition, then simply remove the entire {0} element.", elementName); | 198 | return Message(sourceLineNumbers, Ids.ConditionExpected, "The {0} element's inner text cannot be an empty string or completely whitespace. If you don't want a condition, then simply remove the entire {0} element.", elementName); |
| 199 | } | 199 | } |
| 200 | 200 | ||
| 201 | public static Message CorruptFileFormat(string path, FileFormat format) | 201 | public static Message CorruptFileFormat(string path, string format) |
| 202 | { | 202 | { |
| 203 | return Message(null, Ids.CorruptFileFormat, "Attempted to load corrupt file from path: {0}. The file with format {1} contained unexpected content. Ensure the correct path was provided and that the file has not been incorrectly modified.", path, format.ToString().ToLowerInvariant()); | 203 | return Message(null, Ids.CorruptFileFormat, "Attempted to load corrupt file from path: {0}. The file with format {1} contained unexpected content. Ensure the correct path was provided and that the file has not been incorrectly modified.", path, format.ToLowerInvariant()); |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | public static Message CreateCabAddFileFailed() | 206 | public static Message CreateCabAddFileFailed() |
| @@ -2049,9 +2049,9 @@ namespace WixToolset.Data | |||
| 2049 | return Message(null, Ids.UnexpectedFileExtension, "The file '{0}' has an unexpected extension. Expected one of the following: '{1}'.", fileName, expectedExtensions); | 2049 | return Message(null, Ids.UnexpectedFileExtension, "The file '{0}' has an unexpected extension. Expected one of the following: '{1}'.", fileName, expectedExtensions); |
| 2050 | } | 2050 | } |
| 2051 | 2051 | ||
| 2052 | public static Message UnexpectedFileFormat(string path, FileFormat expectedFormat, FileFormat actualFormat) | 2052 | public static Message UnexpectedFileFormat(string path, string expectedFormat, string actualFormat) |
| 2053 | { | 2053 | { |
| 2054 | return Message(null, Ids.UnexpectedFileFormat, "Unexpected file format loaded from path: {0}. The file was expected to be a {1} but was actually: {2}. Ensure the correct path was provided.", path, expectedFormat.ToString().ToLowerInvariant(), actualFormat.ToString().ToLowerInvariant()); | 2054 | return Message(null, Ids.UnexpectedFileFormat, "Unexpected file format loaded from path: {0}. The file was expected to be a {1} but was actually: {2}. Ensure the correct path was provided.", path, expectedFormat.ToLowerInvariant(), actualFormat.ToLowerInvariant()); |
| 2055 | } | 2055 | } |
| 2056 | 2056 | ||
| 2057 | public static Message UnexpectedGroupChild(string parentType, string parentId, string childType, string childId) | 2057 | public static Message UnexpectedGroupChild(string parentType, string parentId, string childType, string childId) |
