8 files changed, 267 insertions, 113 deletions

diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index 92aa3343..5653afca 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Core.CommandLine
 {
     using System;
     using System.Collections.Generic;
@@ -13,7 +13,7 @@ namespace WixToolset.Core
 
     internal class BuildCommand : ICommandLineCommand
     {
-        public BuildCommand(IServiceProvider serviceProvider, IMessaging messaging, IExtensionManager extensions, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables, IEnumerable<string> locFiles, IEnumerable<string> libraryFiles, string outputPath, OutputType outputType, string cabCachePath, IEnumerable<string> cultures, bool bindFiles, IEnumerable<BindPath> bindPaths, string intermediateFolder, string contentsFile, string outputsFile, string builtOutputsFile, string wixProjectFile)
+        public BuildCommand(IServiceProvider serviceProvider, IMessaging messaging, IExtensionManager extensions, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables, IEnumerable<string> locFiles, IEnumerable<string> libraryFiles, string outputPath, OutputType outputType, string cabCachePath, IEnumerable<string> cultures, bool bindFiles, IEnumerable<BindPath> bindPaths, string intermediateFolder, string contentsFile, string outputsFile, string builtOutputsFile)
         {
             this.ServiceProvider = serviceProvider;
             this.Messaging = messaging;
@@ -34,7 +34,6 @@ namespace WixToolset.Core
             this.ContentsFile = contentsFile;
             this.OutputsFile = outputsFile;
             this.BuiltOutputsFile = builtOutputsFile;
-            this.WixProjectFile = wixProjectFile;
         }
 
         public IServiceProvider ServiceProvider { get; }
@@ -73,8 +72,6 @@ namespace WixToolset.Core
 
         public string BuiltOutputsFile { get; }
 
-        public string WixProjectFile { get; }
-
         public int Execute()
         {
             var intermediates = this.CompilePhase();
@@ -207,7 +204,12 @@ namespace WixToolset.Core
 
             ResolveResult resolveResult;
             {
-                var resolver = new Resolver(this.ServiceProvider, this.BindPaths, output, this.IntermediateFolder, localizations);
+                var resolver = new Resolver(this.ServiceProvider);
+                resolver.BindPaths = this.BindPaths;
+                resolver.IntermediateFolder = this.IntermediateFolder;
+                resolver.IntermediateRepresentation = output;
+                resolver.Localizations = localizations;
+
                 resolveResult = resolver.Execute();
             }
 
@@ -224,28 +226,22 @@ namespace WixToolset.Core
                     intermediateFolder = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
                 }
 
-                var context = this.ServiceProvider.GetService<IBindContext>();
-                context.Messaging = this.Messaging;
-                //context.CabbingThreadCount = this.CabbingThreadCount;
-                context.CabCachePath = this.CabCachePath;
-                context.Codepage = resolveResult.Codepage;
-                //context.DefaultCompressionLevel = this.DefaultCompressionLevel;
-                context.DelayedFields = resolveResult.DelayedFields;
-                context.ExpectedEmbeddedFiles = resolveResult.ExpectedEmbeddedFiles;
-                //context.Ices = this.Ices;
-                context.IntermediateFolder = intermediateFolder;
-                context.IntermediateRepresentation = resolveResult.IntermediateRepresentation;
-                context.OutputPath = this.OutputPath;
-                context.OutputPdbPath = Path.ChangeExtension(this.OutputPath, ".wixpdb");
-                //context.SuppressIces = this.SuppressIces;
-                context.SuppressValidation = true; // TODO: set this correctly
-                context.ContentsFile = this.ContentsFile;
-                context.OutputsFile = this.OutputsFile;
-                context.BuiltOutputsFile = this.BuiltOutputsFile;
-                context.WixprojectFile = this.WixProjectFile;
-
-                var binder = new Binder();
-                bindResult = binder.Bind(context);
+                var binder = new Binder(this.ServiceProvider);
+                //binder.CabbingThreadCount = this.CabbingThreadCount;
+                binder.CabCachePath = this.CabCachePath;
+                binder.Codepage = resolveResult.Codepage;
+                //binder.DefaultCompressionLevel = this.DefaultCompressionLevel;
+                binder.DelayedFields = resolveResult.DelayedFields;
+                binder.ExpectedEmbeddedFiles = resolveResult.ExpectedEmbeddedFiles;
+                binder.Ices = Array.Empty<string>(); // TODO: set this correctly
+                binder.IntermediateFolder = intermediateFolder;
+                binder.IntermediateRepresentation = resolveResult.IntermediateRepresentation;
+                binder.OutputPath = this.OutputPath;
+                binder.OutputPdbPath = Path.ChangeExtension(this.OutputPath, ".wixpdb");
+                binder.SuppressIces = Array.Empty<string>(); // TODO: set this correctly
+                binder.SuppressValidation = true; // TODO: set this correctly
+
+                bindResult = binder.Execute();
             }
 
             if (this.Messaging.EncounteredError)
@@ -254,8 +250,14 @@ namespace WixToolset.Core
             }
 
             {
-                // TODO: correctly set SuppressAclReset bool at the end.
-                var layout = new Layout(this.ServiceProvider, bindResult.FileTransfers, bindResult.ContentFilePaths, this.ContentsFile, this.OutputsFile, this.BuiltOutputsFile, false);
+                var layout = new Layout(this.ServiceProvider);
+                layout.FileTransfers = bindResult.FileTransfers;
+                layout.ContentFilePaths = bindResult.ContentFilePaths;
+                layout.ContentsFile = this.ContentsFile;
+                layout.OutputsFile = this.OutputsFile;
+                layout.BuiltOutputsFile = this.BuiltOutputsFile;
+                layout.SuppressAclReset = false; // TODO: correctly set SuppressAclReset
+
                 layout.Execute();
             }
         }
