Rename a few more cases where Product element should be Package
Rob Mensching committed
Jun 1, 2022 at 13:33 UTC
a591bb35982bac4f7f7b0df8fa77f3c9400993d7
2 files changed
+11
-11
src/api/wix/WixToolset.Data/ErrorMessages.cs
+8
-8
@@ -70,7 +70,7 @@ namespace WixToolset.Data
70
71
public static Message BothUpgradeCodesRequired()
72
{
73
- return Message(null, Ids.BothUpgradeCodesRequired, "Both the target and updated product authoring must define the Product/@UpgradeCode attribute if the transform validates the UpgradeCode (default). Either define the Product/@UpgradeCode attribute in both the target and updated authoring, or set the Validate/@UpgradeCode attribute to 'no' in the patch authoring.");
73
+ return Message(null, Ids.BothUpgradeCodesRequired, "Both the target and updated package authoring must define the Package/@UpgradeCode attribute if the transform validates the UpgradeCode (default). Either define the Package/@UpgradeCode attribute in both the target and updated authoring, or set the Validate/@UpgradeCode attribute to 'no' in the patch authoring.");
74
}
75
76
public static Message BundleTooNew(string bundleExecutable, long bundleVersion)
@@ -886,12 +886,12 @@ namespace WixToolset.Data
886
887
public static Message IllegalCodepage(int codepage)
888
{
889
- return Message(null, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Product/@Codepage, Module/@Codepage, Patch/@Codepage, PatchCreation/@Codepage, or WixLocalization/@Codepage.", codepage);
889
+ return Message(null, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, PatchCreation/@Codepage, or WixLocalization/@Codepage.", codepage);
890
}
891
892
public static Message IllegalCodepage(SourceLineNumber sourceLineNumbers, int codepage)
893
{
894
- return Message(sourceLineNumbers, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Product/@Codepage, Module/@Codepage, Patch/@Codepage, PatchCreation/@Codepage, or WixLocalization/@Codepage.", codepage);
894
+ return Message(sourceLineNumbers, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, PatchCreation/@Codepage, or WixLocalization/@Codepage.", codepage);
895
}
896
897
public static Message IllegalCodepageAttribute(SourceLineNumber sourceLineNumbers, string codepage, string elementName, string attributeName)
@@ -1346,7 +1346,7 @@ namespace WixToolset.Data
1346
1347
public static Message InvalidStringForCodepage(SourceLineNumber sourceLineNumbers, string codepage)
1348
{
1349
- return Message(sourceLineNumbers, Ids.InvalidStringForCodepage, "A string was provided with characters that are not available in the specified database code page '{0}'. Either change these characters to ones that exist in the database's code page, or update the database's code page by modifying one of the following attributes: Product/@Codepage, Module/@Codepage, Patch/@Codepage, PatchCreation/@Codepage, or WixLocalization/@Codepage.", codepage);
1349
+ return Message(sourceLineNumbers, Ids.InvalidStringForCodepage, "A string was provided with characters that are not available in the specified database code page '{0}'. Either change these characters to ones that exist in the database's code page, or update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, PatchCreation/@Codepage, or WixLocalization/@Codepage.", codepage);
1350
}
1351
1352
public static Message InvalidStubExe(string filename)
@@ -1466,7 +1466,7 @@ namespace WixToolset.Data
1466
1467
public static Message MissingEntrySection()
1468
{
1469
- return Message(null, Ids.MissingEntrySection, "Could not find entry section in provided list of intermediates. Supported entry section types are: Product, Bundle, Patch, PatchCreation, Module.");
1469
+ return Message(null, Ids.MissingEntrySection, "Could not find entry section in provided list of intermediates. Supported entry section types are: Package, Bundle, Patch, PatchCreation, Module.");
1470
}
1471
1472
public static Message MissingEntrySection(string sectionType)
@@ -1626,7 +1626,7 @@ namespace WixToolset.Data
1626
1627
public static Message OrphanedComponent(SourceLineNumber sourceLineNumbers, string componentName)
1628
{
1629
- return Message(sourceLineNumbers, Ids.OrphanedComponent, "Found orphaned Component '{0}'. If this is a Product, every Component must have at least one parent Feature. To include a Component in a Module, you must include it directly as a Component element of the Module element or indirectly via ComponentRef, ComponentGroup, or ComponentGroupRef elements.", componentName);
1629
+ return Message(sourceLineNumbers, Ids.OrphanedComponent, "Found orphaned Component '{0}'. If this is a Package, every Component must have at least one parent Feature. To include a Component in a Module, you must include it directly as a Component element of the Module element or indirectly via ComponentRef, ComponentGroup, or ComponentGroupRef elements.", componentName);
1630
}
1631
1632
public static Message OutputCodepageMismatch(SourceLineNumber sourceLineNumbers, int beforeCodepage, int afterCodepage)
@@ -1746,7 +1746,7 @@ namespace WixToolset.Data
1746
1747
public static Message ProductCodeInvalidForTransform(SourceLineNumber sourceLineNumbers)
1748
{
1749
- return Message(sourceLineNumbers, Ids.ProductCodeInvalidForTransform, "The value '*' is not valid for the ProductCode when used in a transform or in a patch. Copy the ProductCode from your target product MSI into the Product/@Id attribute value for your product authoring.");
1749
+ return Message(sourceLineNumbers, Ids.ProductCodeInvalidForTransform, "The value '*' is not valid for the ProductCode when used in a transform or in a patch. Copy the ProductCode from your target product MSI into the Package/@Id attribute value for your product authoring.");
1750
}
1751
1752
public static Message ProgIdNestedTooDeep(SourceLineNumber sourceLineNumbers)
@@ -2226,7 +2226,7 @@ namespace WixToolset.Data
2226
2227
public static Message ValidationFailedToOpenDatabase()
2228
{
2229
- return Message(null, Ids.ValidationFailedToOpenDatabase, "Failed to open the database. During validation, this most commonly happens when attempting to open a database using an unsupported code page or a file that is not a valid Windows Installer database. Please use a different code page in Module/@Codepage, Package/@SummaryCodepage, Product/@Codepage, or WixLocalization/@Codepage; or make sure you provide the path to a valid Windows Installer database.");
2229
+ return Message(null, Ids.ValidationFailedToOpenDatabase, "Failed to open the database. During validation, this most commonly happens when attempting to open a database using an unsupported code page or a file that is not a valid Windows Installer database. Please use a different code page in Module/@Codepage, Package/@SummaryCodepage, Package/@Codepage, or WixLocalization/@Codepage; or make sure you provide the path to a valid Windows Installer database.");
2230
}
2231
2232
public static Message ValueAndMaskMustBeSameLength(SourceLineNumber sourceLineNumbers)
src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
+3
-3
@@ -82,7 +82,7 @@ namespace WixToolsetTest.CoreIntegration
82
}
83
84
[Fact]
85
- public void MissingEntrySectionDetectedProduct()
85
+ public void MissingEntrySectionDetectedPackage()
86
{
87
var folder = TestData.Get(@"TestData\OverridableActions");
88
@@ -133,7 +133,7 @@ namespace WixToolsetTest.CoreIntegration
133
}
134
catch (WixException we)
135
{
136
- WixAssert.StringEqual("Could not find entry section in provided list of intermediates. Supported entry section types are: Product, Bundle, Patch, PatchCreation, Module.", we.Message);
136
+ WixAssert.StringEqual("Could not find entry section in provided list of intermediates. Supported entry section types are: Package, Bundle, Patch, PatchCreation, Module.", we.Message);
137
return;
138
}
139
@@ -163,7 +163,7 @@ namespace WixToolsetTest.CoreIntegration
163
}
164
catch (WixException we)
165
{
166
- WixAssert.StringEqual("Could not find entry section in provided list of intermediates. Supported entry section types are: Product, Bundle, Patch, PatchCreation, Module.", we.Message);
166
+ WixAssert.StringEqual("Could not find entry section in provided list of intermediates. Supported entry section types are: Package, Bundle, Patch, PatchCreation, Module.", we.Message);
167
return;
168
}
169