From b0c76b75920bf4a7db46696ece01c856dd888519 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 19 Jan 2026 04:13:21 -0800 Subject: Privatize error messages to their components Fixes 6423 --- src/ext/Bal/wixext/BalCompiler.cs | 2 +- src/ext/Firewall/wixext/FirewallErrors.cs | 1 + src/ext/Sql/wixext/SqlErrors.cs | 8 ++++---- src/ext/Sql/wixext/SqlExtensionFactory.cs | 2 +- src/ext/Sql/wixext/Symbols/SqlDatabaseSymbol.cs | 2 +- src/ext/Sql/wixext/Symbols/SqlFileSpecSymbol.cs | 2 +- src/ext/Sql/wixext/Symbols/SqlScriptSymbol.cs | 2 +- src/ext/Sql/wixext/Symbols/SqlStringSymbol.cs | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) (limited to 'src/ext') diff --git a/src/ext/Bal/wixext/BalCompiler.cs b/src/ext/Bal/wixext/BalCompiler.cs index b7d5f679..c2959c5d 100644 --- a/src/ext/Bal/wixext/BalCompiler.cs +++ b/src/ext/Bal/wixext/BalCompiler.cs @@ -433,7 +433,7 @@ namespace WixToolset.BootstrapperApplications // Error check the values. if (String.IsNullOrEmpty(condition)) { - this.Messaging.Write(ErrorMessages.ConditionExpected(sourceLineNumbers, node.Name.LocalName)); + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Condition")); } if (null == message) diff --git a/src/ext/Firewall/wixext/FirewallErrors.cs b/src/ext/Firewall/wixext/FirewallErrors.cs index 523398e5..6e1c743a 100644 --- a/src/ext/Firewall/wixext/FirewallErrors.cs +++ b/src/ext/Firewall/wixext/FirewallErrors.cs @@ -36,6 +36,7 @@ namespace WixToolset.Firewall { return Message(sourceLineNumbers, Ids.IllegalInterfaceTypeWithInterfaceTypeAll, "The InterfaceType element cannot be specified because its parent FirewallException contains another InterfaceType element with value 'All'."); } + public static Message IllegalLocalAddressWithLocalScopeAttribute(SourceLineNumber sourceLineNumbers) { return Message(sourceLineNumbers, Ids.IllegalLocalAddressWithLocalScopeAttribute, "The LocalAddress element cannot be specified because its parent FirewallException already specified the LocalScope attribute. To use LocalAddress elements, omit the LocalScope attribute."); diff --git a/src/ext/Sql/wixext/SqlErrors.cs b/src/ext/Sql/wixext/SqlErrors.cs index f25728bd..f950e137 100644 --- a/src/ext/Sql/wixext/SqlErrors.cs +++ b/src/ext/Sql/wixext/SqlErrors.cs @@ -11,17 +11,17 @@ namespace WixToolset.Sql { return Message(sourceLineNumbers, Ids.IllegalAttributeWithoutComponent, "The {0}/@{1} attribute cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName, attributeName); } - + public static Message IllegalElementWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName) { return Message(sourceLineNumbers, Ids.IllegalElementWithoutComponent, "The {0} element cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName); } - + public static Message OneOfAttributesRequiredUnderComponent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName1, string attributeName2, string attributeName3, string attributeName4) { return Message(sourceLineNumbers, Ids.OneOfAttributesRequiredUnderComponent, "When nested under a Component, the {0} element must have one of the following attributes specified: {1}, {2}, {3} or {4}.", elementName, attributeName1, attributeName2, attributeName3, attributeName4); } - + public static Message DeprecatedBinaryChildElement(SourceLineNumber sourceLineNumbers, string elementName) { return Message(sourceLineNumbers, Ids.DeprecatedBinaryChildElement, "The {0} element contains a deprecated child Binary element. Please move the Binary element under a Fragment, Module, or Product element and set the {0}/@BinaryKey attribute to the value of the Binary/@Id attribute.", elementName); @@ -45,4 +45,4 @@ namespace WixToolset.Sql DeprecatedBinaryChildElement = 5103, } } -} \ No newline at end of file +} diff --git a/src/ext/Sql/wixext/SqlExtensionFactory.cs b/src/ext/Sql/wixext/SqlExtensionFactory.cs index 279106d3..064b68f1 100644 --- a/src/ext/Sql/wixext/SqlExtensionFactory.cs +++ b/src/ext/Sql/wixext/SqlExtensionFactory.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. namespace WixToolset.Sql { diff --git a/src/ext/Sql/wixext/Symbols/SqlDatabaseSymbol.cs b/src/ext/Sql/wixext/Symbols/SqlDatabaseSymbol.cs index 6f0820ac..bb31fbb2 100644 --- a/src/ext/Sql/wixext/Symbols/SqlDatabaseSymbol.cs +++ b/src/ext/Sql/wixext/Symbols/SqlDatabaseSymbol.cs @@ -100,4 +100,4 @@ namespace WixToolset.Sql.Symbols set => this.Set((int)SqlDatabaseSymbolFields.Attributes, value); } } -} \ No newline at end of file +} diff --git a/src/ext/Sql/wixext/Symbols/SqlFileSpecSymbol.cs b/src/ext/Sql/wixext/Symbols/SqlFileSpecSymbol.cs index d9eecc62..302bae2b 100644 --- a/src/ext/Sql/wixext/Symbols/SqlFileSpecSymbol.cs +++ b/src/ext/Sql/wixext/Symbols/SqlFileSpecSymbol.cs @@ -76,4 +76,4 @@ namespace WixToolset.Sql.Symbols set => this.Set((int)SqlFileSpecSymbolFields.GrowthSize, value); } } -} \ No newline at end of file +} diff --git a/src/ext/Sql/wixext/Symbols/SqlScriptSymbol.cs b/src/ext/Sql/wixext/Symbols/SqlScriptSymbol.cs index 94c70390..1676f181 100644 --- a/src/ext/Sql/wixext/Symbols/SqlScriptSymbol.cs +++ b/src/ext/Sql/wixext/Symbols/SqlScriptSymbol.cs @@ -84,4 +84,4 @@ namespace WixToolset.Sql.Symbols set => this.Set((int)SqlScriptSymbolFields.Sequence, value); } } -} \ No newline at end of file +} diff --git a/src/ext/Sql/wixext/Symbols/SqlStringSymbol.cs b/src/ext/Sql/wixext/Symbols/SqlStringSymbol.cs index 73a8206e..ccf4fd0f 100644 --- a/src/ext/Sql/wixext/Symbols/SqlStringSymbol.cs +++ b/src/ext/Sql/wixext/Symbols/SqlStringSymbol.cs @@ -84,4 +84,4 @@ namespace WixToolset.Sql.Symbols set => this.Set((int)SqlStringSymbolFields.Sequence, value); } } -} \ No newline at end of file +} -- cgit v1.2.3-55-g6feb