Change command order for tools (#8862)

dotnet install tool -> dotnet tool install
dotnet uninstall tool -> dotnet tool uninstall
dotnet list tool -> dotnet tool list
dotnet update tool -> dotnet tool update

scripts/cli-test-env.bat

@@ -10,11 +10,11 @@ for %%i in (%~dp0..\) DO (
 title CLI Test (%CLI_REPO_ROOT%)
 
 REM Add Stage 2 CLI to path
-set PATH=%CLI_REPO_ROOT%bin\2\win10-x64\dotnet;%PATH%
+set PATH=%CLI_REPO_ROOT%bin\2\win-x64\dotnet;%PATH%
 
 set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 set DOTNET_MULTILEVEL_LOOKUP=0
 set NUGET_PACKAGES=%CLI_REPO_ROOT%.nuget\packages
-set TEST_PACKAGES=%CLI_REPO_ROOT%bin\2\win10-x64\test\packages
-set TEST_ARTIFACTS=%CLI_REPO_ROOT%bin\2\win10-x64\test\artifacts
-set PreviousStageProps=%CLI_REPO_ROOT%bin\2\win10-x64\PreviousStage.props
+set TEST_PACKAGES=%CLI_REPO_ROOT%bin\2\win-x64\test\packages
+set TEST_ARTIFACTS=%CLI_REPO_ROOT%bin\2\win-x64\test\artifacts
+set PreviousStageProps=%CLI_REPO_ROOT%bin\2\win-x64\PreviousStage.props

src/Microsoft.DotNet.Configurer/LocalizableStrings.resx

@@ -151,7 +151,7 @@ Here are some options to fix this error:
     <value>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</value>
   </data>
 </root>

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf

@@ -62,9 +62,9 @@ Tuto chybu můžete opravit pomocí některé z těchto možností:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
-        <target state="translated">ASP.NET Core
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Úspěšně se podařilo nainstalovat certifikát pro vývoj ASP.NET Core HTTPS Development Certificate.
 Pokud chcete certifikátu důvěřovat (platí jenom pro Windows a macOS), nainstalujte nejprve nástroj dev-certs. To uděláte tak, že spustíte dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final a potom dotnet-dev-certs https --trust.

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf

@@ -62,9 +62,9 @@ Im Folgenden finden Sie einige Optionen, um diesen Fehler zu beheben:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
-        <target state="translated">ASP.NET Core
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Das ASP.NET Core-HTTPS-Entwicklungszertifikat wurde erfolgreich installiert.
 Um dem Zertifikat zu vertrauen (nur Windows und macOS), installieren Sie zuerst das Tool "dev-certs", indem Sie "dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final" und anschließend "dotnet-dev-certs https --trust" ausführen.

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf

@@ -61,9 +61,9 @@ Estas son algunas opciones para corregir este error:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
-        <target state="translated">ASP.NET Core
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 El certificado de desarrollo HTTPS de ASP.NET Core se ha instalado correctamente.
 Para confiar en el certificado (solo Windows y macOS), instale primero la herramienta dev-certs ejecutando "dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final" y, después, ejecute "dotnet-dev-certs https --trust".

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf

@@ -62,9 +62,9 @@ Voici quelques options pour corriger cette erreur :
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
-        <target state="translated">ASP.NET Core
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Le certificat de développement ASP.NET Core HTTPS a été installé.
 Pour approuver le certificat (Windows et macOS uniquement), installez d'abord l'outil dev-certs en exécutant 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final', puis exécutez 'dotnet-dev-certs https --trust'.

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf

@@ -62,9 +62,9 @@ Ecco alcune opzioni per correggere questo errore:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
-        <target state="translated">ASP.NET Core
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Il certificato di sviluppo HTTPS di ASP.NET Core è stato installato.
 Per considerare attendibile il certificato (solo Windows e macOS), installare prima lo strumento dev-certs eseguendo 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' e quindi eseguire 'dotnet-dev-certs https --trust'.

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf

@@ -62,9 +62,9 @@ Here are some options to fix this error:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
-        <target state="translated">ASP.NET Core
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 ASP.NET Core HTTPS 開発証明書が正常にインストールされました。
 証明書を信頼する (Windows および macOS のみ) には、まず 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' を実行して dev-certs ツールをインストールし、次に 'dotnet-dev-certs https --trust' を実行します。

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf

@@ -62,9 +62,9 @@ Here are some options to fix this error:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
-        <target state="translated">ASP.NET Core
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 ASP.NET Core HTTPS 개발 인증서를 설치했습니다.
 인증서를 신뢰하려면(Windows 및 macOS만 해당) 먼저 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final'을 실행하여 dev-certs 도구를 설치한 다음, 'dotnet-dev-certs https --trust'를 실행하세요.

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf

@@ -62,9 +62,9 @@ Oto kilka opcji naprawiania tego błędu:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
-        <target state="translated">ASP.NET Core
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Pomyślnie zainstalowano certyfikat deweloperski protokołu HTTPS programu ASP.NET Core.
 Aby ufać temu certyfikatowi (dotyczy tylko systemów Windows i macOS), najpierw zainstaluj narzędzie dev-certs, uruchamiając polecenie „dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final”, a następnie uruchom polecenie „dotnet-dev-certs https --trust”.

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf

@@ -62,9 +62,9 @@ Aqui estão algumas opções para corrigir este erro:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
-        <target state="translated">ASP.NET Core
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Certificado de Desenvolvimento HTTPS ASP.NET Core instalado com êxito.
 Para confiar no certificado (apenas Windows e macOS), primeiramente instale a ferramenta dev-certs executando ‘dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final’ e, em seguida, execute ‘dotnet-dev-certs https --trust’.

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf

@@ -62,9 +62,9 @@ Here are some options to fix this error:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
-        <target state="translated">ASP.NET Core
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 Сертификат разработки HTTPS для ASP.NET Core установлен.
 Чтобы сделать сертификат доверенным (только Windows и macOS), сначала установите инструмент dev-certs, выполнив команду "dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final", а затем выполните "dotnet-dev-certs https --trust".

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf

@@ -62,9 +62,9 @@ Bu hatayı düzeltmek için bazı seçenekler:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
-        <target state="translated">ASP.NET Core
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 ASP.NET Core HTTPS Geliştirme Sertifikası başarıyla yüklendi.
 Sertifikaya güvenmek için (yalnızca Windows ve macOS) önce 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final', sonra 'dotnet-dev-certs https --trust' komutlarını çalıştırarak dev-certs aracını yükleyin.

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf

@@ -62,9 +62,9 @@ Here are some options to fix this error:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
-        <target state="translated">ASP.NET Core
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 已成功安装 ASP.NET Core HTTPS 开发证书。
 要信任证书(仅限 Windows 和 macOS)，请首先通过运行 "dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final" 安装 dev-certs 工具，然后运行 "dotnet-dev-certs https --trust"。

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf

@@ -62,9 +62,9 @@ Here are some options to fix this error:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
-        <target state="translated">ASP.NET Core
+        <target state="needs-review-translation">ASP.NET Core
 ------------
 已成功安裝 ASP.NET Core HTTPS 開發憑證。
 若要信任此憑證 (僅限 Windows 與 macOS)，請先執行 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' 安裝 dev-certs 工具，然後再執行 'dotnet-dev-certs https --trust'。

src/dotnet/BuiltInCommandsCatalog.cs

@@ -18,11 +18,9 @@ using Microsoft.DotNet.Tools.Run;
 using Microsoft.DotNet.Tools.Sln;
 using Microsoft.DotNet.Tools.Store;
 using Microsoft.DotNet.Tools.Test;
-using Microsoft.DotNet.Tools.Uninstall;
 using Microsoft.DotNet.Tools.VSTest;
 using System.Collections.Generic;
-using Microsoft.DotNet.Tools.Install;
-using Microsoft.DotNet.Tools.Update;
+using Microsoft.DotNet.Tools.Tool;
 
 namespace Microsoft.DotNet.Cli
 {
@@ -147,17 +145,9 @@ namespace Microsoft.DotNet.Cli
             {
                 Command = ParseCommand.Run
             },
-            ["install"] = new BuiltInCommandMetadata
+            ["tool"] = new BuiltInCommandMetadata
             {
-                Command = InstallCommand.Run
-            },
-            ["uninstall"] = new BuiltInCommandMetadata
-            {
-                Command = UninstallCommand.Run
-            },
-            ["update"] = new BuiltInCommandMetadata
-            {
-                Command = UpdateCommand.Run
+                Command = ToolCommand.Run
             },
             ["internal-reportinstallsuccess"] = new BuiltInCommandMetadata
             {

src/dotnet/Parser.cs

@@ -55,9 +55,7 @@ namespace Microsoft.DotNet.Cli
                                     Create.Command("vstest", ""),
                                     CompleteCommandParser.Complete(),
                                     InternalReportinstallsuccessCommandParser.InternalReportinstallsuccess(),
-                                    InstallCommandParser.Install(),
-                                    UninstallCommandParser.Uninstall(),
-                                    UpdateCommandParser.Update(),
+                                    ToolCommandParser.Tool(),
                                     CommonOptions.HelpOption(),
                                     Create.Option("--info", ""),
                                     Create.Option("-d", ""),

src/dotnet/ToolPackage/ToolPackageFactory.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Configurer;
-using Microsoft.DotNet.Tools.Install.Tool;
+using Microsoft.DotNet.Tools.Tool.Install;
 using Microsoft.Extensions.EnvironmentAbstractions;
 
 namespace Microsoft.DotNet.ToolPackage

src/dotnet/commands/dotnet-help/HelpUsageText.cs

@@ -28,9 +28,7 @@ path-to-application:
   msbuild          {LocalizableStrings.MsBuildDefinition}
   vstest           {LocalizableStrings.VsTestDefinition}
   store            {LocalizableStrings.StoreDefinition}
-  install          {LocalizableStrings.InstallDefinition}
-  uninstall        {LocalizableStrings.UninstallDefinition}
-  update           {LocalizableStrings.UpdateDefinition}
+  tool             {LocalizableStrings.ToolDefinition}
   help             {LocalizableStrings.HelpDefinition}
 
 {LocalizableStrings.CommonOptions}:

src/dotnet/commands/dotnet-help/LocalizableStrings.resx

@@ -267,13 +267,7 @@
   <data name="AdditionalDeps" xml:space="preserve">
     <value>Path to additional deps.json file.</value>
   </data>
-  <data name="InstallDefinition" xml:space="preserve">
-    <value>Installs an item into the development environment.</value>
+  <data name="ToolDefinition" xml:space="preserve">
+    <value>Modify tools.</value>
   </data>
-  <data name="UninstallDefinition" xml:space="preserve">
-    <value>Uninstalls an item from the development environment.</value>
-  </data>
-  <data name="UpdateDefinition" xml:space="preserve">
-    <value>Updates an item in the development environment.</value>
-  </data>
-</root>
+</root>

src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf

@@ -252,19 +252,9 @@
         <target state="translated">Ukládá zadaná nastavení do úložiště runtime.</target>
         <note />
       </trans-unit>
-      <trans-unit id="InstallDefinition">
-        <source>Installs an item into the development environment.</source>
-        <target state="translated">Nainstaluje položku do vývojového prostředí.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UninstallDefinition">
-        <source>Uninstalls an item from the development environment.</source>
-        <target state="translated">Odinstaluje položku z vývojového prostředí.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UpdateDefinition">
-        <source>Updates an item in the development environment.</source>
-        <target state="new">Updates an item in the development environment.</target>
+      <trans-unit id="ToolDefinition">
+        <source>Modify tools.</source>
+        <target state="new">Modify tools.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf

@@ -252,19 +252,9 @@
         <target state="translated">Speichert die angegebenen Assemblys im Runtimespeicher.</target>
         <note />
       </trans-unit>
-      <trans-unit id="InstallDefinition">
-        <source>Installs an item into the development environment.</source>
-        <target state="translated">Installiert ein Element in der Entwicklungsumgebung.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UninstallDefinition">
-        <source>Uninstalls an item from the development environment.</source>
-        <target state="translated">Deinstalliert ein Element aus der Entwicklungsumgebung.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UpdateDefinition">
-        <source>Updates an item in the development environment.</source>
-        <target state="new">Updates an item in the development environment.</target>
+      <trans-unit id="ToolDefinition">
+        <source>Modify tools.</source>
+        <target state="new">Modify tools.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf

@@ -252,19 +252,9 @@
         <target state="translated">Almacena los ensamblados especificados en el almacén del tiempo de ejecución.</target>
         <note />
       </trans-unit>
-      <trans-unit id="InstallDefinition">
-        <source>Installs an item into the development environment.</source>
-        <target state="translated">Instala un elemento en el entorno de desarrollo.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UninstallDefinition">
-        <source>Uninstalls an item from the development environment.</source>
-        <target state="translated">Desinstala un elemento en el entorno de desarrollo.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UpdateDefinition">
-        <source>Updates an item in the development environment.</source>
-        <target state="new">Updates an item in the development environment.</target>
+      <trans-unit id="ToolDefinition">
+        <source>Modify tools.</source>
+        <target state="new">Modify tools.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf

@@ -252,19 +252,9 @@
         <target state="translated">Stocke les assemblys spécifiés dans le magasin de runtimes.</target>
         <note />
       </trans-unit>
-      <trans-unit id="InstallDefinition">
-        <source>Installs an item into the development environment.</source>
-        <target state="translated">Installe un élément dans l'environnement de développement.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UninstallDefinition">
-        <source>Uninstalls an item from the development environment.</source>
-        <target state="translated">Désinstalle un élément dans l'environnement de développement.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UpdateDefinition">
-        <source>Updates an item in the development environment.</source>
-        <target state="new">Updates an item in the development environment.</target>
+      <trans-unit id="ToolDefinition">
+        <source>Modify tools.</source>
+        <target state="new">Modify tools.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf

@@ -252,19 +252,9 @@
         <target state="translated">Memorizza gli assembly specificati nell'archivio di runtime.</target>
         <note />
       </trans-unit>
-      <trans-unit id="InstallDefinition">
-        <source>Installs an item into the development environment.</source>
-        <target state="translated">Installa un elemento nell'ambiente di sviluppo.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UninstallDefinition">
-        <source>Uninstalls an item from the development environment.</source>
-        <target state="translated">Disinstalla un elemento dall'ambiente di sviluppo.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UpdateDefinition">
-        <source>Updates an item in the development environment.</source>
-        <target state="new">Updates an item in the development environment.</target>
+      <trans-unit id="ToolDefinition">
+        <source>Modify tools.</source>
+        <target state="new">Modify tools.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf

@@ -252,19 +252,9 @@
         <target state="translated">指定されたアセンブリを実行時ストアに格納します。</target>
         <note />
       </trans-unit>
-      <trans-unit id="InstallDefinition">
-        <source>Installs an item into the development environment.</source>
-        <target state="translated">項目を開発環境にインストールします。</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UninstallDefinition">
-        <source>Uninstalls an item from the development environment.</source>
-        <target state="translated">項目を開発環境からアンインストールします。</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UpdateDefinition">
-        <source>Updates an item in the development environment.</source>
-        <target state="new">Updates an item in the development environment.</target>
+      <trans-unit id="ToolDefinition">
+        <source>Modify tools.</source>
+        <target state="new">Modify tools.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf

@@ -252,19 +252,9 @@
         <target state="translated">지정된 어셈블리를 런타임 저장소에 저장합니다.</target>
         <note />
       </trans-unit>
-      <trans-unit id="InstallDefinition">
-        <source>Installs an item into the development environment.</source>
-        <target state="translated">개발 환경에 항목을 설치합니다.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UninstallDefinition">
-        <source>Uninstalls an item from the development environment.</source>
-        <target state="translated">개발 환경에서 항목을 제거합니다.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UpdateDefinition">
-        <source>Updates an item in the development environment.</source>
-        <target state="new">Updates an item in the development environment.</target>
+      <trans-unit id="ToolDefinition">
+        <source>Modify tools.</source>
+        <target state="new">Modify tools.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf

@@ -252,19 +252,9 @@
         <target state="translated">Przechowuje określone zestawy w magazynie środowiska uruchomieniowego.</target>
         <note />
       </trans-unit>
-      <trans-unit id="InstallDefinition">
-        <source>Installs an item into the development environment.</source>
-        <target state="translated">Instaluje element w środowisku deweloperskim.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UninstallDefinition">
-        <source>Uninstalls an item from the development environment.</source>
-        <target state="translated">Odinstalowuje element ze środowiska deweloperskiego.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UpdateDefinition">
-        <source>Updates an item in the development environment.</source>
-        <target state="new">Updates an item in the development environment.</target>
+      <trans-unit id="ToolDefinition">
+        <source>Modify tools.</source>
+        <target state="new">Modify tools.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf

@@ -252,19 +252,9 @@
         <target state="translated">Armazena os assemblies especificados no repositório de tempo de execução.</target>
         <note />
       </trans-unit>
-      <trans-unit id="InstallDefinition">
-        <source>Installs an item into the development environment.</source>
-        <target state="translated">Instala um item no ambiente de desenvolvimento.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UninstallDefinition">
-        <source>Uninstalls an item from the development environment.</source>
-        <target state="translated">Desinstala um item do ambiente de desenvolvimento.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UpdateDefinition">
-        <source>Updates an item in the development environment.</source>
-        <target state="new">Updates an item in the development environment.</target>
+      <trans-unit id="ToolDefinition">
+        <source>Modify tools.</source>
+        <target state="new">Modify tools.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf

@@ -252,19 +252,9 @@
         <target state="translated">Он сохраняет указанные сборки в хранилище среды выполнения.</target>
         <note />
       </trans-unit>
-      <trans-unit id="InstallDefinition">
-        <source>Installs an item into the development environment.</source>
-        <target state="translated">Устанавливает элемент в среде разработки.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UninstallDefinition">
-        <source>Uninstalls an item from the development environment.</source>
-        <target state="translated">Удаляет элемент из среды разработки.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UpdateDefinition">
-        <source>Updates an item in the development environment.</source>
-        <target state="new">Updates an item in the development environment.</target>
+      <trans-unit id="ToolDefinition">
+        <source>Modify tools.</source>
+        <target state="new">Modify tools.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf

@@ -252,19 +252,9 @@
         <target state="translated">Belirtilen bütünleştirilmiş kodları çalışma zamanı deposunda depolar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="InstallDefinition">
-        <source>Installs an item into the development environment.</source>
-        <target state="translated">Bir öğeyi geliştirme ortamına yükler.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UninstallDefinition">
-        <source>Uninstalls an item from the development environment.</source>
-        <target state="translated">Bir öğeyi geliştirme ortamından kaldırır.</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UpdateDefinition">
-        <source>Updates an item in the development environment.</source>
-        <target state="new">Updates an item in the development environment.</target>
+      <trans-unit id="ToolDefinition">
+        <source>Modify tools.</source>
+        <target state="new">Modify tools.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf

@@ -252,19 +252,9 @@
         <target state="translated">在运行时存储中存储指定的程序集。</target>
         <note />
       </trans-unit>
-      <trans-unit id="InstallDefinition">
-        <source>Installs an item into the development environment.</source>
-        <target state="translated">将项目安装到开发环境中。</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UninstallDefinition">
-        <source>Uninstalls an item from the development environment.</source>
-        <target state="translated">从开发环境中卸载项目。</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UpdateDefinition">
-        <source>Updates an item in the development environment.</source>
-        <target state="new">Updates an item in the development environment.</target>
+      <trans-unit id="ToolDefinition">
+        <source>Modify tools.</source>
+        <target state="new">Modify tools.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf

@@ -252,19 +252,9 @@
         <target state="translated">將指定組件儲存到執行階段存放區中。</target>
         <note />
       </trans-unit>
-      <trans-unit id="InstallDefinition">
-        <source>Installs an item into the development environment.</source>
-        <target state="translated">將項目安裝至部署環境。</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UninstallDefinition">
-        <source>Uninstalls an item from the development environment.</source>
-        <target state="translated">將開發環境的項目解除安裝。</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="UpdateDefinition">
-        <source>Updates an item in the development environment.</source>
-        <target state="new">Updates an item in the development environment.</target>
+      <trans-unit id="ToolDefinition">
+        <source>Modify tools.</source>
+        <target state="new">Modify tools.</target>
         <note />
       </trans-unit>
     </body>

src/dotnet/commands/dotnet-install/InstallCommandParser.cs

@@ -1,21 +0,0 @@
-// 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 Microsoft.DotNet.Cli.CommandLine;
-using LocalizableStrings = Microsoft.DotNet.Tools.Install.LocalizableStrings;
-
-namespace Microsoft.DotNet.Cli
-{
-    internal static class InstallCommandParser
-    {
-        public static Command Install()
-        {
-            return Create.Command(
-                "install",
-                LocalizableStrings.CommandDescription,
-                Accept.NoArguments(),
-                CommonOptions.HelpOption(),
-                InstallToolCommandParser.InstallTool());
-        }
-    }
-}

src/dotnet/commands/dotnet-list/ListCommand.cs

@@ -7,7 +7,6 @@ using Microsoft.DotNet.Cli;
 using Microsoft.DotNet.Cli.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Tools.List.ProjectToProjectReferences;
-using Microsoft.DotNet.Tools.List.Tool;
 
 namespace Microsoft.DotNet.Tools.List
 {
@@ -24,10 +23,6 @@ namespace Microsoft.DotNet.Tools.List
                 {
                     "reference",
                     o => new ListProjectToProjectReferencesCommand(o, ParseResult)
-                },
-                {
-                    "tool",
-                    o => new ListToolCommand(o["tool"], ParseResult)
                 }
             };
 
@@ -36,4 +31,4 @@ namespace Microsoft.DotNet.Tools.List
             return new ListCommand().RunCommand(args);
         }
     }
-}
+}

