Changing the parser description for commands that have implicit restore.

src/dotnet/CommonLocalizableStrings.resx

@@ -520,4 +520,7 @@
   <data name="ShowHelpDescription" xml:space="preserve">
     <value>Show help information.</value>
   </data>
+  <data name="NoRestoreDescription" xml:space="preserve">
+    <value>Does not do an implicit restore when executing the command.</value>
+  </data>
 </root>

src/dotnet/commands/CommandWithRestoreOptions.cs

@@ -0,0 +1,39 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.DotNet.Cli;
+using Microsoft.DotNet.Cli.CommandLine;
+using Microsoft.DotNet.Tools.MSBuild;
+using Microsoft.DotNet.Tools.Restore;
+
+namespace Microsoft.DotNet.Tools
+{
+    public static class CreateWithRestoreOptions
+    {
+        public static Command Command(
+            string name,
+            string help,
+            ArgumentsRule arguments,
+            params Option[] options)
+        {
+            return Create.Command(name, help, arguments, RestoreCommandParser.AddImplicitRestoreOptions(options));
+        }
+
+        public static Command Command(
+            string name,
+            string help,
+            ArgumentsRule arguments,
+            bool treatUnmatchedTokensAsErrors,
+            params Option[] options)
+        {
+            return Create.Command(
+                name,
+                help,
+                arguments,
+                treatUnmatchedTokensAsErrors,
+                RestoreCommandParser.AddImplicitRestoreOptions(options));
+        }
+    }
+}

src/dotnet/commands/RestoringCommand.cs

@@ -14,9 +14,7 @@ namespace Microsoft.DotNet.Tools
 
         private IEnumerable<string> ArgsToForward { get; }
 
