From fbf986eb97f68396797a89fc7d40dec07b775440 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 7 Oct 2017 15:07:20 -0700
Subject: Rename ICommand to ICommandLineCommand

Removes conflicts with existing ICommand. More refactoring coming.
---
 src/WixToolset.Core/CommandLine/BuildCommand.cs        | 2 +-
 src/WixToolset.Core/CommandLine/CommandLine.cs         | 4 ++--
 src/WixToolset.Core/CommandLine/CompileCommand.cs      | 2 +-
 src/WixToolset.Core/CommandLine/HelpCommand.cs         | 2 +-
 src/WixToolset.Core/CommandLine/ICommand.cs            | 9 ---------
 src/WixToolset.Core/CommandLine/ICommandLineCommand.cs | 9 +++++++++
 src/WixToolset.Core/CommandLine/VersionCommand.cs      | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 src/WixToolset.Core/CommandLine/ICommand.cs
 create mode 100644 src/WixToolset.Core/CommandLine/ICommandLineCommand.cs

diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index c6ea27cc..afb9e829 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -9,7 +9,7 @@ namespace WixToolset.Core
     using WixToolset.Data;
     using WixToolset.Extensibility;
 
-    internal class BuildCommand : ICommand
+    internal class BuildCommand : ICommandLineCommand
     {
         public BuildCommand(ExtensionManager extensions, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables, IEnumerable<string> locFiles, IEnumerable<string> libraryFiles, string outputPath, OutputType outputType, IEnumerable<string> cultures, bool bindFiles, IEnumerable<BindPath> bindPaths, string intermediateFolder, string contentsFile, string outputsFile, string builtOutputsFile, string wixProjectFile)
         {
diff --git a/src/WixToolset.Core/CommandLine/CommandLine.cs b/src/WixToolset.Core/CommandLine/CommandLine.cs
index c95a2db4..a3a6831c 100644
--- a/src/WixToolset.Core/CommandLine/CommandLine.cs
+++ b/src/WixToolset.Core/CommandLine/CommandLine.cs
@@ -41,14 +41,14 @@ namespace WixToolset.Core
 
         public bool ShowHelp { get; set; }
 
-        public static ICommand ParseStandardCommandLine(string commandLineString)
+        public static ICommandLineCommand ParseStandardCommandLine(string commandLineString)
         {
             var args = CommandLine.ParseArgumentsToArray(commandLineString).ToArray();
 
             return ParseStandardCommandLine(args);
         }
 
-        public static ICommand ParseStandardCommandLine(string[] args)
+        public static ICommandLineCommand ParseStandardCommandLine(string[] args)
         {
             var next = String.Empty;
 
diff --git a/src/WixToolset.Core/CommandLine/CompileCommand.cs b/src/WixToolset.Core/CommandLine/CompileCommand.cs
index 17847b57..bbcc8270 100644
--- a/src/WixToolset.Core/CommandLine/CompileCommand.cs
+++ b/src/WixToolset.Core/CommandLine/CompileCommand.cs
@@ -6,7 +6,7 @@ namespace WixToolset.Core
     using System.Collections.Generic;
     using WixToolset.Data;
 
-    internal class CompileCommand : ICommand
+    internal class CompileCommand : ICommandLineCommand
     {
         public CompileCommand(IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables)
         {
diff --git a/src/WixToolset.Core/CommandLine/HelpCommand.cs b/src/WixToolset.Core/CommandLine/HelpCommand.cs
index 1c101781..e57ad132 100644
--- a/src/WixToolset.Core/CommandLine/HelpCommand.cs
+++ b/src/WixToolset.Core/CommandLine/HelpCommand.cs
@@ -4,7 +4,7 @@ namespace WixToolset.Core
 {
     using System;
 
-    internal class HelpCommand : ICommand
+    internal class HelpCommand : ICommandLineCommand
     {
         public HelpCommand(Commands command)
         {
diff --git a/src/WixToolset.Core/CommandLine/ICommand.cs b/src/WixToolset.Core/CommandLine/ICommand.cs
deleted file mode 100644
index 41abbbdc..00000000
--- a/src/WixToolset.Core/CommandLine/ICommand.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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
-{
-    public interface ICommand
-    {
-        int Execute();
-    }
-}
diff --git a/src/WixToolset.Core/CommandLine/ICommandLineCommand.cs b/src/WixToolset.Core/CommandLine/ICommandLineCommand.cs
new file mode 100644
index 00000000..f1471355
--- /dev/null
+++ b/src/WixToolset.Core/CommandLine/ICommandLineCommand.cs
@@ -0,0 +1,9 @@
+// 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
+{
+    public interface ICommandLineCommand
+    {
+        int Execute();
+    }
+}
diff --git a/src/WixToolset.Core/CommandLine/VersionCommand.cs b/src/WixToolset.Core/CommandLine/VersionCommand.cs
index a1980a2b..d13e07a3 100644
--- a/src/WixToolset.Core/CommandLine/VersionCommand.cs
+++ b/src/WixToolset.Core/CommandLine/VersionCommand.cs
@@ -4,7 +4,7 @@ using System;
 
 namespace WixToolset.Core
 {
-    internal class VersionCommand : ICommand
+    internal class VersionCommand : ICommandLineCommand
     {
         public int Execute()
         {
-- 
cgit v1.2.3-55-g6feb