Skip to content

push version and info command activation into the Option definitions #49664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 11, 2025
+38 −21
Merged

push version and info command activation into the Option definitions #49664

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1497ff
push version and info command activation into the Option definitions
baronfel Jul 5, 2025
0d2b512
sort usings
baronfel Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 38 additions & 21 deletions src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#nullable disable

using System.CommandLine;
using System.CommandLine.Invocation;
using Microsoft.DotNet.Cli.Commands.Workload.Clean;
using Microsoft.DotNet.Cli.Commands.Workload.Config;
using Microsoft.DotNet.Cli.Commands.Workload.Elevate;
Expand All @@ -27,17 +28,18 @@ namespace Microsoft.DotNet.Cli.Commands.Workload;
internal static class WorkloadCommandParser
{
public static readonly string DocsLink = "https://aka.ms/dotnet-workload";

public static readonly Option<bool> InfoOption = new("--info")
{
Description = CliCommandStrings.WorkloadInfoDescription,
Arity = ArgumentArity.Zero
Arity = ArgumentArity.Zero,
Action = new ShowWorkloadsInfoAction()
};

public static readonly Option<bool> VersionOption = new("--version")
{
Description = CliCommandStrings.WorkloadVersionDescription,
Arity = ArgumentArity.Zero
Arity = ArgumentArity.Zero,
Action = new ShowWorkloadsVersionOption()
};

public static Command GetCommand()
Expand Down Expand Up @@ -78,11 +80,11 @@ void WriteUpdateModeAndAnyError(string indent = "")
reporter.WriteLine(indent + CliCommandStrings.ShouldInstallAWorkloadSet);
}
}

if (showVersion)
{
reporter.WriteLine($" Workload version: {GetWorkloadsVersion()}");

WriteUpdateModeAndAnyError(indent: " ");
reporter.WriteLine();
}
Expand Down Expand Up @@ -134,22 +136,7 @@ void WriteUpdateModeAndAnyError(string indent = "")
}
}

private static int ProcessArgs(ParseResult parseResult)
{
if (parseResult.HasOption(InfoOption) && parseResult.RootSubCommandResult() == "workload")
{
ShowWorkloadsInfo(parseResult);
Reporter.Output.WriteLine(string.Empty);
return 0;
}
else if (parseResult.HasOption(VersionOption) && parseResult.RootSubCommandResult() == "workload")
{
Reporter.Output.WriteLine(GetWorkloadsVersion());
Reporter.Output.WriteLine(string.Empty);
return 0;
}
return parseResult.HandleMissingCommand();
}
private static int ProcessArgs(ParseResult parseResult) => parseResult.HandleMissingCommand();

private static Command ConstructCommand()
{
Expand Down Expand Up @@ -182,4 +169,34 @@ private static Command ConstructCommand()

return command;
}

private class ShowWorkloadsInfoAction : SynchronousCommandLineAction
{
public ShowWorkloadsInfoAction()
{
Terminating = true;
}

public override int Invoke(ParseResult parseResult)
{
ShowWorkloadsInfo(parseResult);
Reporter.Output.WriteLine(string.Empty);
return 0;
}
}

private class ShowWorkloadsVersionOption : SynchronousCommandLineAction
{
public ShowWorkloadsVersionOption()
{
Terminating = true;
}

public override int Invoke(ParseResult parseResult)
{
Reporter.Output.WriteLine(GetWorkloadsVersion());
Reporter.Output.WriteLine(string.Empty);
return 0;
}
}
}
Loading