From 3ec572f824d0bfcb99cc1d94b05ac9990d418edc Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Thu, 29 Jun 2017 18:34:56 -0700
Subject: [PATCH] Fixing help text for version, info and diagnostics and also
 removing runtime options that are only available for dotnet exec.

---
 src/dotnet/commands/dotnet-help/HelpUsageText.cs     | 12 ++++++------
 .../GivenThatIWantToShowHelpForDotnetCommand.cs      | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/dotnet/commands/dotnet-help/HelpUsageText.cs b/src/dotnet/commands/dotnet-help/HelpUsageText.cs
index 55ceac9c1..68c637f06 100644
--- a/src/dotnet/commands/dotnet-help/HelpUsageText.cs
+++ b/src/dotnet/commands/dotnet-help/HelpUsageText.cs
@@ -5,7 +5,7 @@ internal static class HelpUsageText
 {
     public static readonly string UsageText =
 $@"{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:
   {LocalizableStrings.PathToApplicationDefinition}
@@ -27,9 +27,6 @@ path-to-application:
   nuget            {LocalizableStrings.NugetDefinition}
   msbuild          {LocalizableStrings.MsBuildDefinition}
   vstest           {LocalizableStrings.VsTestDefinition}
-  -v|--version     {LocalizableStrings.SDKVersionCommandDefinition}
-  -i|--info        {LocalizableStrings.SDKInfoCommandDefinition}
-  -d|--diagnostics {LocalizableStrings.SDKDiagnosticsCommandDefinition}
 
 {LocalizableStrings.CommonOptions}:
   -v|--verbosity        {CommonLocalizableStrings.VerbosityOptionDescription}
@@ -37,10 +34,13 @@ path-to-application:
 
 {LocalizableStrings.RunDotnetCommandHelpForMore}
 
+sdk-options:
+  --version        {LocalizableStrings.SDKVersionCommandDefinition}
+  --info           {LocalizableStrings.SDKInfoCommandDefinition}
+  -d|--diagnostics {LocalizableStrings.SDKDiagnosticsCommandDefinition}
+
 runtime-options:
   --additionalprobingpath <path>    {LocalizableStrings.AdditionalprobingpathDefinition}
-  --depsfile <path>                 {LocalizableStrings.DepsfilDefinition}
-  --runtimeconfig <path>            {LocalizableStrings.RuntimeconfigDefinition}
   --fx-version <version>            {LocalizableStrings.FxVersionDefinition}
   --roll-forward-on-no-candidate-fx {LocalizableStrings.RollForwardOnNoCandidateFxDefinition}
   --additional-deps <path>          {LocalizableStrings.AdditionalDeps}
diff --git a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs
index 700367832..29c00b2fb 100644
--- a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs
+++ b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs
@@ -16,7 +16,7 @@ namespace Microsoft.DotNet.Help.Tests
     {
         private const string HelpText =
 @"Usage: dotnet [runtime-options] [path-to-application]
-Usage: dotnet [command] [arguments] [command-options]
+Usage: dotnet [sdk-options] [command] [arguments] [command-options]
 
 path-to-application:
   The path to an application .dll file to execute.
@@ -38,9 +38,6 @@ SDK commands:
   nuget            Provides additional NuGet commands.
   msbuild          Runs Microsoft Build Engine (MSBuild).
   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:
   -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.
 
+sdk-options:
+  --version        Display .NET Core SDK version.
+  --info           Display .NET Core information.
+  -d|--diagnostics Enable diagnostic output.
+
 runtime-options:
   --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.
   --roll-forward-on-no-candidate-fx Roll forward on no candidate shared framework is enabled.
   --additional-deps <path>          Path to additonal deps.json file.";