Accept version ranges via package@version syntax (#49555)

jjonescz · web-flow · commit 847191375646 · 2025-06-26T10:20:14.000+02:00
diff --git a/src/Cli/dotnet/Commands/Package/Add/PackageAddCommand.cs b/src/Cli/dotnet/Commands/Package/Add/PackageAddCommand.cs
@@ -8,7 +8,6 @@
 using Microsoft.DotNet.Cli.Commands.NuGet;
 using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Cli.Utils;
-using NuGet.Packaging.Core;
 
 namespace Microsoft.DotNet.Cli.Commands.Package.Add;
 
@@ -19,7 +18,7 @@ namespace Microsoft.DotNet.Cli.Commands.Package.Add;
 /// </param>
 internal class PackageAddCommand(ParseResult parseResult, string fileOrDirectory) : CommandBase(parseResult)
 {
-    private readonly PackageIdentity _packageId = parseResult.GetValue(PackageAddCommandParser.CmdPackageArgument);
+    private readonly PackageIdentityWithRange _packageId = parseResult.GetValue(PackageAddCommandParser.CmdPackageArgument);
 
     public override int Execute()
     {
@@ -101,7 +100,7 @@ private static void DisposeTemporaryFile(string filePath)
         }
     }
 
-    private string[] TransformArgs(PackageIdentity packageId, string tempDgFilePath, string projectFilePath)
+    private string[] TransformArgs(PackageIdentityWithRange packageId, string tempDgFilePath, string projectFilePath)
     {
         List<string> args = [
             "package",
@@ -111,11 +110,11 @@ private string[] TransformArgs(PackageIdentity packageId, string tempDgFilePath,
             "--project",
             projectFilePath
         ];
-        
+
         if (packageId.HasVersion)
         {
             args.Add("--version");
-            args.Add(packageId.Version.ToString());
+            args.Add(packageId.VersionRange.OriginalString);
         }
 
         args.AddRange(_parseResult
diff --git a/src/Cli/dotnet/Commands/Package/Add/PackageAddCommandParser.cs b/src/Cli/dotnet/Commands/Package/Add/PackageAddCommandParser.cs
@@ -5,17 +5,16 @@
 
 using System.CommandLine;
 using System.CommandLine.Completions;
+using System.CommandLine.Parsing;
+using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.Extensions.EnvironmentAbstractions;
 using NuGet.Versioning;
-using Microsoft.DotNet.Cli.Extensions;
-using System.CommandLine.Parsing;
-using NuGet.Packaging.Core;
 
 namespace Microsoft.DotNet.Cli.Commands.Package.Add;
 
 internal static class PackageAddCommandParser
 {
-    public static readonly Argument<PackageIdentity> CmdPackageArgument = CommonArguments.RequiredPackageIdentityArgument()
+    public static readonly Argument<PackageIdentityWithRange> CmdPackageArgument = CommonArguments.RequiredPackageIdentityArgument()
     .AddCompletions((context) =>
     {
         // we should take --prerelease flags into account for version completion
@@ -31,7 +30,7 @@ internal static class PackageAddCommandParser
         .AddCompletions((context) =>
         {
             // we can only do version completion if we have a package id
-            if (context.ParseResult.GetValue(CmdPackageArgument) is PackageIdentity packageId && !packageId.HasVersion)
+            if (context.ParseResult.GetValue(CmdPackageArgument) is { HasVersion: false } packageId)
             {
                 // we should take --prerelease flags into account for version completion
                 var allowPrerelease = context.ParseResult.GetValue(PrereleaseOption);
@@ -106,7 +105,7 @@ private static Command ConstructCommand()
 
     private static void DisallowVersionIfPackageIdentityHasVersionValidator(OptionResult result)
     {
-        if (result.Parent.GetValue(CmdPackageArgument) is PackageIdentity identity && identity.HasVersion)
+        if (result.Parent.GetValue(CmdPackageArgument).HasVersion)
         {
             result.AddError(CliCommandStrings.ValidationFailedDuplicateVersion);
         }
diff --git a/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs b/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs
@@ -7,27 +7,22 @@
 using Microsoft.DotNet.Cli.Commands.Tool.Install;
 using Microsoft.DotNet.Cli.Commands.Tool.Restore;
 using Microsoft.DotNet.Cli.Commands.Tool.Run;
-using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Cli.NuGetPackageDownloader;
 using Microsoft.DotNet.Cli.ToolManifest;
 using Microsoft.DotNet.Cli.ToolPackage;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Cli.Utils.Extensions;
-
 using Microsoft.Extensions.EnvironmentAbstractions;
-using NuGet.Common;
 using NuGet.Configuration;
-using NuGet.Packaging.Core;
 using NuGet.Versioning;
 
-
 namespace Microsoft.DotNet.Cli.Commands.Tool.Execute;
 
 internal class ToolExecuteCommand(ParseResult result, ToolManifestFinder? toolManifestFinder = null, string? currentWorkingDirectory = null) : CommandBase(result)
 {
     const int ERROR_CANCELLED = 1223; //  Windows error code for "Operation canceled by user"
 
-    private readonly PackageIdentity _packageToolIdentityArgument = result.GetRequiredValue(ToolExecuteCommandParser.PackageIdentityArgument);
+    private readonly PackageIdentityWithRange _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);
diff --git a/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommandParser.cs b/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommandParser.cs
@@ -3,14 +3,13 @@
 
 using System.CommandLine;
 using Microsoft.DotNet.Cli.Commands.Tool.Install;
-using NuGet.Packaging.Core;
 
 namespace Microsoft.DotNet.Cli.Commands.Tool.Execute;
 
 internal static class ToolExecuteCommandParser
 
 {
-    public static readonly Argument<PackageIdentity> PackageIdentityArgument = ToolInstallCommandParser.PackageIdentityArgument;
+    public static readonly Argument<PackageIdentityWithRange> PackageIdentityArgument = ToolInstallCommandParser.PackageIdentityArgument;
 
     public static readonly Argument<IEnumerable<string>> CommandArgument = new("commandArguments")
     {
diff --git a/src/Cli/dotnet/Commands/Tool/Install/ParseResultExtension.cs b/src/Cli/dotnet/Commands/Tool/Install/ParseResultExtension.cs
@@ -13,7 +13,7 @@ internal static class ParseResultExtension
 {
     public static VersionRange GetVersionRange(this ParseResult parseResult)
     {
-        var packageVersionFromIdentityArgument = parseResult.GetValue(ToolInstallCommandParser.PackageIdentityArgument)?.Version?.ToString();
+        var packageVersionFromIdentityArgument = parseResult.GetValue(ToolInstallCommandParser.PackageIdentityArgument).VersionRange?.OriginalString;
         var packageVersionFromVersionOption = parseResult.GetValue(ToolInstallCommandParser.VersionOption);
 
         // Check that only one of these has a value
diff --git a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallCommandParser.cs b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallCommandParser.cs
@@ -2,17 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
-using System.CommandLine.Parsing;
 using Microsoft.DotNet.Cli.Commands.Tool.Common;
 using Microsoft.DotNet.Cli.Commands.Tool.Search;
 using Microsoft.DotNet.Cli.Extensions;
-using NuGet.Packaging.Core;
 
 namespace Microsoft.DotNet.Cli.Commands.Tool.Install;
 
 internal static class ToolInstallCommandParser
 {
-    public static readonly Argument<PackageIdentity> PackageIdentityArgument = CommonArguments.RequiredPackageIdentityArgument();
+    public static readonly Argument<PackageIdentityWithRange> PackageIdentityArgument = CommonArguments.RequiredPackageIdentityArgument();
 
     public static readonly Option<string> VersionOption = new("--version")
     {
diff --git a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs
@@ -71,7 +71,7 @@ public ToolInstallGlobalOrToolPathCommand(
         _verifySignatures = verifySignatures;
         _currentWorkingDirectory = currentWorkingDirectory;
 
-        var packageIdArgument = parseResult.GetValue(ToolInstallCommandParser.PackageIdentityArgument)?.Id;
+        var packageIdArgument = parseResult.GetValue(ToolInstallCommandParser.PackageIdentityArgument).Id;
 
         _packageId = packageId ?? (packageIdArgument is not null ? new PackageId(packageIdArgument) : null);
         _configFilePath = parseResult.GetValue(ToolInstallCommandParser.ConfigOption);
diff --git a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallLocalCommand.cs b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallLocalCommand.cs
@@ -46,7 +46,7 @@ public ToolInstallLocalCommand(
         : base(parseResult)
     {
         _updateAll = parseResult.GetValue(ToolUpdateCommandParser.UpdateAllOption);
-        var packageIdArgument = parseResult.GetValue(ToolInstallCommandParser.PackageIdentityArgument)?.Id;
+        var packageIdArgument = parseResult.GetValue(ToolInstallCommandParser.PackageIdentityArgument).Id;
         _packageId = packageId ?? (packageIdArgument is not null ? new PackageId(packageIdArgument) : null);
         _explicitManifestFile = parseResult.GetValue(ToolInstallCommandParser.ToolManifestOption);
 
diff --git a/src/Cli/dotnet/Commands/Tool/Update/ToolUpdateCommand.cs b/src/Cli/dotnet/Commands/Tool/Update/ToolUpdateCommand.cs
@@ -82,7 +82,7 @@ internal static void EnsureEitherUpdateAllOrUpdateOption(
 
     internal static void EnsureNoConflictPackageIdentityVersionOption(ParseResult parseResult)
     {
-        if (!string.IsNullOrEmpty(parseResult.GetValue(ToolUpdateCommandParser.PackageIdentityArgument)?.Version?.ToString()) &&
+        if (!string.IsNullOrEmpty(parseResult.GetValue(ToolUpdateCommandParser.PackageIdentityArgument)?.VersionRange?.OriginalString) &&
             !string.IsNullOrEmpty(parseResult.GetValue(ToolAppliedOption.VersionOption)))
         {
             throw new GracefulException(CliStrings.PackageIdentityArgumentVersionOptionConflict);
diff --git a/src/Cli/dotnet/Commands/Tool/Update/ToolUpdateCommandParser.cs b/src/Cli/dotnet/Commands/Tool/Update/ToolUpdateCommandParser.cs
@@ -4,13 +4,12 @@
 using System.CommandLine;
 using Microsoft.DotNet.Cli.Commands.Tool.Common;
 using Microsoft.DotNet.Cli.Commands.Tool.Install;
-using NuGet.Packaging.Core;
 
 namespace Microsoft.DotNet.Cli.Commands.Tool.Update;
 
 internal static class ToolUpdateCommandParser
 {
-    public static readonly Argument<PackageIdentity?> PackageIdentityArgument = CommonArguments.OptionalPackageIdentityArgument();
+    public static readonly Argument<PackageIdentityWithRange?> PackageIdentityArgument = CommonArguments.OptionalPackageIdentityArgument();
 
     public static readonly Option<bool> UpdateAllOption = ToolAppliedOption.UpdateAllOption;
 
diff --git a/src/Cli/dotnet/CommonArguments.cs b/src/Cli/dotnet/CommonArguments.cs
@@ -4,14 +4,13 @@
 using System.CommandLine;
 using System.CommandLine.Parsing;
 using Microsoft.DotNet.Cli.Utils;
-using NuGet.Packaging.Core;
 using NuGet.Versioning;
 
 namespace Microsoft.DotNet.Cli
 {
     internal class CommonArguments
     {
-        public static DynamicArgument<PackageIdentity?> OptionalPackageIdentityArgument() =>
+        public static DynamicArgument<PackageIdentityWithRange?> OptionalPackageIdentityArgument() =>
             new("packageId")
             {
                 HelpName = "PACKAGE_ID",
@@ -20,17 +19,17 @@ internal class CommonArguments
                 Arity = ArgumentArity.ZeroOrOne,
             };
 
-        public static DynamicArgument<PackageIdentity> RequiredPackageIdentityArgument() =>
+        public static DynamicArgument<PackageIdentityWithRange> RequiredPackageIdentityArgument() =>
             new("packageId")
             {
                 HelpName = "PACKAGE_ID",
                 Description = CliStrings.PackageIdentityArgumentDescription,
-                CustomParser = (ArgumentResult argumentResult) => ParsePackageIdentityWithVersionSeparator(argumentResult.Tokens[0]?.Value),
+                CustomParser = (ArgumentResult argumentResult) => ParsePackageIdentityWithVersionSeparator(argumentResult.Tokens[0]?.Value)!.Value,
                 Arity = ArgumentArity.ExactlyOne,
             };
 
 
-        private static PackageIdentity? ParsePackageIdentityWithVersionSeparator(string? packageIdentity, char versionSeparator = '@')
+        private static PackageIdentityWithRange? ParsePackageIdentityWithVersionSeparator(string? packageIdentity, char versionSeparator = '@')
         {
             if (string.IsNullOrEmpty(packageIdentity))
             {
@@ -47,15 +46,20 @@ public static DynamicArgument<PackageIdentity> RequiredPackageIdentityArgument()
 
             if (string.IsNullOrEmpty(versionString))
             {
-                return new PackageIdentity(packageId, null);
+                return new PackageIdentityWithRange(packageId, null);
             }
 
-            if (!NuGetVersion.TryParse(versionString, out var version))
+            if (!VersionRange.TryParse(versionString, out var versionRange))
             {
                 throw new GracefulException(string.Format(CliStrings.InvalidVersion, versionString));
             }
 
-            return new PackageIdentity(packageId, new NuGetVersion(version));
+            return new PackageIdentityWithRange(packageId, versionRange);
         }
     }
+
+    internal readonly record struct PackageIdentityWithRange(string Id, VersionRange? VersionRange)
+    {
+        public bool HasVersion => VersionRange != null;
+    }
 }
diff --git a/test/dotnet.Tests/CommandTests/Package/Add/GivenDotnetPackageAdd.cs b/test/dotnet.Tests/CommandTests/Package/Add/GivenDotnetPackageAdd.cs
@@ -229,6 +229,29 @@ public void WhenNoPackageisPassedCommandFails()
                 .Fail();
         }
 
+        [Theory, CombinatorialData]
+        public void VersionRange(bool asArgument)
+        {
+            var testAsset = "TestAppSimple";
+            var projectDirectory = _testAssetsManager
+                .CopyTestAsset(testAsset)
+                .WithSource()
+                .Path;
+
+            var packageName = "Humanizer";
+            var packageVersion = "2.*";
+            string[] args = asArgument
+                ? ["add", "package", $"{packageName}@{packageVersion}"]
+                : ["add", "package", packageName, "--version", packageVersion];
+            var cmd = new DotnetCommand(Log)
+                .WithWorkingDirectory(projectDirectory)
+                .Execute(args);
+            cmd.Should().Pass();
+            cmd.StdOut.Should().Contain($"PackageReference for package '{packageName}' version '{packageVersion}' " +
+                $"added to file '{projectDirectory + Path.DirectorySeparatorChar + testAsset}.csproj'.");
+            cmd.StdErr.Should().BeEmpty();
+        }
+
 
         private static TestProject GetProject(string targetFramework, string referenceProjectName, string version)
         {
diff --git a/test/dotnet.Tests/CommandTests/Tool/Install/InstallToolParserTests.cs b/test/dotnet.Tests/CommandTests/Tool/Install/InstallToolParserTests.cs
@@ -6,9 +6,6 @@
 using Microsoft.DotNet.Cli;
 using Microsoft.DotNet.Cli.Commands.Tool;
 using Microsoft.DotNet.Cli.Commands.Tool.Install;
-using Microsoft.DotNet.Cli.Commands.Tool.Update;
-using Microsoft.DotNet.Cli.Extensions;
-using NuGet.Packaging.Core;
 using Parser = Microsoft.DotNet.Cli.Parser;
 
 namespace Microsoft.DotNet.Tests.ParserTests
@@ -23,16 +20,18 @@ public InstallToolParserTests(ITestOutputHelper output)
         }
 
         [Theory]
-        [InlineData("console.test.app --version 1.0.0")]
-        [InlineData("console.test.app@1.0.0")]
-        public void InstallGlobalToolParserCanGetPackageIdentityWithVersion(string arguments)
+        [InlineData("console.test.app --version 1.0.0", "1.0.0")]
+        [InlineData("console.test.app --version 1.*", "1.*")]
+        [InlineData("console.test.app@1.0.0", "1.0.0")]
+        [InlineData("console.test.app@1.*", "1.*")]
+        public void InstallGlobalToolParserCanGetPackageIdentityWithVersion(string arguments, string expectedVersion)
         {
             var result = Parser.Instance.Parse($"dotnet tool install -g {arguments}");
-            var packageIdentity = result.GetValue<PackageIdentity>(ToolInstallCommandParser.PackageIdentityArgument);
-            var packageId = packageIdentity?.Id;
-            var packageVersion = packageIdentity?.Version?.ToString() ?? result.GetValue<string>(ToolInstallCommandParser.VersionOption);
+            var packageIdentity = result.GetValue(ToolInstallCommandParser.PackageIdentityArgument);
+            var packageId = packageIdentity.Id;
+            var packageVersion = packageIdentity.VersionRange?.OriginalString ?? result.GetValue(ToolInstallCommandParser.VersionOption);
             packageId.Should().Be("console.test.app");
-            packageVersion.Should().Be("1.0.0");
+            packageVersion.Should().Be(expectedVersion);
         }
 
         [Fact]
diff --git a/test/dotnet.Tests/CommandTests/Tool/Update/UpdateToolParserTests.cs b/test/dotnet.Tests/CommandTests/Tool/Update/UpdateToolParserTests.cs
@@ -7,7 +7,6 @@
 using Microsoft.DotNet.Cli.Commands.Tool;
 using Microsoft.DotNet.Cli.Commands.Tool.Install;
 using Microsoft.DotNet.Cli.Commands.Tool.Update;
-using NuGet.Packaging.Core;
 using Parser = Microsoft.DotNet.Cli.Parser;
 
 namespace Microsoft.DotNet.Tests.ParserTests
@@ -22,16 +21,18 @@ public UpdateInstallToolParserTests(ITestOutputHelper output)
         }
 
         [Theory]
-        [InlineData("console.test.app --version 1.0.0")]
-        [InlineData("console.test.app@1.0.0")]
-        public void UpdateGlobalToolParserCanGetPackageIdentityWithVersion(string arguments)
+        [InlineData("console.test.app --version 1.0.0", "1.0.0")]
+        [InlineData("console.test.app --version 1.*", "1.*")]
+        [InlineData("console.test.app@1.0.0", "1.0.0")]
+        [InlineData("console.test.app@1.*", "1.*")]
+        public void UpdateGlobalToolParserCanGetPackageIdentityWithVersion(string arguments, string expectedVersion)
         {
             var result = Parser.Instance.Parse($"dotnet tool update -g {arguments}");
-            var packageIdentity = result.GetValue<PackageIdentity>(ToolUpdateCommandParser.PackageIdentityArgument);
+            var packageIdentity = result.GetValue(ToolUpdateCommandParser.PackageIdentityArgument);
             var packageId = packageIdentity?.Id;
-            var packageVersion = packageIdentity?.Version?.ToString() ?? result.GetValue<string>(ToolInstallCommandParser.VersionOption);
+            var packageVersion = packageIdentity?.VersionRange?.OriginalString ?? result.GetValue(ToolInstallCommandParser.VersionOption);
             packageId.Should().Be("console.test.app");
-            packageVersion.Should().Be("1.0.0");
+            packageVersion.Should().Be(expectedVersion);
         }
 
 
@@ -40,7 +41,7 @@ public void UpdateGlobaltoolParserCanGetPackageId()
         {
             var result = Parser.Instance.Parse("dotnet tool update -g console.test.app");
 
-            var packageId = result.GetValue<PackageIdentity>(ToolUpdateCommandParser.PackageIdentityArgument)?.Id;
+            var packageId = result.GetValue(ToolUpdateCommandParser.PackageIdentityArgument)?.Id;
 
             packageId.Should().Be("console.test.app");
         }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`using Microsoft.DotNet.Cli.Commands.NuGet;`
`9`	`9`	`using Microsoft.DotNet.Cli.Extensions;`
`10`	`10`	`using Microsoft.DotNet.Cli.Utils;`
`11`		`-using NuGet.Packaging.Core;`
`12`	`11`
`13`	`12`	`namespace Microsoft.DotNet.Cli.Commands.Package.Add;`
`14`	`13`
`@@ -19,7 +18,7 @@ namespace Microsoft.DotNet.Cli.Commands.Package.Add;`
`19`	`18`	`/// </param>`
`20`	`19`	`internal class PackageAddCommand(ParseResult parseResult, string fileOrDirectory) : CommandBase(parseResult)`
`21`	`20`	`{`
`22`		`- private readonly PackageIdentity _packageId = parseResult.GetValue(PackageAddCommandParser.CmdPackageArgument);`
	`21`	`+ private readonly PackageIdentityWithRange _packageId = parseResult.GetValue(PackageAddCommandParser.CmdPackageArgument);`
`23`	`22`
`24`	`23`	`public override int Execute()`
`25`	`24`	`{`
`@@ -101,7 +100,7 @@ private static void DisposeTemporaryFile(string filePath)`
`101`	`100`	`}`
`102`	`101`	`}`
`103`	`102`
`104`		`- private string[] TransformArgs(PackageIdentity packageId, string tempDgFilePath, string projectFilePath)`
	`103`	`+ private string[] TransformArgs(PackageIdentityWithRange packageId, string tempDgFilePath, string projectFilePath)`
`105`	`104`	`{`
`106`	`105`	`List<string> args = [`
`107`	`106`	`"package",`
`@@ -111,11 +110,11 @@ private string[] TransformArgs(PackageIdentity packageId, string tempDgFilePath,`
`111`	`110`	`"--project",`
`112`	`111`	`projectFilePath`
`113`	`112`	`];`
`114`		`-`
	`113`	`+`
`115`	`114`	`if (packageId.HasVersion)`
`116`	`115`	`{`
`117`	`116`	`args.Add("--version");`
`118`		`- args.Add(packageId.Version.ToString());`
	`117`	`+ args.Add(packageId.VersionRange.OriginalString);`
`119`	`118`	`}`
`120`	`119`
`121`	`120`	`args.AddRange(_parseResult`
Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,16 @@`
`5`	`5`
`6`	`6`	`using System.CommandLine;`
`7`	`7`	`using System.CommandLine.Completions;`
	`8`	`+using System.CommandLine.Parsing;`
	`9`	`+using Microsoft.DotNet.Cli.Extensions;`
`8`	`10`	`using Microsoft.Extensions.EnvironmentAbstractions;`
`9`	`11`	`using NuGet.Versioning;`
`10`		`-using Microsoft.DotNet.Cli.Extensions;`
`11`		`-using System.CommandLine.Parsing;`
`12`		`-using NuGet.Packaging.Core;`
`13`	`12`
`14`	`13`	`namespace Microsoft.DotNet.Cli.Commands.Package.Add;`
`15`	`14`
`16`	`15`	`internal static class PackageAddCommandParser`
`17`	`16`	`{`
`18`		`- public static readonly Argument<PackageIdentity> CmdPackageArgument = CommonArguments.RequiredPackageIdentityArgument()`
	`17`	`+ public static readonly Argument<PackageIdentityWithRange> CmdPackageArgument = CommonArguments.RequiredPackageIdentityArgument()`
`19`	`18`	`.AddCompletions((context) =>`
`20`	`19`	`{`
`21`	`20`	`// we should take --prerelease flags into account for version completion`
`@@ -31,7 +30,7 @@ internal static class PackageAddCommandParser`
`31`	`30`	`.AddCompletions((context) =>`
`32`	`31`	`{`
`33`	`32`	`// we can only do version completion if we have a package id`
`34`		`- if (context.ParseResult.GetValue(CmdPackageArgument) is PackageIdentity packageId && !packageId.HasVersion)`
	`33`	`+ if (context.ParseResult.GetValue(CmdPackageArgument) is { HasVersion: false } packageId)`
`35`	`34`	`{`
`36`	`35`	`// we should take --prerelease flags into account for version completion`
`37`	`36`	`var allowPrerelease = context.ParseResult.GetValue(PrereleaseOption);`
`@@ -106,7 +105,7 @@ private static Command ConstructCommand()`
`106`	`105`
`107`	`106`	`private static void DisallowVersionIfPackageIdentityHasVersionValidator(OptionResult result)`
`108`	`107`	`{`
`109`		`- if (result.Parent.GetValue(CmdPackageArgument) is PackageIdentity identity && identity.HasVersion)`
	`108`	`+ if (result.Parent.GetValue(CmdPackageArgument).HasVersion)`
`110`	`109`	`{`
`111`	`110`	`result.AddError(CliCommandStrings.ValidationFailedDuplicateVersion);`
`112`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,13 @@`
`3`	`3`
`4`	`4`	`using System.CommandLine;`
`5`	`5`	`using Microsoft.DotNet.Cli.Commands.Tool.Install;`
`6`		`-using NuGet.Packaging.Core;`
`7`	`6`
`8`	`7`	`namespace Microsoft.DotNet.Cli.Commands.Tool.Execute;`
`9`	`8`
`10`	`9`	`internal static class ToolExecuteCommandParser`
`11`	`10`
`12`	`11`	`{`
`13`		`- public static readonly Argument<PackageIdentity> PackageIdentityArgument = ToolInstallCommandParser.PackageIdentityArgument;`
	`12`	`+ public static readonly Argument<PackageIdentityWithRange> PackageIdentityArgument = ToolInstallCommandParser.PackageIdentityArgument;`
`14`	`13`
`15`	`14`	`public static readonly Argument<IEnumerable<string>> CommandArgument = new("commandArguments")`
`16`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ internal static class ParseResultExtension`
`13`	`13`	`{`
`14`	`14`	`public static VersionRange GetVersionRange(this ParseResult parseResult)`
`15`	`15`	`{`
`16`		`- var packageVersionFromIdentityArgument = parseResult.GetValue(ToolInstallCommandParser.PackageIdentityArgument)?.Version?.ToString();`
	`16`	`+ var packageVersionFromIdentityArgument = parseResult.GetValue(ToolInstallCommandParser.PackageIdentityArgument).VersionRange?.OriginalString;`
`17`	`17`	`var packageVersionFromVersionOption = parseResult.GetValue(ToolInstallCommandParser.VersionOption);`
`18`	`18`
`19`	`19`	`// Check that only one of these has a value`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public ToolInstallLocalCommand(`
`46`	`46`	`: base(parseResult)`
`47`	`47`	`{`
`48`	`48`	`_updateAll = parseResult.GetValue(ToolUpdateCommandParser.UpdateAllOption);`
`49`		`- var packageIdArgument = parseResult.GetValue(ToolInstallCommandParser.PackageIdentityArgument)?.Id;`
	`49`	`+ var packageIdArgument = parseResult.GetValue(ToolInstallCommandParser.PackageIdentityArgument).Id;`
`50`	`50`	`_packageId = packageId ?? (packageIdArgument is not null ? new PackageId(packageIdArgument) : null);`
`51`	`51`	`_explicitManifestFile = parseResult.GetValue(ToolInstallCommandParser.ToolManifestOption);`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ internal static void EnsureEitherUpdateAllOrUpdateOption(`
`82`	`82`
`83`	`83`	`internal static void EnsureNoConflictPackageIdentityVersionOption(ParseResult parseResult)`
`84`	`84`	`{`
`85`		`- if (!string.IsNullOrEmpty(parseResult.GetValue(ToolUpdateCommandParser.PackageIdentityArgument)?.Version?.ToString()) &&`
	`85`	`+ if (!string.IsNullOrEmpty(parseResult.GetValue(ToolUpdateCommandParser.PackageIdentityArgument)?.VersionRange?.OriginalString) &&`
`86`	`86`	`!string.IsNullOrEmpty(parseResult.GetValue(ToolAppliedOption.VersionOption)))`
`87`	`87`	`{`
`88`	`88`	`throw new GracefulException(CliStrings.PackageIdentityArgumentVersionOptionConflict);`