Add CreateFolder tuples for null-keypath components in the backend instead of the compiler.

9 files changed, 126 insertions, 17 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AddCreateFoldersCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AddCreateFoldersCommand.cs
new file mode 100644
index 00000000..6cc4153f
--- /dev/null
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/AddCreateFoldersCommand.cs
@@ -0,0 +1,40 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Core.WindowsInstaller.Bind
+{
+    using System.Collections.Generic;
+    using System.Linq;
+    using WixToolset.Data;
+    using WixToolset.Data.Tuples;
+
+    /// <summary>
+    /// Add CreateFolder tuples, if not already present, for null-keypath components.
+    /// </summary>
+    internal class AddCreateFoldersCommand
+    {
+        internal AddCreateFoldersCommand(IntermediateSection section)
+        {
+            this.Section = section;
+        }
+
+        private IntermediateSection Section { get; }
+
+        public void Execute()
+        {
+            var createFolderTuplesByComponentRef = new HashSet<string>(this.Section.Tuples.OfType<CreateFolderTuple>().Select(t => t.ComponentRef));
+            foreach (var componentTuple in this.Section.Tuples.OfType<ComponentTuple>().Where(t => t.KeyPathType == ComponentKeyPathType.Directory).ToList())
+            {
+                if (!createFolderTuplesByComponentRef.Contains(componentTuple.Id.Id))
+                {
+                    var createFolderTuple = new CreateFolderTuple(componentTuple.SourceLineNumbers)
+                    {
+                        DirectoryRef = componentTuple.DirectoryRef,
+                        ComponentRef = componentTuple.Id.Id,
+                    };
+
+                    this.Section.Tuples.Add(createFolderTuple);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 34104ef5..1bcaf209 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -338,6 +338,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     command.Execute();
                 }
 
+                // Add missing CreateFolder tuples to null-keypath components.
+                {
+                    var command = new AddCreateFoldersCommand(section);
+                    command.Execute();
+                }
+
                 // stop processing if an error previously occurred
                 if (this.Messaging.EncounteredError)
                 {
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
             var id = new Identifier(AccessModifier.Private, componentIdPlaceholderWixVariable);
             var keyFound = false;
             string keyPath = null;
-            var shouldAddCreateFolder = false;
 
             var keyPathType = ComponentKeyPathType.Directory;
             var location = ComponentLocation.LocalOnly;
@@ -2181,7 +2180,6 @@ namespace WixToolset.Core
                         {
                             keyFound = true;
                             keyPath = null;
-                            shouldAddCreateFolder = true;
                         }
                         break;
                     case "Location":
@@ -2343,10 +2341,6 @@ namespace WixToolset.Core
                         break;
                     case "CreateFolder":
                         var createdFolder = this.ParseCreateFolderElement(child, id.Id, directoryId, win64);
-                        if (directoryId == createdFolder)
-                        {
-                            shouldAddCreateFolder = false;
-                        }
                         break;
                     case "Environment":
                         this.ParseEnvironmentElement(child, id.Id);
@@ -2479,17 +2473,6 @@ namespace WixToolset.Core
                 }
             }
 
-            if (shouldAddCreateFolder)
-            {
-                var tuple = new CreateFolderTuple(sourceLineNumbers)
-                {
-                    DirectoryRef = directoryId,
-                    ComponentRef = id.Id
-                };
-
-                this.Core.AddTuple(tuple);
-            }
-
             // check for conditions that exclude this component from using generated guids
             var isGeneratableGuidOk = "*" == guid;
             if (isGeneratableGuidOk)
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 38ef2e2e..6fd02d5f 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -253,6 +253,39 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
+        public void PopulatesCreateFolderTableForNullKeypathComponents()
+        {
+            var folder = TestData.Get(@"TestData\Components");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Package.wxs"),
+                    Path.Combine(folder, "PackageComponents.wxs"),
+                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
+                    "-bindpath", Path.Combine(folder, "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", msiPath
+                });
+
+                result.AssertSuccess();
+
+                Assert.True(File.Exists(msiPath));
+                var results = Query.QueryDatabase(msiPath, new[] { "CreateFolder" });
+                Assert.Equal(new[]
+                {
+                    "CreateFolder:INSTALLFOLDER\tNullKeypathComponent",
+                }, results);
+            }
+        }
+
+        [Fact]
         public void PopulatesCustomActionTable()
         {
             var folder = TestData.Get(@"TestData");
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.en-us.wxl
new file mode 100644
index 00000000..38c12ac1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.en-us.wxl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+This file contains the declaration of all the localizable strings.
+-->
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+
+  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
+  <String Id="FeatureTitle">MsiPackage</String>
+
+</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs
new file mode 100644
index 00000000..6da3dcbe
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Product Id="*" Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
+
+    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+    <MediaTemplate />
+
+    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
+      <ComponentGroupRef Id="ProductComponents" />
+    </Feature>
+  </Product>
+
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+      </Directory>
+    </Directory>
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/PackageComponents.wxs
new file mode 100644
index 00000000..beaf70bf
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/PackageComponents.wxs
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+            <Component Id="NullKeypathComponent" Guid="{C493379B-D655-4331-8F03-B618C70EA779}" KeyPath="yes">
+                <File Source="test.txt" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Components/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/data/test.txt
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Components/data/test.txt
@@ -0,0 +1 @@
+This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index b17a27ff..a64ff93d 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -156,6 +156,10 @@
     <Content Include="TestData\ProgId\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\ProgId\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\ProgId\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\Components\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\Components\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\Components\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\Components\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>