Little push

Author: Forgind

src/dotnet-bootstrapper/BootstrapperCommandParser.cs

@@ -24,7 +24,7 @@ static BootstrapperCommandParser()
             BootstrapperRootCommand.AddCommand(CommandLineConfigs.ListCommand);
             BootstrapperRootCommand.AddCommand(CommandLineConfigs.RemoveCommand);
             BootstrapperRootCommand.AddCommand(HelpCommand);
-            VersionCommand.Handler = CommandHandler.Create(() =>
+            HelpCommand.Handler = CommandHandler.Create(() =>
             {
                 Console.WriteLine(LocalizableStrings.BootstrapperHelp);
             });

src/dotnet-core-uninstall/Shared/Configs/CommandLineConfigs.cs

@@ -20,7 +20,7 @@
 
 namespace Microsoft.DotNet.Tools.Uninstall.Shared.Configs
 {
-    internal static class CommandLineConfigs
+    public static class CommandLineConfigs
     {
         public static Parser UninstallCommandParser;
 
@@ -185,7 +185,7 @@ internal static class CommandLineConfigs
             ForceOption
         };
 
-        public static readonly Dictionary<string, VerbosityLevel> VerbosityLevels = new Dictionary<string, VerbosityLevel>
+        internal static readonly Dictionary<string, VerbosityLevel> VerbosityLevels = new Dictionary<string, VerbosityLevel>
         {
             { "q", VerbosityLevel.Quiet }, { "quiet", VerbosityLevel.Quiet },
             { "m", VerbosityLevel.Minimal }, { "minimal", VerbosityLevel.Minimal },
@@ -221,7 +221,7 @@ static CommandLineConfigs()
             UninstallRootCommand.AddCommand(ListCommand);
             UninstallRootCommand.AddCommand(DryRunCommand);
             UninstallRootCommand.AddCommand(RemoveCommand);
-            RemoveCommand.Aliases.Add(UninstallCommandName); // The verbiage that makes the most sense from the bootstrapper would be 'uninstall', so just adding an alias permits more code sharing
+            RemoveCommand.AddAlias(UninstallCommandName); // The verbiage that makes the most sense from the bootstrapper would be 'uninstall', so just adding an alias permits more code sharing
             UninstallRootCommand.AddCommand(VersionSubcommand);
 
             if (RuntimeInfo.RunningOnOSX)
@@ -314,7 +314,7 @@ public static Option GetUninstallMainOption(this CommandResult commandResult)
             return specifiedOption;
         }
 
-        public static BundleType GetTypeSelection(this ParseResult parseResult)
+        internal static BundleType GetTypeSelection(this ParseResult parseResult)
         {
             var supportedBundleTypes = SupportedBundleTypeConfigs.GetSupportedBundleTypes();
 
@@ -328,7 +328,7 @@ public static BundleType GetTypeSelection(this ParseResult parseResult)
                 typeSelection;
         }
 
-        public static BundleArch GetArchSelection(this ParseResult parseResult)
+        internal static BundleArch GetArchSelection(this ParseResult parseResult)
         {
             var archSelection = new[]
             {
@@ -345,7 +345,7 @@ public static BundleArch GetArchSelection(this ParseResult parseResult)
                 archSelection;
         }
 
-        public static VerbosityLevel GetVerbosityLevel(this CommandResult commandResult)
+        internal static VerbosityLevel GetVerbosityLevel(this CommandResult commandResult)
         {
             var optionResult = commandResult.FindResultFor(VerbosityOption);