diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-01-09 02:05:37 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-02-11 13:52:29 -0800 |
| commit | 0fcb0cb1d0a2f741f83feb76bc276926f499686d (patch) | |
| tree | b6494af4a226ebfb245d44e88bbecadab6750364 | |
| parent | 12db1999ea040ea0b1a51b1dfb5c5f92fc8087c4 (diff) | |
| download | wix-0fcb0cb1d0a2f741f83feb76bc276926f499686d.tar.gz wix-0fcb0cb1d0a2f741f83feb76bc276926f499686d.tar.bz2 wix-0fcb0cb1d0a2f741f83feb76bc276926f499686d.zip | |
Ensure directory keypaths cannot be used to generate GUIDs
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 5 |
1 files 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 | |||
| 2467 | var isGeneratableGuidOk = "*" == guid; | 2467 | var isGeneratableGuidOk = "*" == guid; |
| 2468 | if (isGeneratableGuidOk) | 2468 | if (isGeneratableGuidOk) |
| 2469 | { | 2469 | { |
| 2470 | if (encounteredODBCDataSource) | 2470 | if (encounteredODBCDataSource || ComponentKeyPathType.Directory == keyPathType) |
| 2471 | { | 2471 | { |
| 2472 | this.Core.Write(ErrorMessages.IllegalComponentWithAutoGeneratedGuid(sourceLineNumbers)); | 2472 | this.Core.Write(ErrorMessages.IllegalComponentWithAutoGeneratedGuid(sourceLineNumbers)); |
| 2473 | isGeneratableGuidOk = false; | 2473 | isGeneratableGuidOk = false; |
| 2474 | } | 2474 | } |
| 2475 | 2475 | else if (0 < files && ComponentKeyPathType.Registry == keyPathType) | |
| 2476 | if (0 < files && ComponentKeyPathType.Registry == keyPathType) | ||
| 2477 | { | 2476 | { |
| 2478 | this.Core.Write(ErrorMessages.IllegalComponentWithAutoGeneratedGuid(sourceLineNumbers, true)); | 2477 | this.Core.Write(ErrorMessages.IllegalComponentWithAutoGeneratedGuid(sourceLineNumbers, true)); |
| 2479 | isGeneratableGuidOk = false; | 2478 | isGeneratableGuidOk = false; |