mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'rel/1.0.0' into slntest

Browse source
This commit is contained in:
Piotr Puszkiewicz 2017-01-13 11:19:47 -08:00 committed by GitHub
commit 968ee5c3f6
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/dotnet/CommandLine/CommandLineApplication.cs
View file

@ -148,7 +148,12 @@ namespace Microsoft.DotNet.Cli.CommandLine
var arg = args[index];
bool isLongOption = arg.StartsWith("--");
if (isLongOption || arg.StartsWith("-"))
if (arg == "-?" || arg == "/?")
{
command.ShowHelp();
return 0;
}
else if (isLongOption || arg.StartsWith("-"))
{
CommandOption option;
var result = ParseOption(isLongOption, command, args, ref index, out option);

4
src/dotnet/Program.cs
View file

@ -118,7 +118,9 @@ namespace Microsoft.DotNet.Cli
PrintInfo();
return 0;
}
else if (IsArg(args[lastArg], "h", "help"))
else if (IsArg(args[lastArg], "h", "help") ||
args[lastArg] == "-?" ||
args[lastArg] == "/?")
{
HelpCommand.PrintHelp();
return 0;

2
test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs
View file

@ -56,6 +56,8 @@ Advanced Commands:
[Theory]
[InlineData("--help")]
[InlineData("-h")]
[InlineData("-?")]
[InlineData("/?")]
public void WhenHelpOptionIsPassedToDotnetItPrintsUsage(string helpArg)
{
var cmd = new DotnetCommand()

2
test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs
View file

@ -182,6 +182,8 @@ EndGlobal
[Theory]
[InlineData("--help")]
[InlineData("-h")]
[InlineData("-?")]
[InlineData("/?")]
public void WhenHelpOptionIsPassedItPrintsUsage(string helpArg)
{
var cmd = new DotnetCommand()