From e87091209c6155c0d326c29bafe8a35356d8031a Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 19 Apr 2021 23:29:22 -0500 Subject: Improve CacheId collision error messages. --- src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs | 4 ++-- src/WixToolset.Core.Burn/BurnBackendErrors.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs index d8062008..4be72eec 100644 --- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs +++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs @@ -594,8 +594,8 @@ namespace WixToolset.Core.Burn { if (duplicateCacheIdDetector.TryGetValue(facade.PackageSymbol.CacheId, out var collisionPackage)) { - this.Messaging.Write(BurnBackendErrors.DuplicateCacheIds(collisionPackage.SourceLineNumbers, facade.PackageSymbol.CacheId)); - this.Messaging.Write(BurnBackendErrors.DuplicateCacheIds2(facade.PackageSymbol.SourceLineNumbers, facade.PackageSymbol.CacheId)); + this.Messaging.Write(BurnBackendErrors.DuplicateCacheIds(facade.PackageSymbol.SourceLineNumbers, facade.PackageSymbol.CacheId, facade.PackageId)); + this.Messaging.Write(BurnBackendErrors.DuplicateCacheIds2(collisionPackage.SourceLineNumbers)); } else { diff --git a/src/WixToolset.Core.Burn/BurnBackendErrors.cs b/src/WixToolset.Core.Burn/BurnBackendErrors.cs index 4c846e8a..02ab1b5d 100644 --- a/src/WixToolset.Core.Burn/BurnBackendErrors.cs +++ b/src/WixToolset.Core.Burn/BurnBackendErrors.cs @@ -6,14 +6,14 @@ namespace WixToolset.Core.Burn internal static class BurnBackendErrors { - public static Message DuplicateCacheIds(SourceLineNumber originalLineNumber, string cacheId) + public static Message DuplicateCacheIds(SourceLineNumber originalLineNumber, string cacheId, string packageId) { - return Message(originalLineNumber, Ids.DuplicateCacheIds, "The cache id '{0}' has been duplicated as indicated in the following message.", cacheId); + return Message(originalLineNumber, Ids.DuplicateCacheIds, "The CacheId '{0}' for package '{1}' is duplicated. Each package must have a unique CacheId.", cacheId, packageId); } - public static Message DuplicateCacheIds2(SourceLineNumber duplicateLineNumber, string cacheId) + public static Message DuplicateCacheIds2(SourceLineNumber duplicateLineNumber) { - return Message(duplicateLineNumber, Ids.DuplicateCacheIds2, "Each cache id must be unique. '{0}' has been used before as indicated in the previous message.", cacheId); + return Message(duplicateLineNumber, Ids.DuplicateCacheIds2, "The location of the package related to the previous error."); } private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) -- cgit v1.2.3-55-g6feb