Ensure external bundle payloads and containers are copied to output

6 files changed, 63 insertions, 13 deletions

diff --git a/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj
index 3b1e871c..5796178b 100644
--- a/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj
@@ -12,12 +12,4 @@
     <PackageReference Include="WixToolset.Bal.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-  <!-- Workaround wix.targets brokenness -->
-  <Target Name="CopyUncompressedFiles" AfterTargets="AfterBuild">
-    <ItemGroup>
-      <UncompressedFiles Include="$(IntermediateOutputPath)\BundleA.wxs" />
-      <UncompressedFiles Include="$(IntermediateOutputPath)\packages.cab" />
-    </ItemGroup>
-    <Copy SourceFiles="@(UncompressedFiles)" DestinationFolder="$(OutputPath)" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs
index 9cddfc35..e606fe59 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs
@@ -104,8 +104,11 @@ namespace WixToolset.Core.Burn.Bundles
                     // Add detached containers to the list of file transfers.
                     if (ContainerType.Detached == container.Type)
                     {
-                        var transfer = this.BackendHelper.CreateFileTransfer(container.WorkingPath, Path.Combine(this.LayoutFolder, container.Name), true, container.SourceLineNumbers);
+                        var outputPath = Path.Combine(this.LayoutFolder, container.Name);
+                        var transfer = this.BackendHelper.CreateFileTransfer(container.WorkingPath, outputPath, true, container.SourceLineNumbers);
                         fileTransfers.Add(transfer);
+
+                        trackedFiles.Add(this.BackendHelper.TrackFile(outputPath, TrackedFileType.BuiltOutput, container.SourceLineNumbers));
                     }
                     else // update the attached container index.
                     {
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
index 92fe86f2..3bd1f938 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
@@ -77,8 +77,12 @@ namespace WixToolset.Core.Burn.Bundles
                         // External payloads need to be transfered.
                         if (PackagingType.External == payload.Packaging)
                         {
-                            var transfer = this.BackendHelper.CreateFileTransfer(sourceFile.Path, Path.Combine(this.LayoutDirectory, payload.Name), false, payload.SourceLineNumbers);
+                            var outputPath = Path.Combine(this.LayoutDirectory, payload.Name);
+
+                            var transfer = this.BackendHelper.CreateFileTransfer(sourceFile.Path, outputPath, false, payload.SourceLineNumbers);
                             fileTransfers.Add(transfer);
+
+                            trackedFiles.Add(this.BackendHelper.TrackFile(outputPath, TrackedFileType.CopiedOutput, payload.SourceLineNumbers));
                         }
 
                         if (payload.ContentFile)
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
index 10d9a39a..601503ab 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
@@ -292,6 +292,46 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
+        public void CanBuildUncompressedBundle()
+        {
+            var folder = TestData.Get(@"TestData") + Path.DirectorySeparatorChar;
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder() + Path.DirectorySeparatorChar;
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var exePath = Path.Combine(baseFolder, @"bin\test.exe");
+                var trackingFile = Path.Combine(intermediateFolder, "trackingFile.txt");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "BundleUncompressed", "UncompressedBundle.wxs"),
+                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
+                    "-bindpath", Path.Combine(folder, ".Data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", exePath,
+                    "-trackingFile", trackingFile
+                });
+
+                result.AssertSuccess();
+
+                Assert.True(File.Exists(exePath));
+                Assert.True(File.Exists(Path.Combine(Path.GetDirectoryName(exePath), "test.txt")));
+
+                var trackedLines = File.ReadAllLines(trackingFile).Select(s => s.Replace(baseFolder, null, StringComparison.OrdinalIgnoreCase).Replace(folder, null, StringComparison.OrdinalIgnoreCase)).ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "BuiltOutput\tbin\\test.exe",
+                    "BuiltOutput\tbin\\test.wixpdb",
+                    "CopiedOutput\tbin\\test.txt",
+                    "Input\tSimpleBundle\\data\\fakeba.dll",
+                    "Input\tSimpleBundle\\data\\MsiPackage\\test.txt"
+                }, trackedLines);
+            }
+        }
+
+        [Fact]
         public void CantBuildWithDuplicateCacheIds()
         {
             var folder = TestData.Get(@"TestData");
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleUncompressed/UncompressedBundle.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleUncompressed/UncompressedBundle.wxs
new file mode 100644
index 00000000..a9d09ede
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleUncompressed/UncompressedBundle.wxs
@@ -0,0 +1,11 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC" Compressed="no">
+        <BootstrapperApplication>
+            <BootstrapperApplicationDll SourceFile="fakeba.dll" />
+        </BootstrapperApplication>
+
+        <Chain>
+            <ExePackage Permanent="yes" DetectCondition="none" SourceFile="MsiPackage\test.txt" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index b3d25406..b1a97644 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -44,7 +44,7 @@ namespace WixToolsetTest.Sdk
             }
         }
 
-        [Theory(Skip = "https://github.com/wixtoolset/issues/issues/6407")]
+        [Theory]
         [InlineData(BuildSystem.DotNetCoreSdk)]
         [InlineData(BuildSystem.MSBuild)]
         [InlineData(BuildSystem.MSBuild64)]
@@ -71,9 +71,9 @@ namespace WixToolsetTest.Sdk
                     .ToArray();
                 WixAssert.CompareLineByLine(new[]
                 {
-                    @"bin\x86\Release\SimpleBundle.exe",
-                    @"bin\x86\Release\SimpleBundle.wixpdb",
                     @"bin\x86\Release\test.txt",
+                    @"bin\x86\Release\UncompressedBundle.exe",
+                    @"bin\x86\Release\UncompressedBundle.wixpdb",
                 }, paths);
             }
         }