From 2baff8dcce00fea541028dc927f34eb57641e47d Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 16 Dec 2020 18:24:32 -0600 Subject: Add warning for PathCanonicalized. --- src/WixToolset.Data/ErrorMessages.cs | 2 +- src/WixToolset.Data/WarningMessages.cs | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/WixToolset.Data/ErrorMessages.cs b/src/WixToolset.Data/ErrorMessages.cs index 61bc72af..9e051e00 100644 --- a/src/WixToolset.Data/ErrorMessages.cs +++ b/src/WixToolset.Data/ErrorMessages.cs @@ -1676,7 +1676,7 @@ namespace WixToolset.Data public static Message PayloadMustBeRelativeToCache(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue) { - return Message(sourceLineNumbers, Ids.PayloadMustBeRelativeToCache, "The {0}/@{1} attribute's value, '{2}', is not a legal path name: Payload names must be relative to their cache directory and cannot contain '..'.", elementName, attributeName, attributeValue); + return Message(sourceLineNumbers, Ids.PayloadMustBeRelativeToCache, "The {0}/@{1} attribute's value, '{2}', is not a relative path.", elementName, attributeName, attributeValue); } public static Message PerUserButAllUsersEquals1(SourceLineNumber sourceLineNumbers, string path) diff --git a/src/WixToolset.Data/WarningMessages.cs b/src/WixToolset.Data/WarningMessages.cs index 2deaeb7d..a1df1282 100644 --- a/src/WixToolset.Data/WarningMessages.cs +++ b/src/WixToolset.Data/WarningMessages.cs @@ -442,6 +442,11 @@ namespace WixToolset.Data return Message(sourceLineNumbers, Ids.PatchTable, "The {0} table is added to the install package by a transform from a patch package (.msp) and not authored directly into an install package (.msi). The information in this table will be left out of the decompiled output.", tableName); } + public static Message PathCanonicalized(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string originalValue, string canonicalValue) + { + return Message(sourceLineNumbers, Ids.PathCanonicalized, "The {0}/@{1} attribute's value, '{2}', has been canonicalized to '{3}'.", elementName, attributeName, originalValue, canonicalValue); + } + public static Message PerUserButForcingPerMachine(SourceLineNumber sourceLineNumbers, string path) { return Message(sourceLineNumbers, Ids.PerUserButForcingPerMachine, "The MSI '{0}' is a per-user package being forced to per-machine. Verify that the MsiPackage/@ForcePerMachine attribute is expected and that the per-user package works correctly when forced to install per-machine.", path); @@ -786,6 +791,7 @@ namespace WixToolset.Data ServiceConfigFamilyNotSupported = 1149, SymbolNotTranslatedToOutput = 1150, MsiTransactionLimitations = 1151, + PathCanonicalized = 1152, } } } -- cgit v1.2.3-55-g6feb