1 files changed, 25 insertions, 2 deletions

diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index 5ddb6be1..37fc17f9 100644
--- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -359,7 +359,6 @@ namespace WixToolset.Core.Burn
                 this.BackendHelper.ResolveDelayedFields(this.DelayedFields, variableCache);
             }
 
-            Dictionary<string, WixDependencyProviderSymbol> dependencySymbolsByKey;
             {
                 var command = new ProcessDependencyProvidersCommand(this.Messaging, section, facades);
                 command.Execute();
@@ -368,7 +367,6 @@ namespace WixToolset.Core.Burn
                 {
                     bundleSymbol.ProviderKey = command.BundleProviderKey; // set the overridable bundle provider key.
                 }
-                dependencySymbolsByKey = command.DependencySymbolsByKey;
             }
 
             // Update the bundle per-machine/per-user scope based on the chained packages.
@@ -381,6 +379,13 @@ namespace WixToolset.Core.Burn
                 command.Execute();
             }
 
+            this.DetectDuplicateCacheIds(facades);
+
+            if (this.Messaging.EncounteredError)
+            {
+                return;
+            }
+
             // Give the extension one last hook before generating the output files.
             foreach (var extension in this.BackendExtensions)
             {
@@ -581,6 +586,24 @@ namespace WixToolset.Core.Burn
             }
         }
 
+        private void DetectDuplicateCacheIds(IDictionary<string, PackageFacade> facades)
+        {
+            var duplicateCacheIdDetector = new Dictionary<string, WixBundlePackageSymbol>();
+
+            foreach (var facade in facades.Values)
+            {
+                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));
+                }
+                else
+                {
+                    duplicateCacheIdDetector.Add(facade.PackageSymbol.CacheId, facade.PackageSymbol);
+                }
+            }
+        }
+
         private IEnumerable<T> GetRequiredSymbols<T>() where T : IntermediateSymbol
         {
             var symbols = this.Output.Sections.Single().Symbols.OfType<T>().ToList();