From 192c5aa59b5d8e5e9df9095982317c224f3d4f04 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Fri, 27 Mar 2020 18:05:18 -0400
Subject: Fix bundle-build extension library extraction.

---
 src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs           |  9 +++------
 .../CompileCoreTestExtensionWixlib.csproj                    |  4 ++--
 src/test/CompileCoreTestExtensionWixlib/Program.cs           | 12 ++++++++----
 src/test/Example.Extension/Example.Extension.csproj          |  2 +-
 src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs     | 10 +---------
 src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs     |  4 ++--
 6 files changed, 17 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index da655469..9f98483f 100644
--- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -122,14 +122,11 @@ namespace WixToolset.Core.Burn
             // of this in the 4.0 timeframe.
             var orderedSearches = this.OrderSearches(section);
 
-#if THIS_SHOULD_BE_DELETED_SINCE_RESOLVE_DOES_THIS_NOW
-            // Extract files that come from cabinet files (this does not extract files from merge modules).
+            // Extract files that come from binary .wixlibs and WixExtensions (this does not extract files from merge modules).
             {
-                var extractEmbeddedFilesCommand = new ExtractEmbeddedFilesCommand();
-                extractEmbeddedFilesCommand.FilesWithEmbeddedFiles = ExpectedEmbeddedFiles;
-                extractEmbeddedFilesCommand.Execute();
+                var command = new ExtractEmbeddedFilesCommand(this.ExpectedEmbeddedFiles);
+                command.Execute();
             }
-#endif
 
             // Get the explicit payloads.
             var payloadTuples = section.Tuples.OfType<WixBundlePayloadTuple>().ToDictionary(t => t.Id.Id);
diff --git a/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj b/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj
index 4bc1d02b..7e5c33ef 100644
--- a/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj
+++ b/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFramework>net472</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/test/CompileCoreTestExtensionWixlib/Program.cs b/src/test/CompileCoreTestExtensionWixlib/Program.cs
index 308ab8a2..323b5e5e 100644
--- a/src/test/CompileCoreTestExtensionWixlib/Program.cs
+++ b/src/test/CompileCoreTestExtensionWixlib/Program.cs
@@ -16,15 +16,19 @@ namespace CompileCoreTestExtensionWixlib
 
             var buildArgs = new List<string>();
             buildArgs.Add("build");
-            foreach (var path in args[2].Split(';'))
-            {
-                buildArgs.Add(path);
-            }
+            buildArgs.Add("-bindfiles");
+            buildArgs.Add("-bindpath");
+            buildArgs.Add("Data");
             buildArgs.Add("-intermediateFolder");
             buildArgs.Add(intermediateFolder);
             buildArgs.Add("-o");
             buildArgs.Add(wixlibPath);
 
+            foreach (var path in args[2].Split(';'))
+            {
+                buildArgs.Add(path);
+            }
+
             var result = WixRunner.Execute(buildArgs.ToArray());
 
             result.AssertSuccess();
diff --git a/src/test/Example.Extension/Example.Extension.csproj b/src/test/Example.Extension/Example.Extension.csproj
index e9483c72..8b4d4e86 100644
--- a/src/test/Example.Extension/Example.Extension.csproj
+++ b/src/test/Example.Extension/Example.Extension.csproj
@@ -24,7 +24,7 @@
 
   <Target Name="SetExtensionWixlib">
     <PropertyGroup>
-      <CompileWixlibExePath>$(OutputPath)..\net461\CompileCoreTestExtensionWixlib.exe</CompileWixlibExePath>
+      <CompileWixlibExePath>$(OutputPath)..\net472\CompileCoreTestExtensionWixlib.exe</CompileWixlibExePath>
       <WixlibPath>$(IntermediateOutputPath)Example.wixlib</WixlibPath>
     </PropertyGroup>
 
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
index 0e127e6e..58f61ab8 100644
--- a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
@@ -101,7 +101,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void CanBuildSimpleBundleUsingExtensionBA()
         {
             var burnStubPath = TestData.Get(@"TestData\.Data\burn.exe");
@@ -113,14 +113,6 @@ namespace WixToolsetTest.CoreIntegration
                 var baseFolder = fs.GetFolder();
                 var intermediateFolder = Path.Combine(baseFolder, "obj");
 
-                var libResult = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(@"C:\src\mynewwix4\Core\src\test\Example.Extension\Data", "example.wxs"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, @"test.wixlib")
-                });
-
                 var result = WixRunner.Execute(new[]
                 {
                     "build",
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
index b3d7da26..25067830 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
@@ -103,7 +103,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void CanBuildMsiUsingExtensionLibrary()
         {
             var folder = TestData.Get(@"TestData\Wixipl");
@@ -147,7 +147,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void CanBuildWixiplUsingExtensionLibrary()
         {
             var folder = TestData.Get(@"TestData\Wixipl");
-- 
cgit v1.2.3-55-g6feb