aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-02-06 22:04:55 -0500
committerBob Arnson <bob@firegiant.com>2020-02-07 22:00:52 -0500
commit57559c253fe8ec6f9c66662d11fbcabccc3ba057 (patch)
tree60c7b4da6bbb6fe0090498e60fdfbcb769a1af0b /src/WixToolset.Core
parent9feb0090d2cdd0979bea90ba9aa13dc541f47054 (diff)
downloadwix-57559c253fe8ec6f9c66662d11fbcabccc3ba057.tar.gz
wix-57559c253fe8ec6f9c66662d11fbcabccc3ba057.tar.bz2
wix-57559c253fe8ec6f9c66662d11fbcabccc3ba057.zip
Add CreateFolder tuples for null-keypath components in the backend instead of the compiler.
Diffstat (limited to 'src/WixToolset.Core')
-rw-r--r--src/WixToolset.Core/Compiler.cs17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index cee64911..6fd0f30b 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -2126,7 +2126,6 @@ namespace WixToolset.Core
2126 var id = new Identifier(AccessModifier.Private, componentIdPlaceholderWixVariable); 2126 var id = new Identifier(AccessModifier.Private, componentIdPlaceholderWixVariable);
2127 var keyFound = false; 2127 var keyFound = false;
2128 string keyPath = null; 2128 string keyPath = null;
2129 var shouldAddCreateFolder = false;
2130 2129
2131 var keyPathType = ComponentKeyPathType.Directory; 2130 var keyPathType = ComponentKeyPathType.Directory;
2132 var location = ComponentLocation.LocalOnly; 2131 var location = ComponentLocation.LocalOnly;
@@ -2181,7 +2180,6 @@ namespace WixToolset.Core
2181 { 2180 {
2182 keyFound = true; 2181 keyFound = true;
2183 keyPath = null; 2182 keyPath = null;
2184 shouldAddCreateFolder = true;
2185 } 2183 }
2186 break; 2184 break;
2187 case "Location": 2185 case "Location":
@@ -2343,10 +2341,6 @@ namespace WixToolset.Core
2343 break; 2341 break;
2344 case "CreateFolder": 2342 case "CreateFolder":
2345 var createdFolder = this.ParseCreateFolderElement(child, id.Id, directoryId, win64); 2343 var createdFolder = this.ParseCreateFolderElement(child, id.Id, directoryId, win64);
2346 if (directoryId == createdFolder)
2347 {
2348 shouldAddCreateFolder = false;
2349 }
2350 break; 2344 break;
2351 case "Environment": 2345 case "Environment":
2352 this.ParseEnvironmentElement(child, id.Id); 2346 this.ParseEnvironmentElement(child, id.Id);
@@ -2479,17 +2473,6 @@ namespace WixToolset.Core
2479 } 2473 }
2480 } 2474 }
2481 2475
2482 if (shouldAddCreateFolder)
2483 {
2484 var tuple = new CreateFolderTuple(sourceLineNumbers)
2485 {
2486 DirectoryRef = directoryId,
2487 ComponentRef = id.Id
2488 };
2489
2490 this.Core.AddTuple(tuple);
2491 }
2492
2493 // check for conditions that exclude this component from using generated guids 2476 // check for conditions that exclude this component from using generated guids
2494 var isGeneratableGuidOk = "*" == guid; 2477 var isGeneratableGuidOk = "*" == guid;
2495 if (isGeneratableGuidOk) 2478 if (isGeneratableGuidOk)