5 files changed, 22 insertions, 6 deletions

diff --git a/src/WixToolset.BuildTasks/DoIt.cs b/src/WixToolset.BuildTasks/DoIt.cs
index 0c8d261c..aeeb428b 100644
--- a/src/WixToolset.BuildTasks/DoIt.cs
+++ b/src/WixToolset.BuildTasks/DoIt.cs
@@ -172,7 +172,7 @@ namespace WixToolset.BuildTasks
             var arguments = serviceProvider.GetService<ICommandLineArguments>();
             arguments.Populate(commandLineString);
 
-            var commandLine = serviceProvider.GetService<ICommandLineParser>();
+            var commandLine = serviceProvider.GetService<ICommandLine>();
             commandLine.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider, messaging, arguments.Extensions);
             commandLine.Arguments = arguments;
             var command = commandLine.ParseStandardCommandLine();
diff --git a/src/wix/Program.cs b/src/wix/Program.cs
index b0e3bb73..276eba53 100644
--- a/src/wix/Program.cs
+++ b/src/wix/Program.cs
@@ -3,11 +3,8 @@
 namespace WixToolset.Tools
 {
     using System;
-    using System.Globalization;
     using System.Linq;
     using System.Reflection;
-    using System.Text;
-    using System.Threading;
     using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility;
@@ -50,7 +47,7 @@ namespace WixToolset.Tools
             var arguments = serviceProvider.GetService<ICommandLineArguments>();
             arguments.Populate(args);
 
-            var commandLine = serviceProvider.GetService<ICommandLineParser>();
+            var commandLine = serviceProvider.GetService<ICommandLine>();
             commandLine.ExtensionManager = CreateExtensionManagerWithStandardBackends(serviceProvider, messaging, arguments.Extensions);
             commandLine.Arguments = arguments;
             var command = commandLine.ParseStandardCommandLine();
diff --git a/src/wixcop/CommandLine/ConvertCommand.cs b/src/wixcop/CommandLine/ConvertCommand.cs
index ab7cd359..c65652ab 100644
--- a/src/wixcop/CommandLine/ConvertCommand.cs
+++ b/src/wixcop/CommandLine/ConvertCommand.cs
@@ -50,6 +50,15 @@ namespace WixToolset.Tools.WixCop.CommandLine
 
         private bool SubDirectories { get; }
 
+        public bool ShowLogo => throw new NotImplementedException();
+
+        public bool StopParsing => throw new NotImplementedException();
+
+        public bool TryParseArgument(ICommandLineParser parser, string argument)
+        {
+            throw new NotImplementedException();
+        }
+
         public int Execute()
         {
             // parse the settings if any were specified
diff --git a/src/wixcop/CommandLine/HelpCommand.cs b/src/wixcop/CommandLine/HelpCommand.cs
index bfb784b0..1505dc59 100644
--- a/src/wixcop/CommandLine/HelpCommand.cs
+++ b/src/wixcop/CommandLine/HelpCommand.cs
@@ -4,9 +4,14 @@ namespace WixToolset.Tools.WixCop.CommandLine
 {
     using System;
     using WixToolset.Extensibility.Data;
+    using WixToolset.Extensibility.Services;
 
     internal class HelpCommand : ICommandLineCommand
     {
+        public bool ShowLogo => false;
+
+        public bool StopParsing => true;
+
         public int Execute()
         {
             Console.WriteLine(" usage:  wixcop.exe sourceFile [sourceFile ...]");
@@ -23,5 +28,10 @@ namespace WixToolset.Tools.WixCop.CommandLine
 
             return 0;
         }
+
+        public bool TryParseArgument(ICommandLineParser parser, string argument)
+        {
+            return true;
+        }
     }
 }
diff --git a/src/wixcop/CommandLine/WixCopCommandLineParser.cs b/src/wixcop/CommandLine/WixCopCommandLineParser.cs
index ae826d4f..73247dae 100644
--- a/src/wixcop/CommandLine/WixCopCommandLineParser.cs
+++ b/src/wixcop/CommandLine/WixCopCommandLineParser.cs
@@ -85,7 +85,7 @@ namespace WixToolset.Tools.WixCop.CommandLine
             }
         }
 
-        private bool ParseArgument(IParseCommandLine parser, string arg)
+        private bool ParseArgument(ICommandLineParser parser, string arg)
         {
             var parameter = arg.Substring(1);