aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2018-10-24 21:07:56 -0700
committerRob Mensching <rob@robmensching.com>2018-10-24 21:25:56 -0700
commit85fc7be678248a0a5873c08d48941021eb0959e6 (patch)
tree3dc8f14458fb2e5f2578ba95ca69189f801a99cf /src
parentb66ea2e10a1b4be642e58319de85d2ca54991b47 (diff)
downloadwix-85fc7be678248a0a5873c08d48941021eb0959e6.tar.gz
wix-85fc7be678248a0a5873c08d48941021eb0959e6.tar.bz2
wix-85fc7be678248a0a5873c08d48941021eb0959e6.zip
Update to changes to reorganize command-line processing
Diffstat (limited to 'src')
-rw-r--r--src/WixToolset.BuildTasks/DoIt.cs2
-rw-r--r--src/wix/Program.cs5
-rw-r--r--src/wixcop/CommandLine/ConvertCommand.cs9
-rw-r--r--src/wixcop/CommandLine/HelpCommand.cs10
-rw-r--r--src/wixcop/CommandLine/WixCopCommandLineParser.cs2
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
172 var arguments = serviceProvider.GetService<ICommandLineArguments>(); 172 var arguments = serviceProvider.GetService<ICommandLineArguments>();
173 arguments.Populate(commandLineString); 173 arguments.Populate(commandLineString);
174 174
175 var commandLine = serviceProvider.GetService<ICommandLineParser>(); 175 var commandLine = serviceProvider.GetService<ICommandLine>();
176 commandLine.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider, messaging, arguments.Extensions); 176 commandLine.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider, messaging, arguments.Extensions);
177 commandLine.Arguments = arguments; 177 commandLine.Arguments = arguments;
178 var command = commandLine.ParseStandardCommandLine(); 178 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 @@
3namespace WixToolset.Tools 3namespace WixToolset.Tools
4{ 4{
5 using System; 5 using System;
6 using System.Globalization;
7 using System.Linq; 6 using System.Linq;
8 using System.Reflection; 7 using System.Reflection;
9 using System.Text;
10 using System.Threading;
11 using WixToolset.Core; 8 using WixToolset.Core;
12 using WixToolset.Data; 9 using WixToolset.Data;
13 using WixToolset.Extensibility; 10 using WixToolset.Extensibility;
@@ -50,7 +47,7 @@ namespace WixToolset.Tools
50 var arguments = serviceProvider.GetService<ICommandLineArguments>(); 47 var arguments = serviceProvider.GetService<ICommandLineArguments>();
51 arguments.Populate(args); 48 arguments.Populate(args);
52 49
53 var commandLine = serviceProvider.GetService<ICommandLineParser>(); 50 var commandLine = serviceProvider.GetService<ICommandLine>();
54 commandLine.ExtensionManager = CreateExtensionManagerWithStandardBackends(serviceProvider, messaging, arguments.Extensions); 51 commandLine.ExtensionManager = CreateExtensionManagerWithStandardBackends(serviceProvider, messaging, arguments.Extensions);
55 commandLine.Arguments = arguments; 52 commandLine.Arguments = arguments;
56 var command = commandLine.ParseStandardCommandLine(); 53 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
50 50
51 private bool SubDirectories { get; } 51 private bool SubDirectories { get; }
52 52
53 public bool ShowLogo => throw new NotImplementedException();
54
55 public bool StopParsing => throw new NotImplementedException();
56
57 public bool TryParseArgument(ICommandLineParser parser, string argument)
58 {
59 throw new NotImplementedException();
60 }
61
53 public int Execute() 62 public int Execute()
54 { 63 {
55 // parse the settings if any were specified 64 // 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
4{ 4{
5 using System; 5 using System;
6 using WixToolset.Extensibility.Data; 6 using WixToolset.Extensibility.Data;
7 using WixToolset.Extensibility.Services;
7 8
8 internal class HelpCommand : ICommandLineCommand 9 internal class HelpCommand : ICommandLineCommand
9 { 10 {
11 public bool ShowLogo => false;
12
13 public bool StopParsing => true;
14
10 public int Execute() 15 public int Execute()
11 { 16 {
12 Console.WriteLine(" usage: wixcop.exe sourceFile [sourceFile ...]"); 17 Console.WriteLine(" usage: wixcop.exe sourceFile [sourceFile ...]");
@@ -23,5 +28,10 @@ namespace WixToolset.Tools.WixCop.CommandLine
23 28
24 return 0; 29 return 0;
25 } 30 }
31
32 public bool TryParseArgument(ICommandLineParser parser, string argument)
33 {
34 return true;
35 }
26 } 36 }
27} 37}
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
85 } 85 }
86 } 86 }
87 87
88 private bool ParseArgument(IParseCommandLine parser, string arg) 88 private bool ParseArgument(ICommandLineParser parser, string arg)
89 { 89 {
90 var parameter = arg.Substring(1); 90 var parameter = arg.Substring(1);
91 91
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-04 20:39:04 +0000