Use single format string with placeholders instead of separate resource strings

Co-authored-by: baronfel <[email protected]>

Author: 2 people

src/Cli/dotnet/CliStrings.resx

@@ -817,10 +817,7 @@ The default is 'false.' However, when targeting .NET 7 or lower, the default is
     <comment>{Locked="dotnet workload update"}</comment>
   </data>
   <data name="PackageIdentityArgumentDescription" xml:space="preserve">
-    <value>Package reference in the form of a package identifier like 'Newtonsoft.Json' or package identifier and version separated by '@' like '[email protected]'.</value>
-  </data>
-  <data name="ToolPackageIdentityArgumentDescription" xml:space="preserve">
-    <value>Package reference in the form of a package identifier like 'dotnetsay' or package identifier and version separated by '@' like '[email protected]'.</value>
+    <value>Package reference in the form of a package identifier like '{0}' or package identifier and version separated by '@' like '{0}@{1}'.</value>
   </data>
   <data name="PackageIdentityArgumentIdOrVersionIsNull" xml:space="preserve">
     <value>Package reference id and version must not be null.</value>

src/Cli/dotnet/Commands/Tool/Install/ToolInstallCommandParser.cs

@@ -10,7 +10,7 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Install;
 
 internal static class ToolInstallCommandParser
 {
-    public static readonly Argument<PackageIdentityWithRange> PackageIdentityArgument = CommonArguments.RequiredPackageIdentityArgument(CliStrings.ToolPackageIdentityArgumentDescription);
+    public static readonly Argument<PackageIdentityWithRange> PackageIdentityArgument = CommonArguments.RequiredPackageIdentityArgument("dotnetsay", "2.1.7");
 
     public static readonly Option<string> VersionOption = new("--version")
     {

src/Cli/dotnet/Commands/Tool/Update/ToolUpdateCommandParser.cs

@@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Update;
 
 internal static class ToolUpdateCommandParser
 {
-    public static readonly Argument<PackageIdentityWithRange?> PackageIdentityArgument = CommonArguments.OptionalPackageIdentityArgument(CliStrings.ToolPackageIdentityArgumentDescription);
+    public static readonly Argument<PackageIdentityWithRange?> PackageIdentityArgument = CommonArguments.OptionalPackageIdentityArgument("dotnetsay", "2.1.7");
 
     public static readonly Option<bool> UpdateAllOption = ToolAppliedOption.UpdateAllOption;
 

src/Cli/dotnet/CommonArguments.cs

@@ -12,23 +12,23 @@ namespace Microsoft.DotNet.Cli
     internal class CommonArguments
     {
         public static DynamicArgument<PackageIdentityWithRange?> OptionalPackageIdentityArgument() =>
-            OptionalPackageIdentityArgument(CliStrings.PackageIdentityArgumentDescription);
+            OptionalPackageIdentityArgument("Newtonsoft.Json", "13.0.3");
 
-        public static DynamicArgument<PackageIdentityWithRange?> OptionalPackageIdentityArgument(string description) =>
+        public static DynamicArgument<PackageIdentityWithRange?> OptionalPackageIdentityArgument(string examplePackage, string exampleVersion) =>
             new("packageId")
             {
-                Description = description,
+                Description = string.Format(CliStrings.PackageIdentityArgumentDescription, examplePackage, exampleVersion),
                 CustomParser = (ArgumentResult argumentResult) => ParsePackageIdentityWithVersionSeparator(argumentResult.Tokens[0]?.Value),
                 Arity = ArgumentArity.ZeroOrOne,
             };
 
         public static DynamicArgument<PackageIdentityWithRange> RequiredPackageIdentityArgument() =>
-            RequiredPackageIdentityArgument(CliStrings.PackageIdentityArgumentDescription);
+            RequiredPackageIdentityArgument("Newtonsoft.Json", "13.0.3");
 
-        public static DynamicArgument<PackageIdentityWithRange> RequiredPackageIdentityArgument(string description) =>
+        public static DynamicArgument<PackageIdentityWithRange> RequiredPackageIdentityArgument(string examplePackage, string exampleVersion) =>
             new("packageId")
             {
-                Description = description,
+                Description = string.Format(CliStrings.PackageIdentityArgumentDescription, examplePackage, exampleVersion),
                 CustomParser = (ArgumentResult argumentResult) => ParsePackageIdentityWithVersionSeparator(argumentResult.Tokens[0]?.Value)!.Value,
                 Arity = ArgumentArity.ExactlyOne,
             };