Make package identity argument work better with nullability

Author: dsplaisted

src/Cli/dotnet/Commands/Package/Add/PackageAddCommandParser.cs

@@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Cli.Commands.Package.Add;
 
 internal static class PackageAddCommandParser
 {
-    public static readonly Argument<PackageIdentity> CmdPackageArgument = CommonArguments.PackageIdentityArgument(true)
+    public static readonly Argument<PackageIdentity> CmdPackageArgument = CommonArguments.RequiredPackageIdentityArgument()
     .AddCompletions((context) =>
     {
         // we should take --prerelease flags into account for version completion

src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs

@@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Execute
 {
     internal class ToolExecuteCommand(ParseResult result) : CommandBase(result)
     {
-        private readonly PackageIdentity? _packageToolIdentityArgument = result.GetValue(ToolExecuteCommandParser.PackageIdentityArgument);
+        private readonly PackageIdentity _packageToolIdentityArgument = result.GetRequiredValue(ToolExecuteCommandParser.PackageIdentityArgument);
         private readonly IEnumerable<string> _forwardArguments = result.GetValue(ToolExecuteCommandParser.CommandArgument) ?? Enumerable.Empty<string>();
         private readonly bool _allowRollForward = result.GetValue(ToolExecuteCommandParser.RollForwardOption);
         private readonly string? _configFile = result.GetValue(ToolExecuteCommandParser.ConfigOption);
@@ -29,12 +29,6 @@ internal class ToolExecuteCommand(ParseResult result) : CommandBase(result)
 
         public override int Execute()
         {
-            if (_packageToolIdentityArgument is null)
-            {
-                // System.CommandLine will throw an error if the argument is not provided, but we can still check here for clarity.
-                return 1;
-            }
-
             if (!UserAgreedToRunFromSource())
             {
                 throw new GracefulException(CliCommandStrings.ToolRunFromSourceUserConfirmationFailed, isUserError: true);

src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommandParser.cs

@@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Execute
     internal static class ToolExecuteCommandParser
 
     {
-        public static readonly Argument<PackageIdentity?> PackageIdentityArgument = ToolInstallCommandParser.PackageIdentityArgument;
+        public static readonly Argument<PackageIdentity> PackageIdentityArgument = ToolInstallCommandParser.PackageIdentityArgument;
 
         public static readonly Argument<IEnumerable<string>> CommandArgument = new("commandArguments")
         {

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

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

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

@@ -10,7 +10,7 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Update;
 
 internal static class ToolUpdateCommandParser
 {
-    public static readonly Argument<PackageIdentity?> PackageIdentityArgument = CommonArguments.PackageIdentityArgument(requireArgument: false);
+    public static readonly Argument<PackageIdentity?> PackageIdentityArgument = CommonArguments.OptionalPackageIdentityArgument();
 
     public static readonly Option<bool> UpdateAllOption = ToolAppliedOption.UpdateAllOption;
 

src/Cli/dotnet/CommonArguments.cs

@@ -11,15 +11,25 @@ namespace Microsoft.DotNet.Cli
 {
     internal class CommonArguments
     {
-        public static DynamicArgument<PackageIdentity?> PackageIdentityArgument(bool requireArgument = true) =>
+        public static DynamicArgument<PackageIdentity?> OptionalPackageIdentityArgument() =>
             new("packageId")
             {
                 HelpName = "PACKAGE_ID",
                 Description = CliStrings.PackageIdentityArgumentDescription,
                 CustomParser = (ArgumentResult argumentResult) => ParsePackageIdentityWithVersionSeparator(argumentResult.Tokens[0]?.Value),
-                Arity = requireArgument ? ArgumentArity.ExactlyOne : ArgumentArity.ZeroOrOne,
+                Arity = ArgumentArity.ZeroOrOne,
             };
 
+        public static DynamicArgument<PackageIdentity> RequiredPackageIdentityArgument() =>
+            new("packageId")
+            {
+                HelpName = "PACKAGE_ID",
+                Description = CliStrings.PackageIdentityArgumentDescription,
+                CustomParser = (ArgumentResult argumentResult) => ParsePackageIdentityWithVersionSeparator(argumentResult.Tokens[0]?.Value),
+                Arity = ArgumentArity.ExactlyOne,
+            };
+
+
         private static PackageIdentity? ParsePackageIdentityWithVersionSeparator(string? packageIdentity, char versionSeparator = '@')
         {
             if (string.IsNullOrEmpty(packageIdentity))