Support build of a .wixipl to final output

3 files changed, 138 insertions, 24 deletions

diff --git a/src/WixToolset.Core/Binder.cs b/src/WixToolset.Core/Binder.cs
index 23f1ba21..2a40ce71 100644
--- a/src/WixToolset.Core/Binder.cs
+++ b/src/WixToolset.Core/Binder.cs
@@ -8,7 +8,6 @@ namespace WixToolset.Core
     using System.Linq;
     using System.Reflection;
     using WixToolset.Data;
-    using WixToolset.Data.Bind;
     using WixToolset.Data.Tuples;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index d8327b7a..822c4a9a 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -74,17 +74,16 @@ namespace WixToolset.Core.CommandLine
 
         public int Execute()
         {
-            var wixobjs = this.CompilePhase();
+            var creator = this.ServiceProvider.GetService<ITupleDefinitionCreator>();
+
+            this.EvaluateSourceFiles(creator, out var codeFiles, out var wixipl);
 
             if (this.Messaging.EncounteredError)
             {
                 return this.Messaging.LastErrorNumber;
             }
 
-            if (!wixobjs.Any())
-            {
-                return 1;
-            }
+            var wixobjs = this.CompilePhase(codeFiles);
 
             var wxls = this.LoadLocalizationFiles().ToList();
 
@@ -104,7 +103,10 @@ namespace WixToolset.Core.CommandLine
             }
             else
             {
-                var wixipl = this.LinkPhase(wixobjs);
+                if (wixipl == null)
+                {
+                    wixipl = this.LinkPhase(wixobjs, creator);
+                }
 
                 if (!this.Messaging.EncounteredError)
                 {
@@ -122,12 +124,50 @@ namespace WixToolset.Core.CommandLine
             return this.Messaging.LastErrorNumber;
         }
 
-        private IEnumerable<Intermediate> CompilePhase()
+        private void EvaluateSourceFiles(ITupleDefinitionCreator creator, out List<SourceFile> codeFiles, out Intermediate wixipl)
         {
-            var intermediates = new List<Intermediate>();
+            codeFiles = new List<SourceFile>();
+
+            wixipl = null;
 
             foreach (var sourceFile in this.SourceFiles)
             {
+                var extension = Path.GetExtension(sourceFile.SourcePath);
+
+                if (wixipl != null || ".wxs".Equals(extension, StringComparison.OrdinalIgnoreCase))
+                {
+                    codeFiles.Add(sourceFile);
+                }
+                else
+                {
+                    try
+                    {
+                        wixipl = Intermediate.Load(sourceFile.SourcePath, creator);
+                    }
+                    catch (WixException)
+                    {
+                        // We'll assume anything that isn't a valid intermediate is source code to compile.
+                        codeFiles.Add(sourceFile);
+                    }
+                }
+            }
+
+            if (wixipl == null && codeFiles.Count == 0)
+            {
+                this.Messaging.Write(ErrorMessages.NoSourceFiles());
+            }
+            else if (wixipl != null && codeFiles.Count != 0)
+            {
+                this.Messaging.Write(ErrorMessages.WixiplSourceFileIsExclusive());
+            }
+        }
+
+        private IEnumerable<Intermediate> CompilePhase(IEnumerable<SourceFile> sourceFiles)
+        {
+            var intermediates = new List<Intermediate>();
+
+            foreach (var sourceFile in sourceFiles)
+            {
                 var preprocessor = new Preprocessor(this.ServiceProvider);
                 preprocessor.IncludeSearchPaths = this.IncludeSearchPaths;
                 preprocessor.Platform = Platform.X86; // TODO: set this correctly
@@ -159,12 +199,6 @@ namespace WixToolset.Core.CommandLine
 
         private Intermediate LibraryPhase(IEnumerable<Intermediate> intermediates, IEnumerable<Localization> localizations)
         {
-            // If there was an error loading localization files, then bail.
-            if (this.Messaging.EncounteredError)
-            {
-                return null;
-            }
-
             var librarian = new Librarian(this.ServiceProvider);
             librarian.BindFiles = this.BindFiles;
             librarian.BindPaths = this.BindPaths;
@@ -173,10 +207,8 @@ namespace WixToolset.Core.CommandLine
             return librarian.Execute();
         }
 
-        private Intermediate LinkPhase(IEnumerable<Intermediate> intermediates)
+        private Intermediate LinkPhase(IEnumerable<Intermediate> intermediates, ITupleDefinitionCreator creator)
         {
-            var creator = this.ServiceProvider.GetService<ITupleDefinitionCreator>();
-
             var libraries = this.LoadLibraries(creator);
 
             if (this.Messaging.EncounteredError)
@@ -194,12 +226,6 @@ namespace WixToolset.Core.CommandLine
 
         private void BindPhase(Intermediate output, IEnumerable<Localization> localizations)
         {
-            // If there was an error loading localization files, then bail.
-            if (this.Messaging.EncounteredError)
-            {
-                return;
-            }
-
             ResolveResult resolveResult;
             {
                 var resolver = new Resolver(this.ServiceProvider);
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
new file mode 100644
index 00000000..498b1492
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
@@ -0,0 +1,89 @@
+// 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 WixToolsetTest.CoreIntegration
+{
+    using System.IO;
+    using System.Linq;
+    using WixBuildTools.TestSupport;
+    using WixToolset.Core.TestPackage;
+    using WixToolset.Data;
+    using WixToolset.Data.Tuples;
+    using Xunit;
+
+    public class WixiplFixture
+    {
+        [Fact]
+        public void CanBuildSingleFile()
+        {
+            var folder = TestData.Get(@"TestData\SingleFile");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Package.wxs"),
+                    Path.Combine(folder, "PackageComponents.wxs"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", Path.Combine(intermediateFolder, @"test.wixipl")
+                }, out var messagesCompile);
+                Assert.Equal(0, result);
+
+                result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(intermediateFolder, @"test.wixipl"),
+                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
+                    "-bindpath", Path.Combine(folder, "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
+                }, out var messagesBind);
+                Assert.Equal(0, result);
+
+                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wir"));
+                var section = intermediate.Sections.Single();
+
+                var wixFile = section.Tuples.OfType<WixFileTuple>().Single();
+                Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path);
+                Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
+            }
+        }
+
+        [Fact]
+        public void CannotBuildWithSourceFileAndWixipl()
+        {
+            var folder = TestData.Get(@"TestData\SingleFile");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Package.wxs"),
+                    Path.Combine(folder, "PackageComponents.wxs"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", Path.Combine(intermediateFolder, @"test.wixipl")
+                }, out var messagesCompile);
+                Assert.Equal(0, result);
+
+                result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Package.wxs"),
+                    Path.Combine(intermediateFolder, @"test.wixipl"),
+                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
+                    "-bindpath", Path.Combine(folder, "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", Path.Combine(baseFolder, @"bin\test.msi")
+                }, out var messagesBind);
+                Assert.Equal((int)ErrorMessages.Ids.WixiplSourceFileIsExclusive, result);
+            }
+        }
+    }
+}