From 3441afb46c4dc056493ab84f9b27434c4185d713 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 10 Apr 2021 15:04:04 -0700
Subject: Improve implicit Component/@Id generation and duplicate GUID errors

---
 src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs')

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 06b51ba1..9f36cd78 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -354,14 +354,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 }
             }
 
-            // Set generated component guids.
+            // Set generated component guids and validate all guids.
             {
-                var command = new CalculateComponentGuids(this.Messaging, this.WindowsInstallerBackendHelper, this.PathResolver, section, platform);
-                command.Execute();
-            }
-
-            {
-                var command = new ValidateComponentGuidsCommand(this.Messaging, section);
+                var command = new FinalizeComponentGuids(this.Messaging, this.WindowsInstallerBackendHelper, this.PathResolver, section, platform);
                 command.Execute();
             }
 
-- 
cgit v1.2.3-55-g6feb