diff --git a/src/WixToolset.Core/CommandLine/CommandLineContext.cs b/src/WixToolset.Core/CommandLine/CommandLineContext.cs
index cbb9af53..2ff2c1fd 100644
--- a/src/WixToolset.Core/CommandLine/CommandLineContext.cs
+++ b/src/WixToolset.Core/CommandLine/CommandLineContext.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Core.CommandLine
 {
     using System;
     using WixToolset.Extensibility.Services;
diff --git a/src/WixToolset.Core/CommandLine/CommandLineHelper.cs b/src/WixToolset.Core/CommandLine/CommandLineHelper.cs
new file mode 100644
index 00000000..51ece0f7
--- /dev/null
+++ b/src/WixToolset.Core/CommandLine/CommandLineHelper.cs
@@ -0,0 +1,216 @@
+// 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.CommandLine
+{
+    using System;
+    using System.IO;
+    using WixToolset.Data;
+    using WixToolset.Extensibility.Services;
+
+    public class CommandLineHelper
+    {
+        /// <summary>
+        /// Validates that a string is a valid directory name, and throws appropriate warnings/errors if not
+        /// </summary>
+        /// <param name="commandlineSwitch">The commandline switch we're parsing (for error display purposes).</param>
+        /// <param name="messageHandler">The messagehandler to report warnings/errors to.</param>
+        /// <param name="args">The list of strings to check.</param>
+        /// <param name="index">The index (in args) of the commandline parameter to be parsed.</param>
+        /// <returns>The string if it is valid, null if it is invalid.</returns>
+        public static string GetDirectory(string commandlineSwitch, IMessaging messageHandler, string[] args, int index)
+        {
+            return GetDirectory(commandlineSwitch, messageHandler, args, index, false);
+        }
+
+        /// <summary>
+        /// Validates that a string is a valid directory name, and throws appropriate warnings/errors if not
+        /// </summary>
+        /// <param name="commandlineSwitch">The commandline switch we're parsing (for error display purposes).</param>
+        /// <param name="messageHandler">The messagehandler to report warnings/errors to.</param>
+        /// <param name="args">The list of strings to check.</param>
+        /// <param name="index">The index (in args) of the commandline parameter to be parsed.</param>
+        /// <param name="allowPrefix">Indicates if a colon-delimited prefix is allowed.</param>
+        /// <returns>The string if it is valid, null if it is invalid.</returns>
+        public static string GetDirectory(string commandlineSwitch, IMessaging messageHandler, string[] args, int index, bool allowPrefix)
+        {
+            commandlineSwitch = String.Concat("-", commandlineSwitch);
+
+            if (!IsValidArg(args, index))
+            {
+                messageHandler.Write(ErrorMessages.DirectoryPathRequired(commandlineSwitch));
+                return null;
+            }
+
+            if (File.Exists(args[index]))
+            {
+                messageHandler.Write(ErrorMessages.ExpectedDirectoryGotFile(commandlineSwitch, args[index]));
+                return null;
+            }
+
+            return VerifyPath(messageHandler, args[index], allowPrefix);
+        }
+
+        /// <summary>
+        /// Validates that a string is a valid filename, and throws appropriate warnings/errors if not
+        /// </summary>
+        /// <param name="commandlineSwitch">The commandline switch we're parsing (for error display purposes).</param>
+        /// <param name="messageHandler">The messagehandler to report warnings/errors to.</param>
+        /// <param name="args">The list of strings to check.</param>
+        /// <param name="index">The index (in args) of the commandline parameter to be parsed.</param>
+        /// <returns>The string if it is valid, null if it is invalid.</returns>
+        public static string GetFile(string commandlineSwitch, IMessaging messageHandler, string[] args, int index)
+        {
+            commandlineSwitch = String.Concat("-", commandlineSwitch);
+
+            if (!IsValidArg(args, index))
+            {
+                messageHandler.Write(ErrorMessages.FilePathRequired(commandlineSwitch));
+                return null;
+            }
+
+            if (Directory.Exists(args[index]))
+            {
+                messageHandler.Write(ErrorMessages.ExpectedFileGotDirectory(commandlineSwitch, args[index]));
+                return null;
+            }
+
+            return VerifyPath(messageHandler, args[index]);
+        }
+
+        /// <summary>
+        /// Get a set of files that possibly have a search pattern in the path (such as '*').
+        /// </summary>
+        /// <param name="searchPath">Search path to find files in.</param>
+        /// <param name="fileType">Type of file; typically "Source".</param>
+        /// <returns>An array of files matching the search path.</returns>
+        /// <remarks>
+        /// This method is written in this verbose way because it needs to support ".." in the path.
+        /// It needs the directory path isolated from the file name in order to use Directory.GetFiles
+        /// or DirectoryInfo.GetFiles.  The only way to get this directory path is manually since
+        /// Path.GetDirectoryName does not support ".." in the path.
+        /// </remarks>
+        /// <exception cref="WixFileNotFoundException">Throws WixFileNotFoundException if no file matching the pattern can be found.</exception>
+        public static string[] GetFiles(string searchPath, string fileType)
+        {
+            if (null == searchPath)
+            {
+                throw new ArgumentNullException(nameof(searchPath));
+            }
+
+            // Convert alternate directory separators to the standard one.
+            string filePath = searchPath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+            int lastSeparator = filePath.LastIndexOf(Path.DirectorySeparatorChar);
+            string[] files = null;
+
+            try
+            {
+                if (0 > lastSeparator)
+                {
+                    files = Directory.GetFiles(".", filePath);
+                }
+                else // found directory separator
+                {
+                    files = Directory.GetFiles(filePath.Substring(0, lastSeparator + 1), filePath.Substring(lastSeparator + 1));
+                }
+            }
+            catch (DirectoryNotFoundException)
+            {
+                // Don't let this function throw the DirectoryNotFoundException. This exception
+                // occurs for non-existant directories and invalid characters in the searchPattern.
+            }
+            catch (ArgumentException)
+            {
+                // Don't let this function throw the ArgumentException. This exception
+                // occurs in certain situations such as when passing a malformed UNC path.
+            }
+            catch (IOException)
+            {
+                throw new WixFileNotFoundException(searchPath, fileType);
+            }
+
+            if (null == files || 0 == files.Length)
+            {
+                throw new WixFileNotFoundException(searchPath, fileType);
+            }
+
+            return files;
+        }
+
+        /// <summary>
+        /// Validates that a valid string parameter (without "/" or "-"), and returns a bool indicating its validity
+        /// </summary>
+        /// <param name="args">The list of strings to check.</param>
+        /// <param name="index">The index (in args) of the commandline parameter to be validated.</param>
+        /// <returns>True if a valid string parameter exists there, false if not.</returns>
+        public static bool IsValidArg(string[] args, int index)
+        {
+            if (args.Length <= index || String.IsNullOrEmpty(args[index]) || '/' == args[index][0] || '-' == args[index][0])
+            {
+                return false;
+            }
+            else
+            {
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Validates that a commandline parameter is a valid file or directory name, and throws appropriate warnings/errors if not
+        /// </summary>
+        /// <param name="messageHandler">The messagehandler to report warnings/errors to.</param>
+        /// <param name="path">The path to test.</param>
+        /// <returns>The string if it is valid, null if it is invalid.</returns>
+        public static string VerifyPath(IMessaging messageHandler, string path)
+        {
+            return VerifyPath(messageHandler, path, false);
+        }
+
+        /// <summary>
+        /// Validates that a commandline parameter is a valid file or directory name, and throws appropriate warnings/errors if not
+        /// </summary>
+        /// <param name="messageHandler">The messagehandler to report warnings/errors to.</param>
+        /// <param name="path">The path to test.</param>
+        /// <param name="allowPrefix">Indicates if a colon-delimited prefix is allowed.</param>
+        /// <returns>The full path if it is valid, null if it is invalid.</returns>
+        public static string VerifyPath(IMessaging messageHandler, string path, bool allowPrefix)
+        {
+            string fullPath;
+
+            if (0 <= path.IndexOf('\"'))
+            {
+                messageHandler.Write(ErrorMessages.PathCannotContainQuote(path));
+                return null;
+            }
+
+            try
+            {
+                string prefix = null;
+                if (allowPrefix)
+                {
+                    int prefixLength = path.IndexOf('=') + 1;
+                    if (0 != prefixLength)
+                    {
+                        prefix = path.Substring(0, prefixLength);
+                        path = path.Substring(prefixLength);
+                    }
+                }
+
+                if (String.IsNullOrEmpty(prefix))
+                {
+                    fullPath = Path.GetFullPath(path);
+                }
+                else
+                {
+                    fullPath = String.Concat(prefix, Path.GetFullPath(path));
+                }
+            }
+            catch (Exception e)
+            {
+                messageHandler.Write(ErrorMessages.InvalidCommandLineFileName(path, e.Message));
+                return null;
+            }
+
+            return fullPath;
+        }
+    }
+}
diff --git a/src/WixToolset.Core/CommandLine/CommandLine.cs b/src/WixToolset.Core/CommandLine/CommandLineParser.cs
index 97f79755..0e7da42a 100644
--- a/src/WixToolset.Core/CommandLine/CommandLine.cs
+++ b/src/WixToolset.Core/CommandLine/CommandLineParser.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Core.CommandLine
 {
     using System;
     using System.Collections.Generic;
@@ -22,7 +22,7 @@ namespace WixToolset.Core
         Bind,
     }
 
-    internal class CommandLine : ICommandLine, IParseCommandLine
+    internal class CommandLineParser : ICommandLine, IParseCommandLine
     {
         private IServiceProvider ServiceProvider { get; set; }
 
@@ -54,7 +54,7 @@ namespace WixToolset.Core
 
             if (!String.IsNullOrEmpty(context.Arguments))
             {
-                args = CommandLine.ParseArgumentsToArray(context.Arguments).Union(args).ToArray();
+                args = CommandLineParser.ParseArgumentsToArray(context.Arguments).Union(args).ToArray();
             }
 
             return this.ParseStandardCommandLine(context, args);
@@ -88,13 +88,12 @@ namespace WixToolset.Core
             var contentsFile = String.Empty;
             var outputsFile = String.Empty;
             var builtOutputsFile = String.Empty;
-            var wixProjectFile = String.Empty;
 
             this.Parse(context, args, (cmdline, arg) => Enum.TryParse(arg, true, out command), (cmdline, arg) =>
             {
                 if (cmdline.IsSwitch(arg))
                 {
-                    var parameter = arg.TrimStart(new[] { '-', '/' });
+                    var parameter = arg.Substring(1);
                     switch (parameter.ToLowerInvariant())
                     {
                         case "?":
@@ -127,9 +126,6 @@ namespace WixToolset.Core
                         case "builtoutputsfile":
                             cmdline.GetNextArgumentOrError(ref builtOutputsFile);
                             return true;
-                        case "wixprojectfile":
-                            cmdline.GetNextArgumentOrError(ref wixProjectFile);
-                            return true;
 
                         case "d":
                         case "define":
@@ -181,7 +177,7 @@ namespace WixToolset.Core
                 }
                 else
                 {
-                    files.AddRange(cmdline.GetFiles(arg, "source code"));
+                    files.AddRange(CommandLineHelper.GetFiles(arg, "source code"));
                     return true;
                 }
             });
@@ -211,7 +207,7 @@ namespace WixToolset.Core
                         var variables = this.GatherPreprocessorVariables(defines);
                         var bindPathList = this.GatherBindPaths(bindPaths);
                         var type = CalculateOutputType(outputType, outputFile);
-                        return new BuildCommand(this.ServiceProvider, this.Messaging, this.ExtensionManager, sourceFiles, variables, locFiles, libraryFiles, outputFile, type, cabCachePath, cultures, bindFiles, bindPathList, intermediateFolder, contentsFile, outputsFile, builtOutputsFile, wixProjectFile);
+                        return new BuildCommand(this.ServiceProvider, this.Messaging, this.ExtensionManager, sourceFiles, variables, locFiles, libraryFiles, outputFile, type, cabCachePath, cultures, bindFiles, bindPathList, intermediateFolder, contentsFile, outputsFile, builtOutputsFile);
                     }
 
                 case Commands.Compile:
@@ -283,7 +279,7 @@ namespace WixToolset.Core
         }
 #endif
 
-        private ICommandLine Parse(ICommandLineContext context, string[] commandLineArguments, Func<CommandLine, string, bool> parseCommand, Func<CommandLine, string, bool> parseArgument)
+        private ICommandLine Parse(ICommandLineContext context, string[] commandLineArguments, Func<CommandLineParser, string, bool> parseCommand, Func<CommandLineParser, string, bool> parseArgument)
         {
             this.FlattenArgumentsWithResponseFilesIntoOriginalArguments(commandLineArguments);
 
@@ -335,7 +331,7 @@ namespace WixToolset.Core
 
             foreach (var bindPath in bindPaths)
             {
-                BindPath bp = BindPath.Parse(bindPath);
+                var bp = BindPath.Parse(bindPath);
 
                 if (Directory.Exists(bp.Path))
                 {
@@ -351,65 +347,6 @@ namespace WixToolset.Core
         }
 
         /// <summary>
-        /// Get a set of files that possibly have a search pattern in the path (such as '*').
-        /// </summary>
-        /// <param name="searchPath">Search path to find files in.</param>
-        /// <param name="fileType">Type of file; typically "Source".</param>
-        /// <returns>An array of files matching the search path.</returns>
-        /// <remarks>
-        /// This method is written in this verbose way because it needs to support ".." in the path.
-        /// It needs the directory path isolated from the file name in order to use Directory.GetFiles
-        /// or DirectoryInfo.GetFiles.  The only way to get this directory path is manually since
-        /// Path.GetDirectoryName does not support ".." in the path.
-        /// </remarks>
-        /// <exception cref="WixFileNotFoundException">Throws WixFileNotFoundException if no file matching the pattern can be found.</exception>
-        public string[] GetFiles(string searchPath, string fileType)
-        {
-            if (null == searchPath)
-            {
-                throw new ArgumentNullException(nameof(searchPath));
-            }
-
-            // Convert alternate directory separators to the standard one.
-            string filePath = searchPath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-            int lastSeparator = filePath.LastIndexOf(Path.DirectorySeparatorChar);
-            string[] files = null;
-
-            try
-            {
-                if (0 > lastSeparator)
-                {
-                    files = Directory.GetFiles(".", filePath);
-                }
-                else // found directory separator
-                {
-                    files = Directory.GetFiles(filePath.Substring(0, lastSeparator + 1), filePath.Substring(lastSeparator + 1));
-                }
-            }
-            catch (DirectoryNotFoundException)
-            {
-                // Don't let this function throw the DirectoryNotFoundException. This exception
-                // occurs for non-existant directories and invalid characters in the searchPattern.
-            }
-            catch (ArgumentException)
-            {
-                // Don't let this function throw the ArgumentException. This exception
-                // occurs in certain situations such as when passing a malformed UNC path.
-            }
-            catch (IOException)
-            {
-                throw new WixFileNotFoundException(searchPath, fileType);
-            }
-
-            if (null == files || 0 == files.Length)
-            {
-                throw new WixFileNotFoundException(searchPath, fileType);
-            }
-
-            return files;
-        }
-
-        /// <summary>
         /// Validates that a valid switch (starts with "/" or "-"), and returns a bool indicating its validity
         /// </summary>
         /// <param name="args">The list of strings to check.</param>
@@ -449,7 +386,7 @@ namespace WixToolset.Core
         {
             if (this.TryGetNextArgumentOrError(out var arg))
             {
-                foreach (var path in this.GetFiles(arg, fileType))
+                foreach (var path in CommandLineHelper.GetFiles(arg, fileType))
                 {
                     args.Add(path);
                 }
@@ -458,13 +395,12 @@ namespace WixToolset.Core
 
         public bool TryGetNextArgumentOrError(out string arg)
         {
-            //if (this.RemainingArguments.TryDequeue(out arg) && !this.IsSwitch(arg))
             if (TryDequeue(this.RemainingArguments, out arg) && !this.IsSwitch(arg))
             {
                 return true;
             }
 
-            this.ErrorArgument = arg ?? CommandLine.ExpectedArgument;
+            this.ErrorArgument = arg ?? CommandLineParser.ExpectedArgument;
 
             return false;
         }
@@ -489,7 +425,7 @@ namespace WixToolset.Core
             {
                 if ('@' == arg[0])
                 {
-                    var responseFileArguments = CommandLine.ParseResponseFile(arg.Substring(1));
+                    var responseFileArguments = CommandLineParser.ParseResponseFile(arg.Substring(1));
                     args.AddRange(responseFileArguments);
                 }
                 else
@@ -526,7 +462,7 @@ namespace WixToolset.Core
             }
         }
 
-        private void ProcessRemainingArguments(ICommandLineContext context, Func<CommandLine, string, bool> parseArgument, Func<CommandLine, string, bool> parseCommand)
+        private void ProcessRemainingArguments(ICommandLineContext context, Func<CommandLineParser, string, bool> parseArgument, Func<CommandLineParser, string, bool> parseCommand)
         {
             var extensions = this.ExtensionManager.Create<IExtensionCommandLine>();
 
@@ -593,7 +529,7 @@ namespace WixToolset.Core
                 arguments = reader.ReadToEnd();
             }
 
-            return CommandLine.ParseArgumentsToArray(arguments);
+            return CommandLineParser.ParseArgumentsToArray(arguments);
         }
 
         private static List<string> ParseArgumentsToArray(string arguments)
@@ -631,7 +567,7 @@ namespace WixToolset.Core
                     // Add the argument to the list if it's not empty.
                     if (arg.Length > 0)
                     {
-                        argsList.Add(CommandLine.ExpandEnvironmentVariables(arg.ToString()));
+                        argsList.Add(CommandLineParser.ExpandEnvironmentVariables(arg.ToString()));
                         arg.Length = 0;
                     }
                 }
diff --git a/src/WixToolset.Core/CommandLine/CommandLineResponseFile.cs b/src/WixToolset.Core/CommandLine/CommandLineResponseFile.cs
index 578c3b22..6922b246 100644
--- a/src/WixToolset.Core/CommandLine/CommandLineResponseFile.cs
+++ b/src/WixToolset.Core/CommandLine/CommandLineResponseFile.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Core.CommandLine
 {
     using System;
     using System.Collections;
diff --git a/src/WixToolset.Core/CommandLine/CompileCommand.cs b/src/WixToolset.Core/CommandLine/CompileCommand.cs
index 856dd29f..f0ff5b1a 100644
--- a/src/WixToolset.Core/CommandLine/CompileCommand.cs
+++ b/src/WixToolset.Core/CommandLine/CompileCommand.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Core.CommandLine
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/WixToolset.Core/CommandLine/HelpCommand.cs b/src/WixToolset.Core/CommandLine/HelpCommand.cs
index 2a2eab24..6e547d60 100644
--- a/src/WixToolset.Core/CommandLine/HelpCommand.cs
+++ b/src/WixToolset.Core/CommandLine/HelpCommand.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Core.CommandLine
 {
     using System;
     using WixToolset.Extensibility.Services;
diff --git a/src/WixToolset.Core/CommandLine/VersionCommand.cs b/src/WixToolset.Core/CommandLine/VersionCommand.cs
index 12941bdc..a04aac31 100644
--- a/src/WixToolset.Core/CommandLine/VersionCommand.cs
+++ b/src/WixToolset.Core/CommandLine/VersionCommand.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Core.CommandLine
 {
     using System;
     using WixToolset.Extensibility.Services;