diff options
author | Rob Mensching <rob@firegiant.com> | 2017-10-07 15:07:20 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2017-10-07 15:07:20 -0700 |
commit | fbf986eb97f68396797a89fc7d40dec07b775440 (patch) | |
tree | 0ed7743a1ce95afc96aae5710479188bb5bdf08f | |
parent | 50bd11c35ebc48137eb01d69bdeb783c66479517 (diff) | |
download | wix-fbf986eb97f68396797a89fc7d40dec07b775440.tar.gz wix-fbf986eb97f68396797a89fc7d40dec07b775440.tar.bz2 wix-fbf986eb97f68396797a89fc7d40dec07b775440.zip |
Rename ICommand to ICommandLineCommand
Removes conflicts with existing ICommand. More refactoring coming.
-rw-r--r-- | src/WixToolset.Core/CommandLine/BuildCommand.cs | 2 | ||||
-rw-r--r-- | src/WixToolset.Core/CommandLine/CommandLine.cs | 4 | ||||
-rw-r--r-- | src/WixToolset.Core/CommandLine/CompileCommand.cs | 2 | ||||
-rw-r--r-- | src/WixToolset.Core/CommandLine/HelpCommand.cs | 2 | ||||
-rw-r--r-- | src/WixToolset.Core/CommandLine/ICommandLineCommand.cs (renamed from src/WixToolset.Core/CommandLine/ICommand.cs) | 2 | ||||
-rw-r--r-- | src/WixToolset.Core/CommandLine/VersionCommand.cs | 2 |
6 files changed, 7 insertions, 7 deletions
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 | |||
9 | using WixToolset.Data; | 9 | using WixToolset.Data; |
10 | using WixToolset.Extensibility; | 10 | using WixToolset.Extensibility; |
11 | 11 | ||
12 | internal class BuildCommand : ICommand | 12 | internal class BuildCommand : ICommandLineCommand |
13 | { | 13 | { |
14 | 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) | 14 | 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) |
15 | { | 15 | { |
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 | |||
41 | 41 | ||
42 | public bool ShowHelp { get; set; } | 42 | public bool ShowHelp { get; set; } |
43 | 43 | ||
44 | public static ICommand ParseStandardCommandLine(string commandLineString) | 44 | public static ICommandLineCommand ParseStandardCommandLine(string commandLineString) |
45 | { | 45 | { |
46 | var args = CommandLine.ParseArgumentsToArray(commandLineString).ToArray(); | 46 | var args = CommandLine.ParseArgumentsToArray(commandLineString).ToArray(); |
47 | 47 | ||
48 | return ParseStandardCommandLine(args); | 48 | return ParseStandardCommandLine(args); |
49 | } | 49 | } |
50 | 50 | ||
51 | public static ICommand ParseStandardCommandLine(string[] args) | 51 | public static ICommandLineCommand ParseStandardCommandLine(string[] args) |
52 | { | 52 | { |
53 | var next = String.Empty; | 53 | var next = String.Empty; |
54 | 54 | ||
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 | |||
6 | using System.Collections.Generic; | 6 | using System.Collections.Generic; |
7 | using WixToolset.Data; | 7 | using WixToolset.Data; |
8 | 8 | ||
9 | internal class CompileCommand : ICommand | 9 | internal class CompileCommand : ICommandLineCommand |
10 | { | 10 | { |
11 | public CompileCommand(IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables) | 11 | public CompileCommand(IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables) |
12 | { | 12 | { |
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 | |||
4 | { | 4 | { |
5 | using System; | 5 | using System; |
6 | 6 | ||
7 | internal class HelpCommand : ICommand | 7 | internal class HelpCommand : ICommandLineCommand |
8 | { | 8 | { |
9 | public HelpCommand(Commands command) | 9 | public HelpCommand(Commands command) |
10 | { | 10 | { |
diff --git a/src/WixToolset.Core/CommandLine/ICommand.cs b/src/WixToolset.Core/CommandLine/ICommandLineCommand.cs index 41abbbdc..f1471355 100644 --- a/src/WixToolset.Core/CommandLine/ICommand.cs +++ b/src/WixToolset.Core/CommandLine/ICommandLineCommand.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | namespace WixToolset.Core | 3 | namespace WixToolset.Core |
4 | { | 4 | { |
5 | public interface ICommand | 5 | public interface ICommandLineCommand |
6 | { | 6 | { |
7 | int Execute(); | 7 | int Execute(); |
8 | } | 8 | } |
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; | |||
4 | 4 | ||
5 | namespace WixToolset.Core | 5 | namespace WixToolset.Core |
6 | { | 6 | { |
7 | internal class VersionCommand : ICommand | 7 | internal class VersionCommand : ICommandLineCommand |
8 | { | 8 | { |
9 | public int Execute() | 9 | public int Execute() |
10 | { | 10 | { |