Updates to workload config command

dotnet · Mar 20, 2024 · bcc7037 · bcc7037
1 parent 321b6d4
commit bcc7037
Show file tree

Hide file tree

Showing 16 changed files with 126 additions and 31 deletions.
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/LocalizableStrings.resx b/src/Cli/dotnet/commands/dotnet-workload/config/LocalizableStrings.resx
@@ -118,6 +118,10 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="CommandDescription" xml:space="preserve">
-    <value>Modify or display workload configuration values.</value>
+    <value>Modify or display workload configuration values.
+To display a value, specify the corresponding command-line option without providing a value.  For example: "dotnet workload config --update-mode"</value>
+  </data>
+  <data name="UpdateModeDescription" xml:space="preserve">
+    <value>Controls whether updates should look for workload sets or the latest version of each individual manifest.</value>
   </data>
 </root>
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/WorkloadConfigCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/config/WorkloadConfigCommand.cs
@@ -80,13 +80,13 @@ public override int Execute()
                 }
                 else
                 {
-                    Reporter.WriteLine($"Invalid update mode: {_updateMode}");
-                    return 1;
+                    //  This should not be hit, as parser sets the accepted values and should error before getting here if the value is not valid
+                    throw new InvalidOperationException($"Invalid update mode: {_updateMode}");
                 }
             }
             else
             {
-                Reporter.WriteLine("No update mode specified");
+                _parseResult.ShowHelp();
             }
 
             return 0;

diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/WorkloadConfigCommandParser.cs b/src/Cli/dotnet/commands/dotnet-workload/config/WorkloadConfigCommandParser.cs
@@ -15,7 +15,7 @@ internal static class WorkloadConfigCommandParser
 
         public static readonly CliOption<string> UpdateMode = new("--update-mode")
         {
-            Description = "Set the update mode for the workload manifest",
+            Description = LocalizableStrings.UpdateModeDescription,
             //Hidden = true,
             Arity = ArgumentArity.ZeroOrOne
         };

diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.pt-BR.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.ru.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.tr.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.zh-Hans.xlf
diff --git a/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-workload/config/xlf/LocalizableStrings.zh-Hant.xlf