summaryrefslogtreecommitdiff
path: root/src/tools/heat/VSProjectHarvester.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/heat/VSProjectHarvester.cs')
-rw-r--r--src/tools/heat/VSProjectHarvester.cs12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/tools/heat/VSProjectHarvester.cs b/src/tools/heat/VSProjectHarvester.cs
index 93b20cd8..02e8ff94 100644
--- a/src/tools/heat/VSProjectHarvester.cs
+++ b/src/tools/heat/VSProjectHarvester.cs
@@ -334,22 +334,24 @@ namespace WixToolset.Harvesters
334 } 334 }
335 else 335 else
336 { 336 {
337 Wix.DirectoryRef directoryRef = new Wix.DirectoryRef(); 337 string directoryRefId;
338 harvestParent = directoryRef;
339 338
340 if (!String.IsNullOrEmpty(this.directoryIds)) 339 if (!String.IsNullOrEmpty(this.directoryIds))
341 { 340 {
342 directoryRef.Id = this.directoryIds; 341 directoryRefId = this.directoryIds;
343 } 342 }
344 else if (this.setUniqueIdentifiers) 343 else if (this.setUniqueIdentifiers)
345 { 344 {
346 directoryRef.Id = String.Format(CultureInfo.InvariantCulture, DirectoryIdFormat, sanitizedProjectName, pog.Name); 345 directoryRefId = String.Format(CultureInfo.InvariantCulture, DirectoryIdFormat, sanitizedProjectName, pog.Name);
347 } 346 }
348 else 347 else
349 { 348 {
350 directoryRef.Id = this.Core.CreateIdentifierFromFilename(String.Format(CultureInfo.InvariantCulture, DirectoryIdFormat, sanitizedProjectName, pog.Name)); 349 directoryRefId = this.Core.CreateIdentifierFromFilename(String.Format(CultureInfo.InvariantCulture, DirectoryIdFormat, sanitizedProjectName, pog.Name));
351 } 350 }
352 351
352 var directoryRef = DirectoryHelper.CreateDirectoryReference(directoryRefId);
353 harvestParent = directoryRef;
354
353 this.directoryRefSeed = this.Core.GenerateIdentifier(DirectoryPrefix, this.projectGUID, pog.Name); 355 this.directoryRefSeed = this.Core.GenerateIdentifier(DirectoryPrefix, this.projectGUID, pog.Name);
354 } 356 }
355 357