Fix: Fail and warn the user when --uninstall is given parameters

localization/strings/cs-CZ/Resources.resw

@@ -960,6 +960,10 @@ Návrat k sítím NAT.</value>
     <value>Aktualizace se nezdařila (ukončovací kód: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} nepřijímá žádné argumenty. Pro zrušení registrace distribuce použijte místo toho {}.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Odinstalování se nezdařilo (ukončovací kód: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/da-DK/Resources.resw

@@ -960,6 +960,10 @@ Går tilbage til NAT-netværk.</value>
     <value>Opdateringen mislykkedes (afslutningskode: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} accepterer ingen argumenter. Brug {} i stedet for at afregistrere en distribution.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Fjernelsen mislykkedes (udgangskode: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/de-DE/Resources.resw

@@ -966,6 +966,10 @@ Fallback auf NAT-Netzwerk.</value>
     <value>Fehler beim Aktualisieren (Exitcode: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} akzeptiert keine Argumente. Verwenden Sie stattdessen {}, um die Registrierung einer Distribution aufzuheben.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Fehler bei der Deinstallation (Exitcode: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/en-GB/Resources.resw

@@ -960,6 +960,10 @@ Falling back to NAT networking.</value>
     <value>Update failed (exit code: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} does not take any arguments. To unregister a distribution, use {} instead.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Uninstall failed (exit code: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/en-US/Resources.resw

@@ -960,6 +960,10 @@ Falling back to NAT networking.</value>
     <value>Update failed (exit code: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} does not take any arguments. To unregister a distribution, use {} instead.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Uninstall failed (exit code: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/es-ES/Resources.resw

@@ -966,6 +966,10 @@ Revirtiendo a las redes NAT.</value>
     <value>Error de actualización (código de salida: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} no acepta ningún argumento. Para anular el registro de una distribución, use {} en su lugar.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Error de desinstalación (código de salida: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/fi-FI/Resources.resw

@@ -960,6 +960,10 @@ Palataan nat-verkkopalveluun.</value>
     <value>Päivitys epäonnistui (lopetuskoodi: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} ei hyväksy argumentteja. Jos haluat poistaa jakelun rekisteröinnin, käytä sen sijaan komentoa {}.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Asennuksen poistaminen epäonnistui (lopetuskoodi: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/fr-FR/Resources.resw

@@ -967,6 +967,10 @@ Retour à la mise en réseau NAT.</value>
     <value>Échec de la mise à jour (code de sortie : {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} n’accepte aucun argument. Pour désinscrire une distribution, utilisez {} à la place.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Échec de la désinstallation (code de sortie : {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/hu-HU/Resources.resw

@@ -960,6 +960,10 @@ Visszaállás NAT-hálózatkezelésre.</value>
     <value>A frissítés nem sikerült (kilépési kód: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>A(z) {} nem fogad el argumentumokat. Egy disztribúció regisztrációjának törléséhez használja helyette a(z) {} parancsot.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Az eltávolítás nem sikerült (kilépési kód: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/it-IT/Resources.resw

@@ -966,6 +966,10 @@ Fallback alla rete NAT.</value>
     <value>Aggiornamento non riuscito (codice di uscita: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} non accetta argomenti. Per annullare la registrazione di una distribuzione, usare {} al suo posto.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Disinstallazione non riuscita (codice di uscita: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/ja-JP/Resources.resw

@@ -966,6 +966,10 @@ NAT ネットワークにフォールバックしています。</value>
     <value>更新に失敗しました (終了コード: {})。</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} は引数を受け付けません。ディストリビューションの登録を解除するには、代わりに {} を使用してください。</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>アンインストールに失敗しました (終了コード: {})。</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/ko-KR/Resources.resw

@@ -966,6 +966,10 @@ NAT 네트워킹으로 대체합니다.</value>
     <value>업데이트하지 못했습니다(종료 코드: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{}은(는) 인수를 사용하지 않습니다. 배포를 등록 취소하려면 대신 {}을(를) 사용하세요.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>제거하지 못했습니다(종료 코드: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/nb-NO/Resources.resw

@@ -960,6 +960,10 @@ Faller tilbake til NAT-nettverk.</value>
     <value>Oppdateringen mislyktes (feilkode: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} godtar ingen argumenter. Bruk {} i stedet for å avregistrere en distribusjon.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Avinstalleringen mislyktes (feilkode: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/nl-NL/Resources.resw

@@ -960,6 +960,10 @@ Terugvallen op NAT-netwerken.</value>
     <value>Bijwerken is mislukt (afsluitcode: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} accepteert geen argumenten. Gebruik in plaats daarvan {} om de registratie van een distributie ongedaan te maken.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Installatie ongedaan maken is mislukt (afsluitcode: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/pl-PL/Resources.resw

@@ -960,6 +960,10 @@ Powrót do sieci NAT.</value>
     <value>Aktualizacja nie powiodła się (kod zakończenia: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} nie przyjmuje żadnych argumentów. Aby wyrejestrować dystrybucję, użyj zamiast tego {}.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Odinstalowanie nie powiodło się (kod zakończenia: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/pt-BR/Resources.resw

@@ -967,6 +967,10 @@ Voltando à rede NAT.</value>
     <value>Falha na atualização (código de saída: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} não aceita argumentos. Para cancelar o registro de uma distribuição, use {} em vez disso.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Falha ao desinstalar (código de saída: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/pt-PT/Resources.resw

@@ -960,6 +960,10 @@ A reverter para a rede NAT.</value>
     <value>A atualização falhou (código de saída: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} não aceita argumentos. Para anular o registo de uma distribuição, utilize {} em alternativa.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Falha ao desinstalar (código de saída: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/ru-RU/Resources.resw

@@ -967,6 +967,10 @@
     <value>Сбой обновления (код выхода: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} не принимает аргументов. Чтобы отменить регистрацию дистрибутива, используйте вместо этого {}.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Не удалось удалить (код выхода: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/sv-SE/Resources.resw

@@ -960,6 +960,10 @@ Mer information finns på https://aka.ms/wslinstall</value>
     <value>Uppdateringen misslyckades (slutkod: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} tar inga argument. Använd {} istället för att avregistrera en distribution.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Avinstallationen misslyckades (slutkod: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/tr-TR/Resources.resw

@@ -960,6 +960,10 @@ NAT ağ bağlantısına geri dönülüyor.</value>
     <value>Güncelleştirme başarısız (çıkış kodu: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} herhangi bir bağımsız değişken kabul etmez. Bir dağıtımın kaydını silmek için bunun yerine {} kullanın.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>Kaldırma başarısız oldu (çıkış kodu: {}).</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/zh-CN/Resources.resw

@@ -966,6 +966,10 @@ Windows: {}</value>
     <value>更新失败(退出代码: {})。</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} 不接受任何参数。若要注销分发版，请改用 {}。</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>卸载失败(退出代码: {})。</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

localization/strings/zh-TW/Resources.resw

@@ -966,6 +966,10 @@ Windows 版本： {}</value>
     <value>更新失敗 (結束代碼: {})。</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
   </data>
+  <data name="MessageUninstallNoArguments" xml:space="preserve">
+    <value>{} 不接受任何引數。若要取消註冊發行版本，請改用 {}。</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
   <data name="MessageUninstallFailed" xml:space="preserve">
     <value>解除安裝失敗 (結束代碼: {})。</value>
     <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>

src/windows/common/WslClient.cpp

@@ -1751,6 +1751,15 @@ int WslMain(_In_ std::wstring_view commandLine)
         }
         else if (argument == WSL_UNINSTALL_ARG)
         {
+            commandLine = wsl::windows::common::helpers::ConsumeArgument(commandLine, argument);
+            argument = wsl::windows::common::helpers::ParseArgument(commandLine);
+            if (!argument.empty())
+            {
+                wsl::windows::common::wslutil::PrintMessage(
+                    Localization::MessageUninstallNoArguments(WSL_UNINSTALL_ARG, WSL_UNREGISTER_ARG), stdout);
+                return exitCode;
+            }
+
             return Uninstall();
         }
         else

test/windows/UnitTests.cpp

@@ -6562,5 +6562,13 @@ Error code: Wsl/InstallDistro/WSL_E_INVALID_JSON\r\n",
         VERIFY_ARE_EQUAL(result.ExitCode, 0);
     }
 
+    TEST_METHOD(UninstallRejectsArguments)
+    {
+        VerifyOutput(
+            L"--uninstall Distro",
+            wsl::shared::Localization::MessageUninstallNoArguments(WSL_UNINSTALL_ARG, WSL_UNREGISTER_ARG) + L"\r\n",
+            -1);
+    }
+
 }; // namespace UnitTests
 } // namespace UnitTests