2 files changed, 50 insertions, 24 deletions

diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index e11cd15a..48f1b214 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -75,37 +75,48 @@ namespace WixToolset.Core.CommandLine
 
         public int Execute()
         {
-            var intermediates = this.CompilePhase();
+            var wixobjs = this.CompilePhase();
 
             if (this.Messaging.EncounteredError)
             {
                 return this.Messaging.LastErrorNumber;
             }
 
-            if (!intermediates.Any())
+            if (!wixobjs.Any())
             {
                 return 1;
             }
 
-            if (this.OutputType == OutputType.Library)
-            {
-                var library = this.LibraryPhase(intermediates);
+            var wxls = this.LoadLocalizationFiles();
 
-                library?.Save(this.OutputPath);
+            if (this.Messaging.EncounteredError)
+            {
+                return this.Messaging.LastErrorNumber;
             }
-            else if (this.OutputType == OutputType.IntermediatePostLink)
+
+            if (this.OutputType == OutputType.Library)
             {
-                var output = this.LinkPhase(intermediates);
+                var wixlib = this.LibraryPhase(wixobjs, wxls);
 
-                output?.Save(this.OutputPath);
+                if (!this.Messaging.EncounteredError)
+                {
+                    wixlib.Save(this.OutputPath);
+                }
             }
             else
             {
-                var output = this.LinkPhase(intermediates);
+                var wixipl = this.LinkPhase(wixobjs);
 
                 if (!this.Messaging.EncounteredError)
                 {
-                    this.BindPhase(output);
+                    if (this.OutputType == OutputType.IntermediatePostLink)
+                    {
+                        wixipl.Save(this.OutputPath);
+                    }
+                    else
+                    {
+                        this.BindPhase(wixipl, wxls);
+                    }
                 }
             }
 
@@ -147,10 +158,8 @@ namespace WixToolset.Core.CommandLine
             return intermediates;
         }
 
-        private Intermediate LibraryPhase(IEnumerable<Intermediate> intermediates)
+        private Intermediate LibraryPhase(IEnumerable<Intermediate> intermediates, IEnumerable<Localization> localizations)
         {
-            var localizations = this.LoadLocalizationFiles().ToList();
-
             // If there was an error loading localization files, then bail.
             if (this.Messaging.EncounteredError)
             {
@@ -184,12 +193,8 @@ namespace WixToolset.Core.CommandLine
             return linker.Execute();
         }
 
-        private void BindPhase(Intermediate output)
+        private void BindPhase(Intermediate output, IEnumerable<Localization> localizations)
         {
-            var localizations = new List<Localization>(output.Localizations);
-
-            localizations.AddRange(this.LoadLocalizationFiles());
-
             // If there was an error loading localization files, then bail.
             if (this.Messaging.EncounteredError)
             {
@@ -288,7 +293,19 @@ namespace WixToolset.Core.CommandLine
         {
             foreach (var loc in this.LocFiles)
             {
-                var localization = Localizer.ParseLocalizationFile(this.Messaging, loc);
+                var preprocessor = new Preprocessor(this.ServiceProvider);
+                preprocessor.IncludeSearchPaths = this.IncludeSearchPaths;
+                preprocessor.Platform = Platform.X86; // TODO: set this correctly
+                preprocessor.SourcePath = loc;
+                preprocessor.Variables = this.PreprocessorVariables;
+                var document = preprocessor.Execute();
+
+                if (this.Messaging.EncounteredError)
+                {
+                    continue;
+                }
+
+                var localization = Localizer.ParseLocalizationFile(this.Messaging, document);
 
                 yield return localization;
             }
diff --git a/src/WixToolset.Core/Localizer.cs b/src/WixToolset.Core/Localizer.cs
index 38d8864e..cb9a4406 100644
--- a/src/WixToolset.Core/Localizer.cs
+++ b/src/WixToolset.Core/Localizer.cs
@@ -22,13 +22,22 @@ namespace WixToolset.Core
         /// <summary>
         /// Loads a localization file from a path on disk.
         /// </summary>
-        /// <param name="path">Path to library file saved on disk.</param>
-        /// <param name="tableDefinitions">Collection containing TableDefinitions to use when loading the localization file.</param>
-        /// <param name="suppressSchema">Suppress xml schema validation while loading.</param>
+        /// <param name="path">Path to localization file saved on disk.</param>
         /// <returns>Returns the loaded localization file.</returns>
         public static Localization ParseLocalizationFile(IMessaging messaging, string path)
         {
-            XElement root = XDocument.Load(path).Root;
+            var document = XDocument.Load(path);
+            return ParseLocalizationFile(messaging, document);
+        }
+
+        /// <summary>
+        /// Loads a localization file from memory.
+        /// </summary>
+        /// <param name="document">Document to parse as localization file.</param>
+        /// <returns>Returns the loaded localization file.</returns>
+        public static Localization ParseLocalizationFile(IMessaging messaging, XDocument document)
+        {
+            XElement root = document.Root;
             Localization localization = null;
 
             SourceLineNumber sourceLineNumbers = SourceLineNumber.CreateFromXObject(root);