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

Merge pull request #7048 from livarcocc/fix_help_message

Browse source 
Fixing help text for version, info and diagnostics and also removing …
This commit is contained in:
Livar 2017-06-30 15:54:40 -07:00 • committed by GitHub
commit 20023717b5
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/dotnet/commands/dotnet-help/HelpUsageText.cs
View file

@ -5,7 +5,7 @@ internal static class HelpUsageText
{ {
public static readonly string UsageText = public static readonly string UsageText =
$@"{LocalizableStrings.Usage}: dotnet [runtime-options] [path-to-application] $@"{LocalizableStrings.Usage}: dotnet [runtime-options] [path-to-application]
{LocalizableStrings.Usage}: dotnet [command] [arguments] [command-options] {LocalizableStrings.Usage}: dotnet [sdk-options] [command] [arguments] [command-options]
path-to-application: path-to-application:
{LocalizableStrings.PathToApplicationDefinition} {LocalizableStrings.PathToApplicationDefinition}
@ -27,9 +27,6 @@ path-to-application:
nuget {LocalizableStrings.NugetDefinition} nuget {LocalizableStrings.NugetDefinition}
msbuild {LocalizableStrings.MsBuildDefinition} msbuild {LocalizableStrings.MsBuildDefinition}
vstest {LocalizableStrings.VsTestDefinition} vstest {LocalizableStrings.VsTestDefinition}
-v|--version {LocalizableStrings.SDKVersionCommandDefinition}
-i|--info {LocalizableStrings.SDKInfoCommandDefinition}
-d|--diagnostics {LocalizableStrings.SDKDiagnosticsCommandDefinition}
{LocalizableStrings.CommonOptions}: {LocalizableStrings.CommonOptions}:
-v|--verbosity {CommonLocalizableStrings.VerbosityOptionDescription} -v|--verbosity {CommonLocalizableStrings.VerbosityOptionDescription}
@ -37,10 +34,13 @@ path-to-application:
{LocalizableStrings.RunDotnetCommandHelpForMore} {LocalizableStrings.RunDotnetCommandHelpForMore}
sdk-options:
--version {LocalizableStrings.SDKVersionCommandDefinition}
--info {LocalizableStrings.SDKInfoCommandDefinition}
-d|--diagnostics {LocalizableStrings.SDKDiagnosticsCommandDefinition}
runtime-options: runtime-options:
--additionalprobingpath <path> {LocalizableStrings.AdditionalprobingpathDefinition} --additionalprobingpath <path> {LocalizableStrings.AdditionalprobingpathDefinition}
--depsfile <path> {LocalizableStrings.DepsfilDefinition}
--runtimeconfig <path> {LocalizableStrings.RuntimeconfigDefinition}
--fx-version <version> {LocalizableStrings.FxVersionDefinition} --fx-version <version> {LocalizableStrings.FxVersionDefinition}
--roll-forward-on-no-candidate-fx {LocalizableStrings.RollForwardOnNoCandidateFxDefinition} --roll-forward-on-no-candidate-fx {LocalizableStrings.RollForwardOnNoCandidateFxDefinition}
--additional-deps <path> {LocalizableStrings.AdditionalDeps} --additional-deps <path> {LocalizableStrings.AdditionalDeps}

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

@ -16,7 +16,7 @@ namespace Microsoft.DotNet.Help.Tests
{ {
private const string HelpText = private const string HelpText =
@"Usage: dotnet [runtime-options] [path-to-application] @"Usage: dotnet [runtime-options] [path-to-application]
Usage: dotnet [command] [arguments] [command-options] Usage: dotnet [sdk-options] [command] [arguments] [command-options]
path-to-application: path-to-application:
The path to an application .dll file to execute. The path to an application .dll file to execute.
@ -38,9 +38,6 @@ SDK commands:
nuget Provides additional NuGet commands. nuget Provides additional NuGet commands.
msbuild Runs Microsoft Build Engine (MSBuild). msbuild Runs Microsoft Build Engine (MSBuild).
vstest Runs Microsoft Test Execution Command Line Tool. vstest Runs Microsoft Test Execution Command Line Tool.
-v|--version Display .NET Core SDK version.
-i|--info Display .NET Core information.
-d|--diagnostics Enable diagnostic output.
Common options: Common options:
-v|--verbosity Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]. -v|--verbosity Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic].
@ -48,10 +45,13 @@ Common options:
Run 'dotnet COMMAND --help' for more information on a command. Run 'dotnet COMMAND --help' for more information on a command.
sdk-options:
--version Display .NET Core SDK version.
--info Display .NET Core information.
-d|--diagnostics Enable diagnostic output.
runtime-options: runtime-options:
--additionalprobingpath <path> Path containing probing policy and assemblies to probe for. --additionalprobingpath <path> Path containing probing policy and assemblies to probe for.
--depsfile <path> Path to <application>.deps.json file.
--runtimeconfig <path> Path to <application>.runtimeconfig.json file.
--fx-version <version> Version of the installed Shared Framework to use to run the application. --fx-version <version> Version of the installed Shared Framework to use to run the application.
--roll-forward-on-no-candidate-fx Roll forward on no candidate shared framework is enabled. --roll-forward-on-no-candidate-fx Roll forward on no candidate shared framework is enabled.
--additional-deps <path> Path to additonal deps.json file."; --additional-deps <path> Path to additonal deps.json file.";