-        private IEnumerable<string> ArgsToForwardToRestore
+        private IEnumerable<string> ArgsToForwardToRestore()
-        {
-            get
         {
             var restoreArguments = ArgsToForward.Where(a =>
                 !a.StartsWith("/t:") &&
@@ -31,7 +29,6 @@ namespace Microsoft.DotNet.Tools
 
             return restoreArguments;
         }
-        }
 
         private bool ShouldRunImplicitRestore => !NoRestore;
 
@@ -46,7 +43,7 @@ namespace Microsoft.DotNet.Tools
         {
             if (ShouldRunImplicitRestore)
             {
-                int exitCode = RestoreCommand.Run(ArgsToForwardToRestore.ToArray());
+                int exitCode = RestoreCommand.Run(ArgsToForwardToRestore().ToArray());
                 if (exitCode != 0)
                 {
                     return exitCode;

src/dotnet/commands/dotnet-build/BuildCommandParser.cs

@@ -12,22 +12,13 @@ namespace Microsoft.DotNet.Cli
     internal static class BuildCommandParser
     {
         public static Command Build() =>
-            Create.Command(
+            CreateWithRestoreOptions.Command(
                 "build",
                 LocalizableStrings.AppFullName,
                 Accept.ZeroOrMoreArguments()
                       .With(name: CommonLocalizableStrings.CmdProjectFile,
                             description:
                             "The MSBuild project file to build. If a project file is not specified, MSBuild searches the current working directory for a file that has a file extension that ends in `proj` and uses that file."),
-                FullBuildOptions
-                );
-
-        private static Option[] FullBuildOptions
-        {
-            get
-            {
-                var fullBuildOptions = new List<Option>
-                {
                 CommonOptions.HelpOption(),
                 Create.Option(
                     "-o|--output",
@@ -48,13 +39,6 @@ namespace Microsoft.DotNet.Cli
                     Accept.NoArguments()
                           .ForwardAs("/p:BuildProjectReferences=false")),
                 CommonOptions.NoRestoreOption(),
-                    CommonOptions.VerbosityOption()
+                CommonOptions.VerbosityOption());
-                };
-
-                RestoreCommandParser.AddImplicitRestoreOptions(fullBuildOptions);
-
-                return fullBuildOptions.ToArray();
-            }
-        }
     }
 }

src/dotnet/commands/dotnet-pack/PackCommandParser.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.DotNet.Cli.CommandLine;
+using Microsoft.DotNet.Tools;
 using LocalizableStrings = Microsoft.DotNet.Tools.Pack.LocalizableStrings;
 
 namespace Microsoft.DotNet.Cli
@@ -11,18 +12,10 @@ namespace Microsoft.DotNet.Cli
     internal static class PackCommandParser
     {
         public static Command Pack() =>
-            Create.Command(
+            CreateWithRestoreOptions.Command(
                 "pack",
                 LocalizableStrings.AppFullName,
                 Accept.ZeroOrMoreArguments(),
-                FullPackOptions);
-
-        private static Option[] FullPackOptions
-        {
-            get
-            {
-                var fullPackOptions = new List<Option>
-                {
                 CommonOptions.HelpOption(),
                 Create.Option(
                     "-o|--output",
@@ -49,13 +42,6 @@ namespace Microsoft.DotNet.Cli
                     LocalizableStrings.CmdServiceableDescription,
                     Accept.NoArguments().ForwardAs("/p:Serviceable=true")),
                 CommonOptions.NoRestoreOption(),
-                    CommonOptions.VerbosityOption()
+                CommonOptions.VerbosityOption());
-                };
-
-                RestoreCommandParser.AddImplicitRestoreOptions(fullPackOptions);
-
-                return fullPackOptions.ToArray();
-            }
-        }
     }
 }

src/dotnet/commands/dotnet-publish/PublishCommandParser.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.DotNet.Cli.CommandLine;
+using Microsoft.DotNet.Tools;
 using LocalizableStrings = Microsoft.DotNet.Tools.Publish.LocalizableStrings;
 
 namespace Microsoft.DotNet.Cli
@@ -11,18 +12,10 @@ namespace Microsoft.DotNet.Cli
     internal static class PublishCommandParser
     {
         public static Command Publish() =>
-            Create.Command(
+            CreateWithRestoreOptions.Command(
                 "publish",
                 LocalizableStrings.AppDescription,
                 Accept.ZeroOrMoreArguments(),
-                FullPublishOptions);
-
-        private static Option[] FullPublishOptions
-        {
-            get
-            {
-                var fullPublishOptions = new List<Option>
-                {
                 CommonOptions.HelpOption(),
                 Create.Option(
                     "-o|--output",
@@ -51,13 +44,6 @@ namespace Microsoft.DotNet.Cli
                             return $"/p:SelfContained={value}";
                         })),
                 CommonOptions.NoRestoreOption(),
-                    CommonOptions.VerbosityOption()
+                CommonOptions.VerbosityOption());
-                };
-
-                RestoreCommandParser.AddImplicitRestoreOptions(fullPublishOptions);
-
-                return fullPublishOptions.ToArray();
-            }
-        }
     }
 }

src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs

@@ -15,28 +15,27 @@ namespace Microsoft.DotNet.Cli
                 "restore",
                 LocalizableStrings.AppFullName,
                 Accept.ZeroOrMoreArguments(),
-                FullRestoreOptions);
+                FullRestoreOptions());
 
-        private static Option[] FullRestoreOptions
+        private static Option[] FullRestoreOptions()
         {
-            get
+            var fullRestoreOptions = AddImplicitRestoreOptions(new Option[] { CommonOptions.HelpOption() }, true, true);
-            {
-                var fullRestoreOptions = new List<Option>();
 
-                fullRestoreOptions.Add(CommonOptions.HelpOption());
+            return fullRestoreOptions.Concat(new Option[] { CommonOptions.VerbosityOption() }).ToArray();
-                AddImplicitRestoreOptions(fullRestoreOptions, true, true);
-                fullRestoreOptions.Add(CommonOptions.VerbosityOption());
-
-                return fullRestoreOptions.ToArray();
-            }
         }
 
