@joebigelow / wix-1 / commits / 172d144e

Fix messages related to package scope.

Bob Arnson committed Nov 10, 2024 at 20:52 UTC 172d144ef708b138153608f78e504f21434f5be1

3 files changed +3 -3

src/api/wix/WixToolset.Data/ErrorMessages.cs

+1 -1

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

737

738 public static Message IllegalAttributeValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, params string[] legalValues)

739 {

740 - return Message(sourceLineNumbers, Ids.IllegalAttributeValue, "The {0}/@{1} attribute's value, '{2}', is not one of the legal options: '{3}'.", elementName, attributeName, value, String.Join(",", legalValues));

740 + return Message(sourceLineNumbers, Ids.IllegalAttributeValue, "The {0}/@{1} attribute's value, '{2}', is not one of the legal options: '{3}'.", elementName, attributeName, value, String.Join(", ", legalValues));

741 }

742

743 public static Message IllegalAttributeValueWhenNested(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attrivuteValue, string parentElementName)

src/api/wix/WixToolset.Data/WarningMessages.cs

+1 -1

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

229

230 public static Message DiscouragedAllUsersValue(SourceLineNumber sourceLineNumbers, string path, string machineOrUser)

231 {

232 - return Message(sourceLineNumbers, Ids.DiscouragedAllUsersValue, "Bundles require a package to be either per-machine or per-user. The MSI '{0}' ALLUSERS Property is set to '2' which may change from per-user to per-machine at install time. The Bundle will assume the package is per-{1} and will not work correctly if that changes. If possible, remove the Property with Id='ALLUSERS' and use Package/@InstallScope attribute instead.", path, machineOrUser);

232 + return Message(sourceLineNumbers, Ids.DiscouragedAllUsersValue, "Bundles require a package to be either per-machine or per-user. The MSI '{0}' ALLUSERS Property is set to '2' which may change from per-user to per-machine at install time. The Bundle will assume the package is per-{1} and will not work correctly if that changes. If possible, use the Package/@Scope attribute values 'perUser' or 'perMachine' instead.", path, machineOrUser);

233 }

234

235 public static Message DetectConditionRecommended(SourceLineNumber sourceLineNumbers, string elementName)

src/wix/WixToolset.Core/Compiler_Package.cs

+1 -1

@@ -99,7 +99,7 @@ namespace WixToolset.Core

99 isPerUserOrMachine = true;

100 break;

101 default:

102 - this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, installScope, "perMachine", "perUser"));

102 + this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, installScope, "perMachine", "perUser", "perUserOrMachine"));

103 break;

104 }

105 break;