src/dotnet/commands/dotnet-list/ListCommandParser.cs

@@ -4,7 +4,6 @@
 using Microsoft.DotNet.Cli.CommandLine;
 using Microsoft.DotNet.Tools;
 using Microsoft.DotNet.Tools.List.ProjectToProjectReferences;
-using Microsoft.DotNet.Tools.List.Tool;
 using LocalizableStrings = Microsoft.DotNet.Tools.List.LocalizableStrings;
 
 namespace Microsoft.DotNet.Cli
@@ -20,7 +19,6 @@ namespace Microsoft.DotNet.Cli
                     description: CommonLocalizableStrings.ArgumentsProjectDescription)
                 .DefaultToCurrentDirectory(),
             CommonOptions.HelpOption(),
-            ListProjectToProjectReferencesCommandParser.ListProjectToProjectReferences(),
-            ListToolCommandParser.ListTool());
+            ListProjectToProjectReferencesCommandParser.ListProjectToProjectReferences());
     }
 }

src/dotnet/commands/dotnet-tool/LocalizableStrings.resx

@@ -121,6 +121,6 @@
     <value>.NET Install Command</value>
   </data>
   <data name="CommandDescription" xml:space="preserve">
-    <value>Installs an item into the development environment.</value>
+    <value>Modify tools.</value>
   </data>
