diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3391513cd61fd..42387c5f5d0ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,14 +13,14 @@ be366997dfae0aa6e3c9a78bad10bfb3f79cbde1 - + https://github.com/dotnet/command-line-api - feb61c7f328a2401d74f4317b39d02126cfdfe24 + 060374e56c1b2e741b6525ca8417006efb54fbd7 - + https://github.com/dotnet/command-line-api - feb61c7f328a2401d74f4317b39d02126cfdfe24 + 060374e56c1b2e741b6525ca8417006efb54fbd7 diff --git a/eng/Versions.props b/eng/Versions.props index 24ca795bf3570..cb461598c301e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,7 +46,7 @@ Versions managed by Arcade (see Versions.Details.xml) --> - 2.0.0-beta4.24528.1 + 2.0.0-beta4.25072.1 8.0.0 8.0.0 8.0.0 diff --git a/src/Features/Lsif/Generator/Program.cs b/src/Features/Lsif/Generator/Program.cs index 940a0c69698c6..f3ee22fb79c11 100644 --- a/src/Features/Lsif/Generator/Program.cs +++ b/src/Features/Lsif/Generator/Program.cs @@ -26,17 +26,17 @@ internal static class Program { public static Task Main(string[] args) { - var solution = new CliOption("--solution") { Description = "input solution file" }.AcceptExistingOnly(); - var project = new CliOption("--project") { Description = "input project file" }.AcceptExistingOnly(); - var compilerInvocation = new CliOption("--compiler-invocation") { Description = "path to a .json file that contains the information for a csc/vbc invocation" }.AcceptExistingOnly(); - var binLog = new CliOption("--binlog") { Description = "path to a MSBuild binlog that csc/vbc invocations will be extracted from" }.AcceptExistingOnly(); - var output = new CliOption("--output") { Description = "file to write the LSIF output to, instead of the console", DefaultValueFactory = _ => null }; + var solution = new Option("--solution") { Description = "input solution file" }.AcceptExistingOnly(); + var project = new Option("--project") { Description = "input project file" }.AcceptExistingOnly(); + var compilerInvocation = new Option("--compiler-invocation") { Description = "path to a .json file that contains the information for a csc/vbc invocation" }.AcceptExistingOnly(); + var binLog = new Option("--binlog") { Description = "path to a MSBuild binlog that csc/vbc invocations will be extracted from" }.AcceptExistingOnly(); + var output = new Option("--output") { Description = "file to write the LSIF output to, instead of the console", DefaultValueFactory = _ => null }; output.AcceptLegalFilePathsOnly(); - var outputFormat = new CliOption("--output-format") { Description = "format of LSIF output", DefaultValueFactory = _ => LsifFormat.Line }; - var log = new CliOption("--log") { Description = "file to write a log to", DefaultValueFactory = _ => null }; + var outputFormat = new Option("--output-format") { Description = "format of LSIF output", DefaultValueFactory = _ => LsifFormat.Line }; + var log = new Option("--log") { Description = "file to write a log to", DefaultValueFactory = _ => null }; log.AcceptLegalFilePathsOnly(); - var generateCommand = new CliRootCommand("generates an LSIF file") + var generateCommand = new RootCommand("generates an LSIF file") { solution, project, diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs index 5c80f55e9dde6..f5602d249fbd2 100644 --- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs +++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs @@ -17,7 +17,6 @@ using Microsoft.CodeAnalysis.LanguageServer.Logging; using Microsoft.CodeAnalysis.LanguageServer.Services; using Microsoft.CodeAnalysis.LanguageServer.StarredSuggestions; -using Microsoft.CodeAnalysis.Options; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Console; using Roslyn.Utilities; @@ -103,7 +102,7 @@ static async Task RunAsync(ServerConfiguration serverConfiguration, Cancellation // LSP server doesn't have the pieces yet to support 'balanced' mode for source-generators. Hardcode us to // 'automatic' for now. - var globalOptionService = exportProvider.GetExportedValue(); + var globalOptionService = exportProvider.GetExportedValue(); globalOptionService.SetGlobalOption(WorkspaceConfigurationOptionsStorage.SourceGeneratorExecution, SourceGeneratorExecutionPreference.Automatic); // The log file directory passed to us by VSCode might not exist yet, though its parent directory is guaranteed to exist. @@ -181,79 +180,79 @@ static async Task RunAsync(ServerConfiguration serverConfiguration, Cancellation } } -static CliRootCommand CreateCommandLineParser() +static RootCommand CreateCommandLineParser() { - var debugOption = new CliOption("--debug") + var debugOption = new Option("--debug") { Description = "Flag indicating if the debugger should be launched on startup.", Required = false, DefaultValueFactory = _ => false, }; - var brokeredServicePipeNameOption = new CliOption("--brokeredServicePipeName") + var brokeredServicePipeNameOption = new Option("--brokeredServicePipeName") { Description = "The name of the pipe used to connect to a remote process (if one exists).", Required = false, }; - var logLevelOption = new CliOption("--logLevel") + var logLevelOption = new Option("--logLevel") { Description = "The minimum log verbosity.", Required = true, }; - var starredCompletionsPathOption = new CliOption("--starredCompletionComponentPath") + var starredCompletionsPathOption = new Option("--starredCompletionComponentPath") { Description = "The location of the starred completion component (if one exists).", Required = false, }; - var telemetryLevelOption = new CliOption("--telemetryLevel") + var telemetryLevelOption = new Option("--telemetryLevel") { Description = "Telemetry level, Defaults to 'off'. Example values: 'all', 'crash', 'error', or 'off'.", Required = false, }; - var extensionLogDirectoryOption = new CliOption("--extensionLogDirectory") + var extensionLogDirectoryOption = new Option("--extensionLogDirectory") { Description = "The directory where we should write log files to", Required = true, }; - var sessionIdOption = new CliOption("--sessionId") + var sessionIdOption = new Option("--sessionId") { Description = "Session Id to use for telemetry", Required = false }; - var extensionAssemblyPathsOption = new CliOption("--extension") + var extensionAssemblyPathsOption = new Option("--extension") { Description = "Full paths of extension assemblies to load (optional).", Required = false }; - var devKitDependencyPathOption = new CliOption("--devKitDependencyPath") + var devKitDependencyPathOption = new Option("--devKitDependencyPath") { Description = "Full path to the Roslyn dependency used with DevKit (optional).", Required = false }; - var razorSourceGeneratorOption = new CliOption("--razorSourceGenerator") + var razorSourceGeneratorOption = new Option("--razorSourceGenerator") { Description = "Full path to the Razor source generator (optional).", Required = false }; - var razorDesignTimePathOption = new CliOption("--razorDesignTimePath") + var razorDesignTimePathOption = new Option("--razorDesignTimePath") { Description = "Full path to the Razor design time target path (optional).", Required = false }; - var serverPipeNameOption = new CliOption("--pipe") + var serverPipeNameOption = new Option("--pipe") { Description = "The name of the pipe the server will connect to.", Required = false }; - var useStdIoOption = new CliOption("--stdio") + var useStdIoOption = new Option("--stdio") { Description = "Use stdio for communication with the client.", Required = false, @@ -261,7 +260,7 @@ static CliRootCommand CreateCommandLineParser() }; - var rootCommand = new CliRootCommand() + var rootCommand = new RootCommand() { debugOption, brokeredServicePipeNameOption, diff --git a/src/Tools/BuildValidator/Program.cs b/src/Tools/BuildValidator/Program.cs index 7f19bb818826a..3a3c437a1ae7d 100644 --- a/src/Tools/BuildValidator/Program.cs +++ b/src/Tools/BuildValidator/Program.cs @@ -31,45 +31,45 @@ static int Main(string[] args) { System.Diagnostics.Trace.Listeners.Clear(); - var assembliesPath = new CliOption("--assembliesPath") + var assembliesPath = new Option("--assembliesPath") { Description = BuildValidatorResources.Path_to_assemblies_to_rebuild_can_be_specified_one_or_more_times, Required = true, Arity = ArgumentArity.OneOrMore, }; - var exclude = new CliOption("--exclude") + var exclude = new Option("--exclude") { Description = BuildValidatorResources.Assemblies_to_be_excluded_substring_match, Arity = ArgumentArity.ZeroOrMore, }; - var source = new CliOption("--sourcePath") + var source = new Option("--sourcePath") { Description = BuildValidatorResources.Path_to_sources_to_use_in_rebuild, Required = true, }; - var referencesPath = new CliOption("--referencesPath") + var referencesPath = new Option("--referencesPath") { Description = BuildValidatorResources.Path_to_referenced_assemblies_can_be_specified_zero_or_more_times, Arity = ArgumentArity.ZeroOrMore, }; - var verbose = new CliOption("--verbose") + var verbose = new Option("--verbose") { Description = BuildValidatorResources.Output_verbose_log_information }; - var quiet = new CliOption("--quiet") + var quiet = new Option("--quiet") { Description = BuildValidatorResources.Do_not_output_log_information_to_console }; - var debug = new CliOption("--debug") + var debug = new Option("--debug") { Description = BuildValidatorResources.Output_debug_info_when_rebuild_is_not_equal_to_the_original }; - var debugPath = new CliOption("--debugPath") + var debugPath = new Option("--debugPath") { Description = BuildValidatorResources.Path_to_output_debug_info }; - var rootCommand = new CliRootCommand + var rootCommand = new RootCommand { assembliesPath, exclude, diff --git a/src/Workspaces/MSBuild/BuildHost/Program.cs b/src/Workspaces/MSBuild/BuildHost/Program.cs index 48605a392742a..b3a286b67419d 100644 --- a/src/Workspaces/MSBuild/BuildHost/Program.cs +++ b/src/Workspaces/MSBuild/BuildHost/Program.cs @@ -16,11 +16,11 @@ internal static class Program { internal static async Task Main(string[] args) { - var pipeOption = new CliOption("--pipe") { Required = true }; - var propertyOption = new CliOption("--property") { Arity = ArgumentArity.ZeroOrMore }; - var binaryLogOption = new CliOption("--binlog") { Required = false }; - var localeOption = new CliOption("--locale") { Required = true }; - var command = new CliRootCommand { pipeOption, binaryLogOption, propertyOption, localeOption }; + var pipeOption = new Option("--pipe") { Required = true }; + var propertyOption = new Option("--property") { Arity = ArgumentArity.ZeroOrMore }; + var binaryLogOption = new Option("--binlog") { Required = false }; + var localeOption = new Option("--locale") { Required = true }; + var command = new RootCommand { pipeOption, binaryLogOption, propertyOption, localeOption }; var parsedArguments = command.Parse(args); var pipeName = parsedArguments.GetValue(pipeOption)!; var properties = parsedArguments.GetValue(propertyOption)!;