From b7f3e39413f404614086b8bd03c47a70d745b81d Mon Sep 17 00:00:00 2001 From: Zlatko Knezevic Date: Thu, 15 Dec 2016 23:11:18 -0800 Subject: [PATCH 1/7] Finishing touches on help messages Making finishing touches on all the CLI commands' help messages. Also adding dotnet clean to the help output list. Fixes #5048,#5017 --- .../commands/dotnet-build/LocalizableStrings.cs | 8 ++++---- .../commands/dotnet-clean/LocalizableStrings.cs | 6 +++--- src/dotnet/commands/dotnet-help/HelpCommand.cs | 1 + .../commands/dotnet-help/LocalizableStrings.cs | 2 ++ .../commands/dotnet-migrate/LocalizableStrings.cs | 5 +---- .../commands/dotnet-pack/LocalizableStrings.cs | 14 +++++++------- .../commands/dotnet-publish/LocalizableStrings.cs | 10 +++++----- .../commands/dotnet-restore/LocalizableStrings.cs | 4 ++-- .../commands/dotnet-run/LocalizableStrings.cs | 6 ++++-- src/dotnet/commands/dotnet-run/Program.cs | 2 +- 10 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/dotnet/commands/dotnet-build/LocalizableStrings.cs b/src/dotnet/commands/dotnet-build/LocalizableStrings.cs index 74f0d83df..7c5f85371 100644 --- a/src/dotnet/commands/dotnet-build/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-build/LocalizableStrings.cs @@ -6,19 +6,19 @@ public const string AppFullName = ".NET Builder"; - public const string ConfigurationOptionDescription = "Configuration under which to build"; + public const string ConfigurationOptionDescription = "Configuration to use for buulding the project. Default is \"Debug\"."; public const string ConfigurationOptionName = "CONFIGURATION"; - public const string FrameworkOptionDescription = "Compile a specific framework"; + public const string FrameworkOptionDescription = "Target framework to build for. The target framework has to be specified in the project file."; public const string FrameworkOptionName = "FRAMEWORK"; public const string NoDependenciesOptionDescription = "Set this flag to ignore project to project references and only build the root project"; - public const string NoIncrementialOptionDescription = "Set this flag to turn off incremental build"; + public const string NoIncrementialOptionDescription = "Disables incremental build."; - public const string OutputOptionDescription = "Directory in which to place outputs"; + public const string OutputOptionDescription = "Output directory in which to place built artifacts."; public const string OutputOptionName = "OUTPUT_DIR"; diff --git a/src/dotnet/commands/dotnet-clean/LocalizableStrings.cs b/src/dotnet/commands/dotnet-clean/LocalizableStrings.cs index e1ea99763..9ca0883ff 100644 --- a/src/dotnet/commands/dotnet-clean/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-clean/LocalizableStrings.cs @@ -12,14 +12,14 @@ public const string CmdOutputDir = "OUTPUT_DIR"; - public const string CmdOutputDirDescription = "Directory in which the build outputs have been placed"; + public const string CmdOutputDirDescription = "Directory in which the build outputs have been placed."; public const string CmdFramework = "FRAMEWORK"; - public const string CmdFrameworkDescription = "Clean a specific framework"; + public const string CmdFrameworkDescription = "Clean a specific framework."; public const string CmdConfiguration = "CONFIGURATION"; - public const string CmdConfigurationDescription = "Clean a specific configuration"; + public const string CmdConfigurationDescription = "Clean a specific configuration."; } } diff --git a/src/dotnet/commands/dotnet-help/HelpCommand.cs b/src/dotnet/commands/dotnet-help/HelpCommand.cs index 1b442211c..a6e521555 100644 --- a/src/dotnet/commands/dotnet-help/HelpCommand.cs +++ b/src/dotnet/commands/dotnet-help/HelpCommand.cs @@ -34,6 +34,7 @@ namespace Microsoft.DotNet.Tools.Help test {LocalizableStrings.TestDefinition} pack {LocalizableStrings.PackDefinition} migrate {LocalizableStrings.MigrateDefinition} + clean {LocalizableStrings.CleanDefinition} Project modification commands: add Add items to the project diff --git a/src/dotnet/commands/dotnet-help/LocalizableStrings.cs b/src/dotnet/commands/dotnet-help/LocalizableStrings.cs index 4cd4d3022..e0bcb37c0 100644 --- a/src/dotnet/commands/dotnet-help/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-help/LocalizableStrings.cs @@ -59,5 +59,7 @@ public const string MsBuildDefinition = "msbuilds a project and all of its dependencies"; public const string VsTestDefinition = "Runs tests from the specified files"; + + public const string CleanDefinition = "Clean build output(s)"; } } diff --git a/src/dotnet/commands/dotnet-migrate/LocalizableStrings.cs b/src/dotnet/commands/dotnet-migrate/LocalizableStrings.cs index d614e4fbe..137080ec0 100644 --- a/src/dotnet/commands/dotnet-migrate/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-migrate/LocalizableStrings.cs @@ -8,13 +8,10 @@ namespace Microsoft.DotNet.Tools.Migrate public const string CmdProjectArgument = "PROJECT_JSON/GLOBAL_JSON/SOLUTION_FILE/PROJECT_DIR"; public const string CmdProjectArgumentDescription = -@"The path to +@"The path to one of the following: - a project.json file to migrate. -or - a global.json file, it will migrate the folders specified in global.json. -or - a solution.sln file, it will migrate the projects referenced in the solution. -or - a directory to migrate, it will recursively search for project.json files to migrate. Defaults to current directory if nothing is specified."; diff --git a/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs b/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs index 2e4f12153..d1317b85f 100644 --- a/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs @@ -2,29 +2,29 @@ { internal class LocalizableStrings { - public const string AppFullName = "pack"; + public const string AppFullName = ".NET Core NuGet Package Packer"; public const string AppDescription = "pack for msbuild"; public const string CmdOutputDir = "OUTPUT_DIR"; - public const string CmdOutputDirDescription = "Directory in which to place outputs"; + public const string CmdOutputDirDescription = "Directory in which to place built packages."; - public const string CmdNoBuildOptionDescription = "Do not build project before packing"; + public const string CmdNoBuildOptionDescription = "Skip building the project prior to packing. By default, the project will be built."; - public const string CmdIncludeSymbolsDescription = "Include PDBs along with the DLLs in the output folder"; + public const string CmdIncludeSymbolsDescription = "Include packages with symbols in addition to assembly (DLL) packages in output directory."; public const string CmdIncludeSourceDescription = "Include PDBs and source files. Source files go into the src folder in the resulting nuget package"; public const string CmdConfig = "CONFIGURATION"; - public const string CmdConfigDescription = "Configuration under which to build"; + public const string CmdConfigDescription = "Configuration to use for building the project. Default is \"Debug\"."; public const string CmdVersionSuffix = "VERSION_SUFFIX"; - public const string CmdVersionSuffixDescription = "Defines what `*` should be replaced with in version field in project.json"; + public const string CmdVersionSuffixDescription = "Defines the value for the $(VersionSuffix) property in the project."; - public const string CmdServiceableDescription = "Set the serviceable flag in the package"; + public const string CmdServiceableDescription = "Set the serviceable flag in the package. For more information, please see https://aka.ms/nupkgservicing."; public const string CmdArgumentProject = "PROJECT"; diff --git a/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs b/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs index d9e466dd9..620a7c950 100644 --- a/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs @@ -12,22 +12,22 @@ public const string FrameworkOption = "FRAMEWORK"; - public const string FrameworkOptionDescription = "Target framework to publish for"; + public const string FrameworkOptionDescription = " Target framework to publish for. The target framework has to be specified in the project file."; public const string RuntimeOption = "RUNTIME_IDENTIFIER"; - public const string RuntimeOptionDescription = "Target runtime to publish for. The default is to publish a portable application."; + public const string RuntimeOptionDescription = "Publish the project for a given runtime. This is used when creating self-contained deployment. Default is to publish a framework-dependented app."; public const string OutputOption = "OUTPUT_DIR"; - public const string OutputOptionDescription = "Path in which to publish the app"; + public const string OutputOptionDescription = "Output directory in which to place the published artifacts."; public const string ConfigurationOption = "CONFIGURATION"; - public const string ConfigurationOptionDescription = "Configuration under which to build"; + public const string ConfigurationOptionDescription = "Configuration to use for building the project. Default is \"Debug\"."; public const string VersionSuffixOption = "VERSION_SUFFIX"; - public const string VersionSuffixOptionDescription = "Defines the value for the $(VersionSuffix) property in the project"; + public const string VersionSuffixOptionDescription = "Defines the value for the $(VersionSuffix) property in the project."; } } diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs b/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs index dc9cf6d96..e3a6f860d 100644 --- a/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs @@ -2,11 +2,11 @@ { internal class LocalizableStrings { - public const string AppFullName = "restore"; + public const string AppFullName = ".NET dependency restorer"; public const string AppDescription = "restore for msbuild"; - public const string CmdArgument = "root"; + public const string CmdArgument = "project"; public const string CmdArgumentDescription = "Optional path to a project file or MSBuild arguments."; diff --git a/src/dotnet/commands/dotnet-run/LocalizableStrings.cs b/src/dotnet/commands/dotnet-run/LocalizableStrings.cs index a2c08f750..0a1501fa6 100644 --- a/src/dotnet/commands/dotnet-run/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-run/LocalizableStrings.cs @@ -6,11 +6,11 @@ public const string AppDescription = "Command used to run .NET apps"; - public const string CommandOptionConfigurationDescription = "Configuration under which to build"; + public const string CommandOptionConfigurationDescription = "Configuration to use for building the project. Default is \"Debug\"."; public const string CommandOptionFramework = "FRAMEWORK"; - public const string CommandOptionFrameworkDescription = "Compile a specific framework"; + public const string CommandOptionFrameworkDescription = "Build and run the specified framework. The framework has to be specified in the project file. "; public const string CommandOptionProjectDescription = "The path to the project file to run (defaults to the current directory if there is only one project)."; @@ -43,5 +43,7 @@ public const string RunCommandInvalidOperationException3 = "Specify which project file to use because this "; public const string RunCommandInvalidOperationException4 = "contains more than one project file."; + + public const string RunCommandAdditionalArgsHelpText = "Arguments passed to the application that is being run."; } } \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-run/Program.cs b/src/dotnet/commands/dotnet-run/Program.cs index 57bf074cb..b1bb77560 100644 --- a/src/dotnet/commands/dotnet-run/Program.cs +++ b/src/dotnet/commands/dotnet-run/Program.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tools.Run app.Description = LocalizableStrings.AppDescription; app.HandleResponseFiles = true; app.AllowArgumentSeparator = true; - app.ArgumentSeparatorHelpText = HelpMessageStrings.MSBuildAdditionalArgsHelpText; + app.ArgumentSeparatorHelpText = $"{HelpMessageStrings.MSBuildAdditionalArgsHelpText}\n{LocalizableStrings.RunCommandAdditionalArgsHelpText}"; app.HelpOption("-h|--help"); CommandOption configuration = app.Option( From 4e554f97410b0cc7b26da9d1e04ba1fde2567d99 Mon Sep 17 00:00:00 2001 From: Zlatko Knezevic Date: Fri, 16 Dec 2016 14:24:26 -0800 Subject: [PATCH 2/7] Resetting dotnet run to original state --- src/dotnet/commands/dotnet-run/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-run/Program.cs b/src/dotnet/commands/dotnet-run/Program.cs index b1bb77560..57bf074cb 100644 --- a/src/dotnet/commands/dotnet-run/Program.cs +++ b/src/dotnet/commands/dotnet-run/Program.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tools.Run app.Description = LocalizableStrings.AppDescription; app.HandleResponseFiles = true; app.AllowArgumentSeparator = true; - app.ArgumentSeparatorHelpText = $"{HelpMessageStrings.MSBuildAdditionalArgsHelpText}\n{LocalizableStrings.RunCommandAdditionalArgsHelpText}"; + app.ArgumentSeparatorHelpText = HelpMessageStrings.MSBuildAdditionalArgsHelpText; app.HelpOption("-h|--help"); CommandOption configuration = app.Option( From 7294260e094e65aef8202450e55116a7798882ef Mon Sep 17 00:00:00 2001 From: Zlatko Knezevic Date: Fri, 16 Dec 2016 14:47:27 -0800 Subject: [PATCH 3/7] More text cleanup --- .../commands/dotnet-build/LocalizableStrings.cs | 2 +- .../dotnet-restore/LocalizableStrings.cs | 8 ++++---- .../commands/dotnet-test/LocalizableStrings.cs | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/dotnet/commands/dotnet-build/LocalizableStrings.cs b/src/dotnet/commands/dotnet-build/LocalizableStrings.cs index 7c5f85371..f8c16a793 100644 --- a/src/dotnet/commands/dotnet-build/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-build/LocalizableStrings.cs @@ -6,7 +6,7 @@ public const string AppFullName = ".NET Builder"; - public const string ConfigurationOptionDescription = "Configuration to use for buulding the project. Default is \"Debug\"."; + public const string ConfigurationOptionDescription = "Configuration to use for building the project. Default is \"Debug\"."; public const string ConfigurationOptionName = "CONFIGURATION"; diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs b/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs index e3a6f860d..7b63ee1b7 100644 --- a/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs @@ -6,21 +6,21 @@ public const string AppDescription = "restore for msbuild"; - public const string CmdArgument = "project"; + public const string CmdArgument = "PROJECT"; public const string CmdArgumentDescription = "Optional path to a project file or MSBuild arguments."; - public const string CmdSourceOption = "source"; + public const string CmdSourceOption = "SOURCE"; public const string CmdSourceOptionDescription = "Specifies a NuGet package source to use during the restore."; - public const string CmdPackagesOption = "packagesDirectory"; + public const string CmdPackagesOption = "PACKAGES_DIRECTORY"; public const string CmdPackagesOptionDescription = "Directory to install packages in."; public const string CmdDisableParallelOptionDescription = "Disables restoring multiple projects in parallel."; - public const string CmdConfigFileOption = "file"; + public const string CmdConfigFileOption = "FILE"; public const string CmdConfigFileOptionDescription = "The NuGet configuration file to use."; diff --git a/src/dotnet/commands/dotnet-test/LocalizableStrings.cs b/src/dotnet/commands/dotnet-test/LocalizableStrings.cs index 542b67c14..3252a6717 100644 --- a/src/dotnet/commands/dotnet-test/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-test/LocalizableStrings.cs @@ -10,13 +10,13 @@ public const string CmdArgDescription = "The project to test, defaults to the current directory."; - public const string CmdSettingsFile = "SettingsFile"; + public const string CmdSettingsFile = "SETTINGS_FILE"; public const string CmdSettingsDescription = "Settings to use when running tests."; public const string CmdListTestsDescription = @"Lists discovered tests"; - public const string CmdTestCaseFilterExpression = "Expression"; + public const string CmdTestCaseFilterExpression = "EXPRESSION"; public const string CmdTestCaseFilterDescription = @"Run tests that match the given expression. Examples: @@ -27,26 +27,26 @@ "; public const string CmdTestAdapterPathDescription = @"Use custom adapters from the given path in the test run. - Example: --test-adapter-path:"; + Example: --test-adapter-path "; public const string CmdLoggerOption = "LoggerUri/FriendlyName"; public const string CmdLoggerDescription = @"Specify a logger for test results. Example: --logger:trx"; - public const string CmdConfiguration = "configuration"; + public const string CmdConfiguration = "CONFIGURATION"; - public const string CmdConfigDescription = @"Configuration under which to build, i.e. Debug/Release"; + public const string CmdConfigDescription = "Configuration to use for building the project. Default is \"Debug\"."; - public const string CmdFramework = "FrameworkVersion"; + public const string CmdFramework = "FRAMEWORK"; public const string CmdFrameworkDescription = @"Looks for test binaries for a specific framework"; - public const string CmdOutputDir = "OutputDir"; + public const string CmdOutputDir = "OUTPUT_DIR"; public const string CmdOutputDescription = @"Directory in which to find the binaries to be run"; - public const string CmdPathToLogFile = "PathToLogFile"; + public const string CmdPathToLogFile = "PATH_TO_FILE"; public const string CmdPathTologFileDescription = @"Enable verbose logs for test platform. Logs are written to the provided file."; From 0da755f4051fc717f6d210e6d892734e26de8489 Mon Sep 17 00:00:00 2001 From: Zlatko Knezevic Date: Fri, 16 Dec 2016 15:50:18 -0800 Subject: [PATCH 4/7] Responding to PR feedback --- .../dotnet-build/LocalizableStrings.cs | 2 +- .../dotnet-help/LocalizableStrings.cs | 30 +++++++++---------- .../dotnet-publish/LocalizableStrings.cs | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/dotnet/commands/dotnet-build/LocalizableStrings.cs b/src/dotnet/commands/dotnet-build/LocalizableStrings.cs index f8c16a793..7d2e44440 100644 --- a/src/dotnet/commands/dotnet-build/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-build/LocalizableStrings.cs @@ -14,7 +14,7 @@ public const string FrameworkOptionName = "FRAMEWORK"; - public const string NoDependenciesOptionDescription = "Set this flag to ignore project to project references and only build the root project"; + public const string NoDependenciesOptionDescription = "Set this flag to ignore project-to-project references and only build the root project"; public const string NoIncrementialOptionDescription = "Disables incremental build."; diff --git a/src/dotnet/commands/dotnet-help/LocalizableStrings.cs b/src/dotnet/commands/dotnet-help/LocalizableStrings.cs index e0bcb37c0..5cf5864ba 100644 --- a/src/dotnet/commands/dotnet-help/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-help/LocalizableStrings.cs @@ -30,36 +30,36 @@ public const string Commands = "Commands"; - public const string NewDefinition = "Initialize a basic .NET project"; + public const string NewDefinition = "Initialize .NET projects."; - public const string RestoreDefinition = "Restore dependencies specified in the .NET project"; + public const string RestoreDefinition = "Restore dependencies specified in the .NET project."; - public const string BuildDefinition = "Builds a .NET project"; + public const string BuildDefinition = "Builds a .NET project."; - public const string PublishDefinition = "Publishes a .NET project for deployment (including the runtime)"; + public const string PublishDefinition = "Publishes a .NET project for deployment (including the runtime)."; - public const string RunDefinition = "Compiles and immediately executes a .NET project"; + public const string RunDefinition = "Compiles and immediately executes a .NET project."; - public const string TestDefinition = "Runs unit tests using the test runner specified in the project"; + public const string TestDefinition = "Runs unit tests using the test runner specified in the project."; - public const string PackDefinition = "Creates a NuGet package"; + public const string PackDefinition = "Creates a NuGet package."; - public const string MigrateDefinition = "Migrates a project.json based project to a msbuild based project"; + public const string MigrateDefinition = "Migrates a project.json based project to a msbuild based project."; public const string ProjectModificationCommands = "Project modification commands"; - public const string AddDefinition = "Add items to the project"; - - public const string RemoveDefinition = "Remove items from the project"; + public const string AddDefinition = "Add items to the project."; + + public const string RemoveDefinition = "Remove items from the project."; public const string AdvancedCommands = "Advanced Commands"; - public const string NugetDefinition = "Provides additional NuGet commands"; + public const string NugetDefinition = "Provides additional NuGet commands."; - public const string MsBuildDefinition = "msbuilds a project and all of its dependencies"; + public const string MsBuildDefinition = "Builds a project using MSBuild and all of its dependencies."; - public const string VsTestDefinition = "Runs tests from the specified files"; + public const string VsTestDefinition = "Runs tests from the specified files."; - public const string CleanDefinition = "Clean build output(s)"; + public const string CleanDefinition = "Clean build output(s)."; } } diff --git a/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs b/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs index 620a7c950..e7c293b25 100644 --- a/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs @@ -12,7 +12,7 @@ public const string FrameworkOption = "FRAMEWORK"; - public const string FrameworkOptionDescription = " Target framework to publish for. The target framework has to be specified in the project file."; + public const string FrameworkOptionDescription = "Target framework to publish for. The target framework has to be specified in the project file."; public const string RuntimeOption = "RUNTIME_IDENTIFIER"; From 3073e9bd2c9e72d170bc07ad2a33028950e80a29 Mon Sep 17 00:00:00 2001 From: Zlatko Knezevic Date: Fri, 16 Dec 2016 17:53:11 -0800 Subject: [PATCH 5/7] Responding to PR feedback --- src/dotnet/commands/dotnet-build/LocalizableStrings.cs | 2 +- src/dotnet/commands/dotnet-help/LocalizableStrings.cs | 4 ++-- src/dotnet/commands/dotnet-pack/LocalizableStrings.cs | 4 ++-- src/dotnet/commands/dotnet-publish/LocalizableStrings.cs | 2 +- src/dotnet/commands/dotnet-run/LocalizableStrings.cs | 4 ++-- src/dotnet/commands/dotnet-test/LocalizableStrings.cs | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/dotnet/commands/dotnet-build/LocalizableStrings.cs b/src/dotnet/commands/dotnet-build/LocalizableStrings.cs index 7d2e44440..d35d5f75e 100644 --- a/src/dotnet/commands/dotnet-build/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-build/LocalizableStrings.cs @@ -6,7 +6,7 @@ public const string AppFullName = ".NET Builder"; - public const string ConfigurationOptionDescription = "Configuration to use for building the project. Default is \"Debug\"."; + public const string ConfigurationOptionDescription = "Configuration to use for building the project. Default for most projects is \"Debug\"."; public const string ConfigurationOptionName = "CONFIGURATION"; diff --git a/src/dotnet/commands/dotnet-help/LocalizableStrings.cs b/src/dotnet/commands/dotnet-help/LocalizableStrings.cs index 5cf5864ba..2740d3cf0 100644 --- a/src/dotnet/commands/dotnet-help/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-help/LocalizableStrings.cs @@ -56,9 +56,9 @@ public const string NugetDefinition = "Provides additional NuGet commands."; - public const string MsBuildDefinition = "Builds a project using MSBuild and all of its dependencies."; + public const string MsBuildDefinition = "Runs Microsoft Build Engine (MSBuild)."; - public const string VsTestDefinition = "Runs tests from the specified files."; + public const string VsTestDefinition = "Runs Microsoft Test Execution Command Line Tool."; public const string CleanDefinition = "Clean build output(s)."; } diff --git a/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs b/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs index d1317b85f..b315e70c4 100644 --- a/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs @@ -12,13 +12,13 @@ public const string CmdNoBuildOptionDescription = "Skip building the project prior to packing. By default, the project will be built."; - public const string CmdIncludeSymbolsDescription = "Include packages with symbols in addition to assembly (DLL) packages in output directory."; + public const string CmdIncludeSymbolsDescription = "Include packages with symbols in addition to regular packages in output directory."; public const string CmdIncludeSourceDescription = "Include PDBs and source files. Source files go into the src folder in the resulting nuget package"; public const string CmdConfig = "CONFIGURATION"; - public const string CmdConfigDescription = "Configuration to use for building the project. Default is \"Debug\"."; + public const string CmdConfigDescription = "Configuration to use for building the project. Default for most projects is \"Debug\"."; public const string CmdVersionSuffix = "VERSION_SUFFIX"; diff --git a/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs b/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs index e7c293b25..e328bafa0 100644 --- a/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs @@ -24,7 +24,7 @@ public const string ConfigurationOption = "CONFIGURATION"; - public const string ConfigurationOptionDescription = "Configuration to use for building the project. Default is \"Debug\"."; + public const string ConfigurationOptionDescription = "Configuration to use for building the project. Default for most projects is \"Debug\"."; public const string VersionSuffixOption = "VERSION_SUFFIX"; diff --git a/src/dotnet/commands/dotnet-run/LocalizableStrings.cs b/src/dotnet/commands/dotnet-run/LocalizableStrings.cs index 0a1501fa6..5a4a1c271 100644 --- a/src/dotnet/commands/dotnet-run/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-run/LocalizableStrings.cs @@ -6,11 +6,11 @@ public const string AppDescription = "Command used to run .NET apps"; - public const string CommandOptionConfigurationDescription = "Configuration to use for building the project. Default is \"Debug\"."; + public const string CommandOptionConfigurationDescription = "Configuration to use for building the project. Default for most projects is \"Debug\"."; public const string CommandOptionFramework = "FRAMEWORK"; - public const string CommandOptionFrameworkDescription = "Build and run the specified framework. The framework has to be specified in the project file. "; + public const string CommandOptionFrameworkDescription = "Build and run the app using the specified framework. The framework has to be specified in the project file. "; public const string CommandOptionProjectDescription = "The path to the project file to run (defaults to the current directory if there is only one project)."; diff --git a/src/dotnet/commands/dotnet-test/LocalizableStrings.cs b/src/dotnet/commands/dotnet-test/LocalizableStrings.cs index 3252a6717..d6fea1f23 100644 --- a/src/dotnet/commands/dotnet-test/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-test/LocalizableStrings.cs @@ -36,7 +36,7 @@ public const string CmdConfiguration = "CONFIGURATION"; - public const string CmdConfigDescription = "Configuration to use for building the project. Default is \"Debug\"."; + public const string CmdConfigDescription = "Configuration to use for building the project. Default for most projects is \"Debug\"."; public const string CmdFramework = "FRAMEWORK"; From 612da09a78ba25a4be21be391b19963b43378b21 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 16 Dec 2016 19:16:38 -0800 Subject: [PATCH 6/7] Fixing the failing dotnet --help test. --- ...ivenThatIWantToShowHelpForDotnetCommand.cs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs index 7fc6cf508..5d3e5edb6 100644 --- a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs +++ b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs @@ -32,14 +32,14 @@ Host options (passed before the command): --info Display .NET CLI Info Commands: - new Initialize a basic .NET project - restore Restore dependencies specified in the .NET project - build Builds a .NET project - publish Publishes a .NET project for deployment (including the runtime) - run Compiles and immediately executes a .NET project - test Runs unit tests using the test runner specified in the project - pack Creates a NuGet package - migrate Migrates a project.json based project to a msbuild based project + new Initialize .NET projects. + restore Restore dependencies specified in the .NET project. + build Builds a .NET project. + publish Publishes a .NET project for deployment (including the runtime). + run Compiles and immediately executes a .NET project. + test Runs unit tests using the test runner specified in the project. + pack Creates a NuGet package. + migrate Migrates a project.json based project to a msbuild based project. Project modification commands: add Add items to the project @@ -47,9 +47,9 @@ Project modification commands: list List items in the project Advanced Commands: - nuget Provides additional NuGet commands - msbuild msbuilds a project and all of its dependencies - vstest Runs tests from the specified files"; + nuget Provides additional NuGet commands. + msbuild Runs Microsoft Build Engine (MSBuild). + vstest Runs Microsoft Test Execution Command Line Tool."; [Theory] [InlineData("--help")] From ee999ef87445e9f51ce40a42add3daf2a27c3da2 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 16 Dec 2016 20:14:33 -0800 Subject: [PATCH 7/7] Adding clean to the expected help output. --- .../GivenThatIWantToShowHelpForDotnetCommand.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs index 5d3e5edb6..488686fe3 100644 --- a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs +++ b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs @@ -40,6 +40,7 @@ Commands: test Runs unit tests using the test runner specified in the project. pack Creates a NuGet package. migrate Migrates a project.json based project to a msbuild based project. + clean Clean build output(s). Project modification commands: add Add items to the project