From 0fcb0cb1d0a2f741f83feb76bc276926f499686d Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 9 Jan 2021 02:05:37 -0800
Subject: Ensure directory keypaths cannot be used to generate GUIDs

---
 src/WixToolset.Core/Compiler.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 003617cc..5267a232 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -2467,13 +2467,12 @@ namespace WixToolset.Core
             var isGeneratableGuidOk = "*" == guid;
             if (isGeneratableGuidOk)
             {
-                if (encounteredODBCDataSource)
+                if (encounteredODBCDataSource || ComponentKeyPathType.Directory == keyPathType)
                 {
                     this.Core.Write(ErrorMessages.IllegalComponentWithAutoGeneratedGuid(sourceLineNumbers));
                     isGeneratableGuidOk = false;
                 }
-
-                if (0 < files && ComponentKeyPathType.Registry == keyPathType)
+                else if (0 < files && ComponentKeyPathType.Registry == keyPathType)
                 {
                     this.Core.Write(ErrorMessages.IllegalComponentWithAutoGeneratedGuid(sourceLineNumbers, true));
                     isGeneratableGuidOk = false;
-- 
cgit v1.2.3-55-g6feb