diff options
author | Bob Arnson <bob@firegiant.com> | 2024-11-10 20:52:30 -0500 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2024-12-26 22:04:18 -0800 |
commit | 172d144ef708b138153608f78e504f21434f5be1 (patch) | |
tree | f35a70089611a3fcfa9711fcd87f693edf8062fe | |
parent | 6f644be25a7981c61d6a91977f5f82a849beb60e (diff) | |
download | wix-172d144ef708b138153608f78e504f21434f5be1.tar.gz wix-172d144ef708b138153608f78e504f21434f5be1.tar.bz2 wix-172d144ef708b138153608f78e504f21434f5be1.zip |
Fix messages related to package scope.
-rw-r--r-- | src/api/wix/WixToolset.Data/ErrorMessages.cs | 2 | ||||
-rw-r--r-- | src/api/wix/WixToolset.Data/WarningMessages.cs | 2 | ||||
-rw-r--r-- | src/wix/WixToolset.Core/Compiler_Package.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/api/wix/WixToolset.Data/ErrorMessages.cs b/src/api/wix/WixToolset.Data/ErrorMessages.cs index f9a7d66d..ef70ebc4 100644 --- a/src/api/wix/WixToolset.Data/ErrorMessages.cs +++ b/src/api/wix/WixToolset.Data/ErrorMessages.cs | |||
@@ -737,7 +737,7 @@ namespace WixToolset.Data | |||
737 | 737 | ||
738 | public static Message IllegalAttributeValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, params string[] legalValues) | 738 | public static Message IllegalAttributeValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, params string[] legalValues) |
739 | { | 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 | } | 741 | } |
742 | 742 | ||
743 | public static Message IllegalAttributeValueWhenNested(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attrivuteValue, string parentElementName) | 743 | public static Message IllegalAttributeValueWhenNested(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attrivuteValue, string parentElementName) |
diff --git a/src/api/wix/WixToolset.Data/WarningMessages.cs b/src/api/wix/WixToolset.Data/WarningMessages.cs index 8af36b57..15068a90 100644 --- a/src/api/wix/WixToolset.Data/WarningMessages.cs +++ b/src/api/wix/WixToolset.Data/WarningMessages.cs | |||
@@ -229,7 +229,7 @@ namespace WixToolset.Data | |||
229 | 229 | ||
230 | public static Message DiscouragedAllUsersValue(SourceLineNumber sourceLineNumbers, string path, string machineOrUser) | 230 | public static Message DiscouragedAllUsersValue(SourceLineNumber sourceLineNumbers, string path, string machineOrUser) |
231 | { | 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 | } | 233 | } |
234 | 234 | ||
235 | public static Message DetectConditionRecommended(SourceLineNumber sourceLineNumbers, string elementName) | 235 | public static Message DetectConditionRecommended(SourceLineNumber sourceLineNumbers, string elementName) |
diff --git a/src/wix/WixToolset.Core/Compiler_Package.cs b/src/wix/WixToolset.Core/Compiler_Package.cs index 74b3aae2..853c6ed2 100644 --- a/src/wix/WixToolset.Core/Compiler_Package.cs +++ b/src/wix/WixToolset.Core/Compiler_Package.cs | |||
@@ -99,7 +99,7 @@ namespace WixToolset.Core | |||
99 | isPerUserOrMachine = true; | 99 | isPerUserOrMachine = true; |
100 | break; | 100 | break; |
101 | default: | 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; | 103 | break; |
104 | } | 104 | } |
105 | break; | 105 | break; |