aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Sql
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2026-01-19 04:13:21 -0800
committerRob Mensching <rob@firegiant.com>2026-01-19 13:22:53 -0800
commitb0c76b75920bf4a7db46696ece01c856dd888519 (patch)
treed5da2f42d442b9fb1dbaffc54d9e7a8c6381ac11 /src/ext/Sql
parentb337ce4678a5c66c7a2edc2bf9f87a71b4916b1b (diff)
downloadwix-b0c76b75920bf4a7db46696ece01c856dd888519.tar.gz
wix-b0c76b75920bf4a7db46696ece01c856dd888519.tar.bz2
wix-b0c76b75920bf4a7db46696ece01c856dd888519.zip
Privatize error messages to their components
Fixes 6423
Diffstat (limited to 'src/ext/Sql')
-rw-r--r--src/ext/Sql/wixext/SqlErrors.cs8
-rw-r--r--src/ext/Sql/wixext/SqlExtensionFactory.cs2
-rw-r--r--src/ext/Sql/wixext/Symbols/SqlDatabaseSymbol.cs2
-rw-r--r--src/ext/Sql/wixext/Symbols/SqlFileSpecSymbol.cs2
-rw-r--r--src/ext/Sql/wixext/Symbols/SqlScriptSymbol.cs2
-rw-r--r--src/ext/Sql/wixext/Symbols/SqlStringSymbol.cs2
6 files changed, 9 insertions, 9 deletions
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
11 { 11 {
12 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); 12 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);
13 } 13 }
14 14
15 public static Message IllegalElementWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName) 15 public static Message IllegalElementWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName)
16 { 16 {
17 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); 17 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);
18 } 18 }
19 19
20 public static Message OneOfAttributesRequiredUnderComponent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName1, string attributeName2, string attributeName3, string attributeName4) 20 public static Message OneOfAttributesRequiredUnderComponent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName1, string attributeName2, string attributeName3, string attributeName4)
21 { 21 {
22 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); 22 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);
23 } 23 }
24 24
25 public static Message DeprecatedBinaryChildElement(SourceLineNumber sourceLineNumbers, string elementName) 25 public static Message DeprecatedBinaryChildElement(SourceLineNumber sourceLineNumbers, string elementName)
26 { 26 {
27 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); 27 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
45 DeprecatedBinaryChildElement = 5103, 45 DeprecatedBinaryChildElement = 5103,
46 } 46 }
47 } 47 }
48} \ No newline at end of file 48}
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 @@
1// 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. 1// 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.
2 2
3namespace WixToolset.Sql 3namespace WixToolset.Sql
4{ 4{
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
100 set => this.Set((int)SqlDatabaseSymbolFields.Attributes, value); 100 set => this.Set((int)SqlDatabaseSymbolFields.Attributes, value);
101 } 101 }
102 } 102 }
103} \ No newline at end of file 103}
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
76 set => this.Set((int)SqlFileSpecSymbolFields.GrowthSize, value); 76 set => this.Set((int)SqlFileSpecSymbolFields.GrowthSize, value);
77 } 77 }
78 } 78 }
79} \ No newline at end of file 79}
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
84 set => this.Set((int)SqlScriptSymbolFields.Sequence, value); 84 set => this.Set((int)SqlScriptSymbolFields.Sequence, value);
85 } 85 }
86 } 86 }
87} \ No newline at end of file 87}
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
84 set => this.Set((int)SqlStringSymbolFields.Sequence, value); 84 set => this.Set((int)SqlStringSymbolFields.Sequence, value);
85 } 85 }
86 } 86 }
87} \ No newline at end of file 87}