-</root>
+</root>

src/dotnet/commands/dotnet-tool/ToolCommand.cs

@@ -6,13 +6,16 @@ using System.Collections.Generic;
 using Microsoft.DotNet.Cli;
 using Microsoft.DotNet.Cli.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
-using Microsoft.DotNet.Tools.Install.Tool;
+using Microsoft.DotNet.Tools.Tool.Install;
+using Microsoft.DotNet.Tools.Tool.List;
+using Microsoft.DotNet.Tools.Tool.Uninstall;
+using Microsoft.DotNet.Tools.Tool.Update;
 
-namespace Microsoft.DotNet.Tools.Install
+namespace Microsoft.DotNet.Tools.Tool
 {
-    public class InstallCommand : DotNetTopLevelCommandBase
+    public class ToolCommand : DotNetTopLevelCommandBase
     {
-        protected override string CommandName => "install";
+        protected override string CommandName => "tool";
         protected override string FullCommandNameLocalized => LocalizableStrings.InstallFullCommandNameLocalized;
         protected override string ArgumentName => Constants.ProjectArgumentName;
         protected override string ArgumentDescriptionLocalized => CommonLocalizableStrings.ArgumentsProjectDescription;
@@ -20,15 +23,27 @@ namespace Microsoft.DotNet.Tools.Install
         internal override Dictionary<string, Func<AppliedOption, CommandBase>> SubCommands =>
             new Dictionary<string, Func<AppliedOption, CommandBase>>
             {
-                ["tool"] =
-                appliedOption => new InstallToolCommand(
-                    appliedOption["tool"],
+                ["install"] =
+                appliedOption => new ToolInstallCommand(
+                    appliedOption["install"],
+                    ParseResult),
+                ["uninstall"] =
+                appliedOption => new ToolUninstallCommand(
+                    appliedOption["uninstall"],
+                    ParseResult),
+                ["update"] =
+                appliedOption => new ToolUpdateCommand(
+                    appliedOption["update"],
+                    ParseResult),
+                ["list"] =
+                appliedOption => new ListToolCommand(
+                    appliedOption["list"],
                     ParseResult)
             };
 
         public static int Run(string[] args)
         {
-            var command = new InstallCommand();
+            var command = new ToolCommand();
             return command.RunCommand(args);
         }
     }

src/dotnet/commands/dotnet-tool/ToolCommandParser.cs

@@ -2,20 +2,23 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Microsoft.DotNet.Cli.CommandLine;
-using LocalizableStrings = Microsoft.DotNet.Tools.Uninstall.LocalizableStrings;
+using LocalizableStrings = Microsoft.DotNet.Tools.Tool.LocalizableStrings;
 
 namespace Microsoft.DotNet.Cli
 {
-    internal static class UninstallCommandParser
+    internal static class ToolCommandParser
     {
-        public static Command Uninstall()
+        public static Command Tool()
         {
             return Create.Command(
-                "uninstall",
+                "tool",
                 LocalizableStrings.CommandDescription,
                 Accept.NoArguments(),
                 CommonOptions.HelpOption(),
-                UninstallToolCommandParser.UninstallTool());
+                ToolInstallCommandParser.ToolInstall(),
+                ToolUninstallCommandParser.ToolUninstall(),
+                ToolUpdateCommandParser.ToolUpdate(),
+                ToolListCommandParser.ToolList());
         }
     }
 }

src/dotnet/commands/dotnet-tool/install/ProjectRestorer.cs

@@ -10,7 +10,7 @@ using Microsoft.DotNet.ToolPackage;
 using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.Extensions.EnvironmentAbstractions;
 
-namespace Microsoft.DotNet.Tools.Install.Tool
+namespace Microsoft.DotNet.Tools.Tool.Install
 {
     internal class ProjectRestorer : IProjectRestorer
     {

src/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs

@@ -15,12 +15,12 @@ using Microsoft.DotNet.ToolPackage;
 using Microsoft.Extensions.EnvironmentAbstractions;
 using NuGet.Versioning;
 
-namespace Microsoft.DotNet.Tools.Install.Tool
+namespace Microsoft.DotNet.Tools.Tool.Install
 {
     internal delegate IShellShimRepository CreateShellShimRepository(DirectoryPath? nonGlobalLocation = null);
     internal delegate (IToolPackageStore, IToolPackageInstaller) CreateToolPackageStoreAndInstaller(DirectoryPath? nonGlobalLocation = null);
 
-    internal class InstallToolCommand : CommandBase
+    internal class ToolInstallCommand : CommandBase
     {
         private readonly IEnvironmentPathInstruction _environmentPathInstruction;
         private readonly IReporter _reporter;
@@ -37,7 +37,7 @@ namespace Microsoft.DotNet.Tools.Install.Tool
         private readonly string _verbosity;
         private readonly string _toolPath;
 
-        public InstallToolCommand(
+        public ToolInstallCommand(
             AppliedOption appliedCommand,
             ParseResult parseResult,
             CreateToolPackageStoreAndInstaller createToolPackageStoreAndInstaller = null,

src/dotnet/commands/dotnet-tool/install/ToolInstallCommandLowLevelErrorConverter.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using Microsoft.DotNet.ShellShim;
 using Microsoft.DotNet.ToolPackage;
 
-namespace Microsoft.DotNet.Tools.Install.Tool
+namespace Microsoft.DotNet.Tools.Tool.Install
 {
     internal static class InstallToolCommandLowLevelErrorConverter
     {

src/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs

@@ -2,15 +2,15 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Microsoft.DotNet.Cli.CommandLine;
-using LocalizableStrings = Microsoft.DotNet.Tools.Install.Tool.LocalizableStrings;
+using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Install.LocalizableStrings;
 
 namespace Microsoft.DotNet.Cli
 {
-    internal static class InstallToolCommandParser
+    internal static class ToolInstallCommandParser
     {
-        public static Command InstallTool()
+        public static Command ToolInstall()
         {
-            return Create.Command("tool",
+            return Create.Command("install",
                 LocalizableStrings.CommandDescription,
                 Accept.ExactlyOneArgument(errorMessage: o => LocalizableStrings.SpecifyExactlyOnePackageId)
                     .With(name: LocalizableStrings.PackageIdArgumentName,

src/dotnet/commands/dotnet-tool/list/ToolListCommand.cs

@@ -11,7 +11,7 @@ using Microsoft.DotNet.Configurer;
 using Microsoft.DotNet.ToolPackage;
 using Microsoft.Extensions.EnvironmentAbstractions;
 
-namespace Microsoft.DotNet.Tools.List.Tool
+namespace Microsoft.DotNet.Tools.Tool.List
 {
     internal delegate IToolPackageStore CreateToolPackageStore(DirectoryPath? nonGlobalLocation = null);
 

src/dotnet/commands/dotnet-tool/list/ToolListCommandParser.cs

@@ -2,16 +2,16 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Microsoft.DotNet.Cli.CommandLine;
-using LocalizableStrings = Microsoft.DotNet.Tools.List.Tool.LocalizableStrings;
+using LocalizableStrings = Microsoft.DotNet.Tools.Tool.List.LocalizableStrings;
 
 namespace Microsoft.DotNet.Cli
 {
-    internal static class ListToolCommandParser
+    internal static class ToolListCommandParser
     {
-        public static Command ListTool()
+        public static Command ToolList()
         {
             return Create.Command(
-                "tool",
+                "list",
                 LocalizableStrings.CommandDescription,
                 Create.Option(
                     "-g|--global",

src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommand.cs

@@ -14,11 +14,11 @@ using Microsoft.DotNet.ShellShim;
 using Microsoft.DotNet.ToolPackage;
 using Microsoft.Extensions.EnvironmentAbstractions;
 
-namespace Microsoft.DotNet.Tools.Uninstall.Tool
+namespace Microsoft.DotNet.Tools.Tool.Uninstall
 {
     internal delegate IShellShimRepository CreateShellShimRepository(DirectoryPath? nonGlobalLocation = null);
     internal delegate IToolPackageStore CreateToolPackageStore(DirectoryPath? nonGlobalLocation = null);
-    internal class UninstallToolCommand : CommandBase
+    internal class ToolUninstallCommand : CommandBase
     {
         private readonly AppliedOption _options;
         private readonly IReporter _reporter;
@@ -26,7 +26,7 @@ namespace Microsoft.DotNet.Tools.Uninstall.Tool
         private CreateShellShimRepository _createShellShimRepository;
         private CreateToolPackageStore _createToolPackageStore;
 
-        public UninstallToolCommand(
+        public ToolUninstallCommand(
             AppliedOption options,
             ParseResult result,
             CreateToolPackageStore createToolPackageStore = null,
@@ -120,10 +120,10 @@ namespace Microsoft.DotNet.Tools.Uninstall.Tool
                         package.Version.ToNormalizedString()).Green());
                 return 0;
             }
-            catch (Exception ex) when (UninstallToolCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex))
+            catch (Exception ex) when (ToolUninstallCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex))
             {
                 throw new GracefulException(
-                    messages: UninstallToolCommandLowLevelErrorConverter.GetUserFacingMessages(ex, packageId),
+                    messages: ToolUninstallCommandLowLevelErrorConverter.GetUserFacingMessages(ex, packageId),
                     verboseMessages: new[] {ex.ToString()},
                     isUserError: false);
             }

src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs

@@ -6,9 +6,9 @@ using System.Collections.Generic;
 using Microsoft.DotNet.ShellShim;
 using Microsoft.DotNet.ToolPackage;
 
-namespace Microsoft.DotNet.Tools.Uninstall.Tool
+namespace Microsoft.DotNet.Tools.Tool.Uninstall
 {
-    internal static class UninstallToolCommandLowLevelErrorConverter
+    internal static class ToolUninstallCommandLowLevelErrorConverter
     {
         public static IEnumerable<string> GetUserFacingMessages(Exception ex, PackageId packageId)
         {
@@ -24,7 +24,7 @@ namespace Microsoft.DotNet.Tools.Uninstall.Tool
             {
                 userFacingMessages = new[]
                 {
-                    String.Format(
+                    string.Format(
                         LocalizableStrings.FailedToUninstallTool,
                         packageId,
                         ex.Message)

src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandParser.cs

@@ -2,15 +2,15 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Microsoft.DotNet.Cli.CommandLine;
-using LocalizableStrings = Microsoft.DotNet.Tools.Uninstall.Tool.LocalizableStrings;
+using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Uninstall.LocalizableStrings;
 
 namespace Microsoft.DotNet.Cli
 {
-    internal static class UninstallToolCommandParser
+    internal static class ToolUninstallCommandParser
     {
-        public static Command UninstallTool()
+        public static Command ToolUninstall()
         {
-            return Create.Command("tool",
+            return Create.Command("uninstall",
                 LocalizableStrings.CommandDescription,
                 Accept.ExactlyOneArgument(errorMessage: o => LocalizableStrings.SpecifyExactlyOnePackageId)
                     .With(name: LocalizableStrings.PackageIdArgumentName,

src/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs

@@ -11,18 +11,18 @@ using Microsoft.DotNet.Cli.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.ShellShim;
 using Microsoft.DotNet.ToolPackage;
-using Microsoft.DotNet.Tools.Install.Tool;
-using Microsoft.DotNet.Tools.Uninstall.Tool;
+using Microsoft.DotNet.Tools.Tool.Install;
+using Microsoft.DotNet.Tools.Tool.Uninstall;
 using Microsoft.Extensions.EnvironmentAbstractions;
 
-namespace Microsoft.DotNet.Tools.Update.Tool
+namespace Microsoft.DotNet.Tools.Tool.Update
 {
     internal delegate IShellShimRepository CreateShellShimRepository(DirectoryPath? nonGlobalLocation = null);
 
     internal delegate (IToolPackageStore, IToolPackageInstaller) CreateToolPackageStoreAndInstaller(
         DirectoryPath? nonGlobalLocation = null);
 
-    internal class UpdateToolCommand : CommandBase
+    internal class ToolUpdateCommand : CommandBase
     {
         private readonly IReporter _reporter;
         private readonly IReporter _errorReporter;
@@ -37,7 +37,7 @@ namespace Microsoft.DotNet.Tools.Update.Tool
         private readonly string _verbosity;
         private readonly string _toolPath;
 
-        public UpdateToolCommand(AppliedOption appliedCommand,
+        public ToolUpdateCommand(AppliedOption appliedCommand,
             ParseResult parseResult,
             CreateToolPackageStoreAndInstaller createToolPackageStoreAndInstaller = null,
             CreateShellShimRepository createShellShimRepository = null,
@@ -207,14 +207,14 @@ namespace Microsoft.DotNet.Tools.Update.Tool
                 uninstallAction();
             }
             catch (Exception ex)
-                when (UninstallToolCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex))
+                when (ToolUninstallCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex))
             {
                 var message = new List<string>
                 {
                     string.Format(LocalizableStrings.UpdateToolFailed, _packageId)
                 };
                 message.AddRange(
-                    UninstallToolCommandLowLevelErrorConverter.GetUserFacingMessages(ex, _packageId));
+                    ToolUninstallCommandLowLevelErrorConverter.GetUserFacingMessages(ex, _packageId));
 
                 throw new GracefulException(
                     messages: message,

src/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs

@@ -2,15 +2,15 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Microsoft.DotNet.Cli.CommandLine;
-using LocalizableStrings = Microsoft.DotNet.Tools.Update.Tool.LocalizableStrings;
+using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Update.LocalizableStrings;
 
 namespace Microsoft.DotNet.Cli
 {
-    internal static class UpdateToolCommandParser
+    internal static class ToolUpdateCommandParser
     {
-        public static Command Update()
+        public static Command ToolUpdate()
         {
-            return Create.Command("tool",
+            return Create.Command("update",
                 LocalizableStrings.CommandDescription,
                 Accept.ExactlyOneArgument(errorMessage: o => LocalizableStrings.SpecifyExactlyOnePackageId)
                     .With(name: LocalizableStrings.PackageIdArgumentName,