-        public static void AddImplicitRestoreOptions(
+        public static Option[] AddImplicitRestoreOptions(
-            List<Option> commandOptions,
+            IEnumerable<Option> commandOptions)
-            bool showHelp = false,
-            bool useShortOptions = false)
         {
-            commandOptions.AddRange(ImplicitRestoreOptions(showHelp, useShortOptions)
+            return AddImplicitRestoreOptions(commandOptions, false, false).ToArray();
+        }
+
+        private static IEnumerable<Option> AddImplicitRestoreOptions(
+            IEnumerable<Option> commandOptions,
+            bool showHelp,
+            bool useShortOptions)
+        {
+            return commandOptions.Concat(ImplicitRestoreOptions(showHelp, useShortOptions)
                 .Where(o => !commandOptions.Any(c => c.Name == o.Name)));
         }
 
@@ -89,11 +88,10 @@ namespace Microsoft.DotNet.Cli
                     Accept.NoArguments()
                           .ForwardAs("/p:RestoreRecursive=false")),
                 Create.Option(
-                    "-f|--force",
+                    useShortOptions ? "-f|--force" : "--force",
                     LocalizableStrings.CmdForceRestoreOptionDescription,
                     Accept.NoArguments()
-                          .ForwardAs("/p:RestoreForce=true")),
+                          .ForwardAs("/p:RestoreForce=true"))
-                CommonOptions.VerbosityOption()
             };
         }
     }

src/dotnet/commands/dotnet-run/RunCommandParser.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.DotNet.Cli.CommandLine;
+using Microsoft.DotNet.Tools;
 using Microsoft.DotNet.Tools.Run;
 using LocalizableStrings = Microsoft.DotNet.Tools.Run.LocalizableStrings;
 
@@ -12,7 +13,7 @@ namespace Microsoft.DotNet.Cli
     internal static class RunCommandParser
     {
         public static Command Run() =>
-            Create.Command(
+            CreateWithRestoreOptions.Command(
                 "run",
                 LocalizableStrings.AppFullName,
                 treatUnmatchedTokensAsErrors: false,
@@ -29,13 +30,7 @@ namespace Microsoft.DotNet.Cli
                         restoreArgs: o.OptionValuesToBeForwarded(),
                         args: o.Arguments
                     )),
-                options: FullRunOptions);
+                options: new[]
-
-        private static Option[] FullRunOptions
-        {
-            get
-            {
-                var fullRunOptions = new List<Option>
                 {
                     CommonOptions.HelpOption(),
                     CommonOptions.ConfigurationOption(),
@@ -57,12 +52,6 @@ namespace Microsoft.DotNet.Cli
                         LocalizableStrings.CommandOptionNoBuildDescription,
                         Accept.NoArguments()),
                     CommonOptions.NoRestoreOption()
-                };
+                });
-
-                RestoreCommandParser.AddImplicitRestoreOptions(fullRunOptions);
-
-                return fullRunOptions.ToArray();
-            }
-        }
     }
 }

src/dotnet/commands/dotnet-test/TestCommandParser.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.DotNet.Cli.CommandLine;
+using Microsoft.DotNet.Tools;
 using LocalizableStrings = Microsoft.DotNet.Tools.Test.LocalizableStrings;
 
 namespace Microsoft.DotNet.Cli
@@ -18,14 +19,6 @@ namespace Microsoft.DotNet.Cli
                         .With(name: LocalizableStrings.CmdArgProject,
                               description: LocalizableStrings.CmdArgDescription),
                   false,
-                  FullTestOptions);
-
-        private static Option[] FullTestOptions
-        {
-            get
-            {
-                var fullTestOptions = new List<Option>
-                {
                   CommonOptions.HelpOption(),
                   Create.Option(
                         "-s|--settings",
@@ -93,14 +86,7 @@ namespace Microsoft.DotNet.Cli
                               .With(name: LocalizableStrings.cmdCollectFriendlyName)
                               .ForwardAsSingle(o => $"/p:VSTestCollect=\"{string.Join(";", o.Arguments)}\"")),
                   CommonOptions.NoRestoreOption(),
-                      CommonOptions.VerbosityOption()
+                  CommonOptions.VerbosityOption());
-                };
-
-                RestoreCommandParser.AddImplicitRestoreOptions(fullTestOptions);
-
-                return fullTestOptions.ToArray();
-            }
-        }
 
         private static string GetSemiColonEsacpedstring(string arg)
         {