1 files changed, 26 insertions, 5 deletions

diff --git a/src/WixToolset.Extensibility/Services/ICommandLineParser.cs b/src/WixToolset.Extensibility/Services/ICommandLineParser.cs
index 60507c6c..f7e2a28f 100644
--- a/src/WixToolset.Extensibility/Services/ICommandLineParser.cs
+++ b/src/WixToolset.Extensibility/Services/ICommandLineParser.cs
@@ -1,15 +1,36 @@
-// 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.
+// 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.Extensibility.Services
 {
-    using WixToolset.Extensibility.Data;
+    using System.Collections.Generic;
 
     public interface ICommandLineParser
     {
-        IExtensionManager ExtensionManager { get; set; }
+        string ErrorArgument { get; set; }
 
-        ICommandLineArguments Arguments { get; set; }
+        /// <summary>
+        /// Validates that a valid switch (starts with "/" or "-"), and returns a bool indicating its validity
+        /// </summary>
+        /// <param name="arg">The string check.</param>
+        /// <returns>True if a valid switch, otherwise false.</returns>
+        bool IsSwitch(string arg);
 
-        ICommandLineCommand ParseStandardCommandLine();
+        string GetArgumentAsFilePathOrError(string argument, string fileType);
+
+        void GetArgumentAsFilePathOrError(string argument, string fileType, IList<string> paths);
+
+        string GetNextArgumentOrError(string commandLineSwitch);
+
+        bool GetNextArgumentOrError(string commandLineSwitch, IList<string> argument);
+
+        string GetNextArgumentAsDirectoryOrError(string commandLineSwitch);
+
+        bool GetNextArgumentAsDirectoryOrError(string commandLineSwitch, IList<string> directories);
+
+        string GetNextArgumentAsFilePathOrError(string commandLineSwitch);
+
+        bool GetNextArgumentAsFilePathOrError(string commandLineSwitch, string fileType, IList<string> paths);
+
+        bool TryGetNextSwitchOrArgument(out string arg);
     }
 }