Fix out of date references to Product in warnings
Fixes 7631
Rob Mensching committed
Jul 19, 2023 at 10:20 UTC
42118ef58ba698280b5c28c69f86029c9152072f
1 file changed
+12
-12
src/api/wix/WixToolset.Data/WarningMessages.cs
+12
-12
@@ -57,9 +57,9 @@ namespace WixToolset.Data
57
return Message(sourceLineNumbers, Ids.CannotUpdateCabCache, "Cannot update the timestamp of cached cabinet: '{0}'. If the timestamp is not updated, the build may rebuild more than is necessary. To fix the issue, ensure that the cabinet file is writable, error: {1}", cabinetPath, detail);
58
}
59
60
- public static Message ColumnsIncompatibleWithInstallerVersion(SourceLineNumber sourceLineNumbers, string tableName, int productInstallerVersion)
60
+ public static Message ColumnsIncompatibleWithInstallerVersion(SourceLineNumber sourceLineNumbers, string tableName, int packageInstallerVersion)
61
{
62
- return Message(sourceLineNumbers, Ids.ColumnsIncompatibleWithInstallerVersion, "Table '{0}' uses columns that require a version of Windows Installer greater than specified in your package ('{1}').", tableName, productInstallerVersion);
62
+ return Message(sourceLineNumbers, Ids.ColumnsIncompatibleWithInstallerVersion, "Table '{0}' uses columns that require a version of Windows Installer greater than specified in your package ('{1}').", tableName, packageInstallerVersion);
63
}
64
65
public static Message CopyFileFileIdUseless(SourceLineNumber sourceLineNumbers)
@@ -199,7 +199,7 @@ namespace WixToolset.Data
199
200
public static Message DeprecatedUpgradeProperty(SourceLineNumber sourceLineNumbers)
201
{
202
- return Message(sourceLineNumbers, Ids.DeprecatedUpgradeProperty, "Specifying a Property element as a child of an Upgrade element has been deprecated. Please specify this Property element as a child of a different element such as Product or Fragment.");
202
+ return Message(sourceLineNumbers, Ids.DeprecatedUpgradeProperty, "Specifying a Property element as a child of an Upgrade element has been deprecated. Please specify this Property element as a child of a different element such as Package or Fragment.");
203
}
204
205
public static Message DirectoryInUse(SourceLineNumber sourceLineNumbers, string filePath)
@@ -367,9 +367,9 @@ namespace WixToolset.Data
367
return Message(sourceLineNumbers, Ids.InvalidAttributeCombination, "It is invalid to combine attributes {0} and {1}. The decompiled output will set attribute {2} to {3}.", attrib1, attrib2, name, value);
368
}
369
370
- public static Message InvalidHigherInstallerVersionInModule(SourceLineNumber sourceLineNumbers, string moduleId, int moduleInstallerVersion, int productInstallerVersion)
370
+ public static Message InvalidHigherInstallerVersionInModule(SourceLineNumber sourceLineNumbers, string moduleId, int moduleInstallerVersion, int packageInstallerVersion)
371
{
372
- return Message(sourceLineNumbers, Ids.InvalidHigherInstallerVersionInModule, "Merge module '{0}' has an installer version of {1} which is greater than the product's installer version of {2}. Merging a module with a higher installer version than the product it is being merged into can result in invalid values in the resulting msi. You must set the Package/@InstallerVersion attribute to {1} or greater to merge this merge module into your product.", moduleId, moduleInstallerVersion, productInstallerVersion);
372
+ return Message(sourceLineNumbers, Ids.InvalidHigherInstallerVersionInModule, "Merge module '{0}' has an installer version of {1} which is greater than the package's installer version of {2}. Merging a module with a higher installer version than the package it is being merged into can result in invalid values in the resulting msi. You must set the Package/@InstallerVersion attribute to {1} or greater to merge this merge module into your package.", moduleId, moduleInstallerVersion, packageInstallerVersion);
373
}
374
375
public static Message InvalidFourPartVersion(SourceLineNumber sourceLineNumbers, string elementName, string version)
@@ -384,7 +384,7 @@ namespace WixToolset.Data
384
385
public static Message MajorUpgradePatchNotRecommended()
386
{
387
- return Message(null, Ids.MajorUpgradePatchNotRecommended, "Changing the ProductCode in a patch is not recommended because the patch cannot be uninstalled nor can it be sequenced along with other patches for the target product. See https://learn.microsoft.com/en-us/windows/win32/msi/applying-major-upgrades-by-patching-the-local-installation-of-the-product for more information.");
387
+ return Message(null, Ids.MajorUpgradePatchNotRecommended, "Changing the ProductCode in a patch is not recommended because the patch cannot be uninstalled nor can it be sequenced along with other patches for the target package. See https://learn.microsoft.com/en-us/windows/win32/msi/applying-major-upgrades-by-patching-the-local-installation-of-the-product for more information.");
388
}
389
390
public static Message MediaExternalCabinetFilenameIllegal(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
@@ -404,7 +404,7 @@ namespace WixToolset.Data
404
405
public static Message MissingUpgradeCode(SourceLineNumber sourceLineNumbers)
406
{
407
- return Message(sourceLineNumbers, Ids.MissingUpgradeCode, "The Product/@UpgradeCode attribute was not found; it is strongly recommended to ensure that this product can be upgraded.");
407
+ return Message(sourceLineNumbers, Ids.MissingUpgradeCode, "The Package/@UpgradeCode attribute was not found; it is strongly recommended to ensure that this package can be upgraded.");
408
}
409
410
public static Message MsiTransactionLimitations(SourceLineNumber sourceLineNumbers)
@@ -572,9 +572,9 @@ namespace WixToolset.Data
572
return Message(null, Ids.SuppressMergedAction, "The merged action '{0}' in the {1} table is being suppressed.", action, sequenceName);
573
}
574
575
- public static Message TableIncompatibleWithInstallerVersion(SourceLineNumber sourceLineNumbers, string tableName, int productInstallerVersion)
575
+ public static Message TableIncompatibleWithInstallerVersion(SourceLineNumber sourceLineNumbers, string tableName, int packageInstallerVersion)
576
{
577
- return Message(sourceLineNumbers, Ids.TableIncompatibleWithInstallerVersion, "Using table '{0}' requires a version of Windows Installer greater than specified in your package ('{1}').", tableName, productInstallerVersion);
577
+ return Message(sourceLineNumbers, Ids.TableIncompatibleWithInstallerVersion, "Using table '{0}' requires a version of Windows Installer greater than specified in your package ('{1}').", tableName, packageInstallerVersion);
578
}
579
580
public static Message TargetDirCorrectedDefaultDir()
@@ -620,7 +620,7 @@ namespace WixToolset.Data
620
621
public static Message UnexpectedTableInProduct(SourceLineNumber sourceLineNumbers, string tableName)
622
{
623
- return Message(sourceLineNumbers, Ids.UnexpectedTableInProduct, "An unexpected row in the '{0}' table was found in this product. Products should not contain the '{0}' table.", tableName);
623
+ return Message(sourceLineNumbers, Ids.UnexpectedTableInProduct, "An unexpected row in the '{0}' table was found in this package. Packages should not contain the '{0}' table.", tableName);
624
}
625
626
public static Message UnknownAction(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
@@ -675,14 +675,14 @@ namespace WixToolset.Data
675
676
public static Message InvalidMsiProductVersion(SourceLineNumber sourceLineNumbers, string version, string package)
677
{
678
- return Message(sourceLineNumbers, Ids.InvalidMsiProductVersion, "Invalid product version '{0}' in MSI package '{1}'. Product version should have a major version less than 256, a minor version less than 256, and a build version less than 65536. The bundle may incorrectly detect upgrades of this package.", version, package);
678
+ return Message(sourceLineNumbers, Ids.InvalidMsiProductVersion, "Invalid package version '{0}' in MSI package '{1}'. Package version should have a major version less than 256, a minor version less than 256, and a build version less than 65536. The bundle may incorrectly detect upgrades of this package.", version, package);
679
}
680
681
public static Message InvalidMsiProductVersion(SourceLineNumber sourceLineNumbers, string version)
682
{
683
return Message(sourceLineNumbers, Ids.InvalidMsiProductVersion,
684
"Invalid MSI package version: '{0}'. " +
685
- "The Windows Installer SDK says that MSI product versions must have a major version less than 256, a minor version less than 256, and a build version less than 65536. " +
685
+ "The Windows Installer SDK says that MSI package versions must have a major version less than 256, a minor version less than 256, and a build version less than 65536. " +
686
"The revision value is ignored but version labels and metadata are not allowed. " +
687
"Violating the MSI rules sometimes works as expected but the behavior is unpredictable and undefined. "+
688
"Future versions of WiX might treat invalid package versions as an error.",