@joebigelow / wix-1 / commits / 2baff8dc

Add warning for PathCanonicalized.

Sean Hall committed Dec 16, 2020 at 18:24 UTC 2baff8dcce00fea541028dc927f34eb57641e47d

2 files changed +7 -1

src/WixToolset.Data/ErrorMessages.cs

+1 -1

@@ -1676,7 +1676,7 @@ namespace WixToolset.Data

1676

1677 public static Message PayloadMustBeRelativeToCache(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue)

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 }

1681

1682 public static Message PerUserButAllUsersEquals1(SourceLineNumber sourceLineNumbers, string path)

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);

443 }

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 +

450 public static Message PerUserButForcingPerMachine(SourceLineNumber sourceLineNumbers, string path)

451 {

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

791 ServiceConfigFamilyNotSupported = 1149,

792 SymbolNotTranslatedToOutput = 1150,

793 MsiTransactionLimitations = 1151,

794 + PathCanonicalized = 1152,

795 }

796 }

797 }