diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-16 18:24:32 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-16 21:22:37 -0600 |
commit | 2baff8dcce00fea541028dc927f34eb57641e47d (patch) | |
tree | e6e1845fc656a4d29de9870c4b4e25269970e21b /src | |
parent | 9e48fc2e76038ebbdaa3025219d65ba070946675 (diff) | |
download | wix-2baff8dcce00fea541028dc927f34eb57641e47d.tar.gz wix-2baff8dcce00fea541028dc927f34eb57641e47d.tar.bz2 wix-2baff8dcce00fea541028dc927f34eb57641e47d.zip |
Add warning for PathCanonicalized.
Diffstat (limited to 'src')
-rw-r--r-- | src/WixToolset.Data/ErrorMessages.cs | 2 | ||||
-rw-r--r-- | src/WixToolset.Data/WarningMessages.cs | 6 |
2 files changed, 7 insertions, 1 deletions
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 | |||
1676 | 1676 | ||
1677 | public static Message PayloadMustBeRelativeToCache(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue) | 1677 | public static Message PayloadMustBeRelativeToCache(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue) |
1678 | { | 1678 | { |
1679 | 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); | 1679 | return Message(sourceLineNumbers, Ids.PayloadMustBeRelativeToCache, "The {0}/@{1} attribute's value, '{2}', is not a relative path.", elementName, attributeName, attributeValue); |
1680 | } | 1680 | } |
1681 | 1681 | ||
1682 | public static Message PerUserButAllUsersEquals1(SourceLineNumber sourceLineNumbers, string path) | 1682 | 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 | |||
442 | 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); | 442 | 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); |
443 | } | 443 | } |
444 | 444 | ||
445 | public static Message PathCanonicalized(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string originalValue, string canonicalValue) | ||
446 | { | ||
447 | return Message(sourceLineNumbers, Ids.PathCanonicalized, "The {0}/@{1} attribute's value, '{2}', has been canonicalized to '{3}'.", elementName, attributeName, originalValue, canonicalValue); | ||
448 | } | ||
449 | |||
445 | public static Message PerUserButForcingPerMachine(SourceLineNumber sourceLineNumbers, string path) | 450 | public static Message PerUserButForcingPerMachine(SourceLineNumber sourceLineNumbers, string path) |
446 | { | 451 | { |
447 | 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); | 452 | 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 | |||
786 | ServiceConfigFamilyNotSupported = 1149, | 791 | ServiceConfigFamilyNotSupported = 1149, |
787 | SymbolNotTranslatedToOutput = 1150, | 792 | SymbolNotTranslatedToOutput = 1150, |
788 | MsiTransactionLimitations = 1151, | 793 | MsiTransactionLimitations = 1151, |
794 | PathCanonicalized = 1152, | ||
789 | } | 795 | } |
790 | } | 796 | } |
791 | } | 797 | } |