Add version option

Author: edvilme

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

@@ -23,6 +23,7 @@ internal class ToolExecuteCommand(ParseResult result) : CommandBase(result)
         private readonly bool _interactive = result.GetValue(ToolExecuteCommandParser.InteractiveOption);
         private readonly VerbosityOptions _verbosity = result.GetValue(ToolExecuteCommandParser.VerbosityOption);
         private readonly bool _yes = result.GetValue(ToolExecuteCommandParser.YesOption);
+        private readonly bool _prerelease = result.GetValue(ToolExecuteCommandParser.PrereleaseOption);
 
         public override int Execute()
         {

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

@@ -20,6 +20,7 @@ internal static class ToolExecuteCommandParser
             Description = "arguments forwarded to the tool"
         };
 
+        public static readonly Option<string> VersionOption = ToolInstallCommandParser.VersionOption;
         public static readonly Option<bool> RollForwardOption = ToolInstallCommandParser.RollForwardOption;
         public static readonly Option<bool> PrereleaseOption = ToolInstallCommandParser.PrereleaseOption;
         public static readonly Option<string> ConfigOption = ToolInstallCommandParser.ConfigOption;
@@ -46,6 +47,7 @@ private static Command ConstructCommand()
             command.Arguments.Add(PackageIdentityArgument);
             command.Arguments.Add(CommandArgument);
 
+            command.Options.Add(VersionOption);
             command.Options.Add(RollForwardOption);
             command.Options.Add(PrereleaseOption);
             command.Options.Add(ConfigOption);

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

@@ -13,10 +13,16 @@ internal static class ParseResultExtension
 {
     public static VersionRange GetVersionRange(this ParseResult parseResult)
     {
-        string packageVersion =
-            parseResult.GetValue(CommonArguments.PackageIdentityArgument(false))?.Version?.ToString() ??
-            parseResult.GetValue(CommonArguments.PackageIdentityArgument(true))?.Version?.ToString() ??
-            parseResult.GetValue(ToolInstallCommandParser.VersionOption);
+        var packageVersionFromIdentityArgument = parseResult.GetValue(ToolInstallCommandParser.PackageIdentityArgument)?.Version?.ToString();
+        var packageVersionFromVersionOption = parseResult.GetValue(ToolInstallCommandParser.VersionOption);
+
+        // Check that only one of these has a value
+        if (!string.IsNullOrEmpty(packageVersionFromIdentityArgument) && !string.IsNullOrEmpty(packageVersionFromVersionOption))
+        {
+            throw new GracefulException(CliStrings.PackageIdentityArgumentVersionOptionConflict);
+        }
+
+        string packageVersion = packageVersionFromIdentityArgument ?? packageVersionFromVersionOption;
 
         bool prerelease = parseResult.GetValue(ToolInstallCommandParser.PrereleaseOption);
 

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

@@ -21,15 +21,6 @@ internal class ToolInstallCommand(
     private readonly string _framework = parseResult.GetValue(ToolInstallCommandParser.FrameworkOption);
 
 
-    internal static void EnsureNoConflictPackageIdentityVersionOption(ParseResult parseResult)
-    {
-        if (!string.IsNullOrEmpty(parseResult.GetValue(ToolInstallCommandParser.PackageIdentityArgument)?.Version?.ToString()) &&
-            !string.IsNullOrEmpty(parseResult.GetValue(ToolInstallCommandParser.VersionOption)))
-        {
-            throw new GracefulException(CliStrings.PackageIdentityArgumentVersionOptionConflict);
-        }
-    }
-
     public override int Execute()
     {
         ToolAppliedOption.EnsureNoConflictGlobalLocalToolPathOption(
@@ -39,8 +30,6 @@ public override int Execute()
         ToolAppliedOption.EnsureToolManifestAndOnlyLocalFlagCombination(
             _parseResult);
 
-        EnsureNoConflictPackageIdentityVersionOption(_parseResult);
-
         if (_global || !string.IsNullOrWhiteSpace(_toolPath))
         {
             return (_toolInstallGlobalOrToolPathCommand ?? new ToolInstallGlobalOrToolPathCommand(_parseResult)).Execute();

test/dotnet.Tests/CompletionTests/snapshots/bash/DotnetCliSnapshotTests.VerifyCompletions.verified.sh

@@ -1792,7 +1792,7 @@ _testhost_tool_execute() {
     prev="${COMP_WORDS[COMP_CWORD-1]}" 
     COMPREPLY=()
 
-    opts="--allow-roll-forward --prerelease --configfile --source --add-source --ignore-failed-sources --interactive --yes --verbosity --help" 
+    opts="--version --allow-roll-forward --prerelease --configfile --source --add-source --ignore-failed-sources --interactive --yes --verbosity --help" 
     opts="$opts $(${COMP_WORDS[0]} complete --position ${COMP_POINT} ${COMP_LINE} 2>/dev/null | tr '\n' ' ')" 
 
     if [[ $COMP_CWORD == "$1" ]]; then

test/dotnet.Tests/CompletionTests/snapshots/pwsh/DotnetCliSnapshotTests.VerifyCompletions.verified.ps1

@@ -1096,6 +1096,7 @@ Register-ArgumentCompleter -Native -CommandName 'testhost' -ScriptBlock {
         }
         'testhost;tool;execute' {
             $staticCompletions = @(
+                [CompletionResult]::new('--version', '--version', [CompletionResultType]::ParameterName, "The version of the tool package to install.")
                 [CompletionResult]::new('--allow-roll-forward', '--allow-roll-forward', [CompletionResultType]::ParameterName, "Allow a .NET tool to roll forward to newer versions of the .NET runtime if the runtime it targets isn`'t installed.")
                 [CompletionResult]::new('--prerelease', '--prerelease', [CompletionResultType]::ParameterName, "Include pre-release packages.")
                 [CompletionResult]::new('--configfile', '--configfile', [CompletionResultType]::ParameterName, "The NuGet configuration file to use.")

test/dotnet.Tests/CompletionTests/snapshots/zsh/DotnetCliSnapshotTests.VerifyCompletions.verified.zsh

@@ -1161,6 +1161,7 @@ _testhost() {
                                         ;;
                                     (execute)
                                         _arguments "${_arguments_options[@]}" : \
+                                            '--version=[The version of the tool package to install.]:VERSION: ' \
                                             '--allow-roll-forward[Allow a .NET tool to roll forward to newer versions of the .NET runtime if the runtime it targets isn'\''t installed.]' \
                                             '--prerelease[Include pre-release packages.]' \
                                             '--configfile=[The NuGet configuration file to use.]:FILE: ' \