aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Data/ErrorMessages.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/WixToolset.Data/ErrorMessages.cs8
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)