From 9006830fc81c4291627f8b5d5c272d8ccdb8eddf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Mar 2025 05:02:18 +0000 Subject: [PATCH 01/10] Update dependencies from https://github.com/dotnet/command-line-api build 20250303.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.552801 -> To Version 0.1.615301 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fe07fb69f12a..e2fd9d248eb51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,14 +13,14 @@ d794781cc75921b4ebbefe2eabdb0d6cd1713005 - + https://github.com/dotnet/command-line-api - feb61c7f328a2401d74f4317b39d02126cfdfe24 + b7f0d1c4f0da129f7a115e32b21f0b773e60805b - + https://github.com/dotnet/command-line-api - feb61c7f328a2401d74f4317b39d02126cfdfe24 + b7f0d1c4f0da129f7a115e32b21f0b773e60805b diff --git a/eng/Versions.props b/eng/Versions.props index 1b9a360b33402..78df213bb3b47 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.25153.1 8.0.0 8.0.0 8.0.0 From 4c9e53308a8a9480730ddc36acbc8d359655e0ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Mar 2025 05:02:06 +0000 Subject: [PATCH 02/10] Update dependencies from https://github.com/dotnet/command-line-api build 20250317.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.552801 -> To Version 0.1.616701 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2fd9d248eb51..28fa8ef176a72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,14 +13,14 @@ d794781cc75921b4ebbefe2eabdb0d6cd1713005 - + https://github.com/dotnet/command-line-api - b7f0d1c4f0da129f7a115e32b21f0b773e60805b + f918d2a3086eaa9284aea0b0d13dc592b95c021e - + https://github.com/dotnet/command-line-api - b7f0d1c4f0da129f7a115e32b21f0b773e60805b + f918d2a3086eaa9284aea0b0d13dc592b95c021e diff --git a/eng/Versions.props b/eng/Versions.props index 78df213bb3b47..b7ec5b6f08927 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.25153.1 + 2.0.0-beta4.25167.1 8.0.0 8.0.0 8.0.0 From afc8f9b86f6b22d56f4a6f5562c433aeaa4c32d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Mar 2025 05:01:48 +0000 Subject: [PATCH 03/10] Update dependencies from https://github.com/dotnet/command-line-api build 20250318.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.552801 -> To Version 0.1.616801 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28fa8ef176a72..70975018ae5d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,14 +13,14 @@ d794781cc75921b4ebbefe2eabdb0d6cd1713005 - + https://github.com/dotnet/command-line-api - f918d2a3086eaa9284aea0b0d13dc592b95c021e + 8b1f7f7e97a69f9b4b3b29ce7cc555208d3f8cf5 - + https://github.com/dotnet/command-line-api - f918d2a3086eaa9284aea0b0d13dc592b95c021e + 8b1f7f7e97a69f9b4b3b29ce7cc555208d3f8cf5 diff --git a/eng/Versions.props b/eng/Versions.props index b7ec5b6f08927..452545bddee4e 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.25167.1 + 2.0.0-beta4.25168.1 8.0.0 8.0.0 8.0.0 From 91c77150044796caf0d20ce85cc05daa680ee9e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Mar 2025 05:01:36 +0000 Subject: [PATCH 04/10] Update dependencies from https://github.com/dotnet/command-line-api build 20250320.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.552801 -> To Version 0.1.617001 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70975018ae5d4..9ddf6c6455301 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,14 +13,14 @@ d794781cc75921b4ebbefe2eabdb0d6cd1713005 - + https://github.com/dotnet/command-line-api - 8b1f7f7e97a69f9b4b3b29ce7cc555208d3f8cf5 + 931bc0d178882c11daf9e38ae88858691e2df2b9 - + https://github.com/dotnet/command-line-api - 8b1f7f7e97a69f9b4b3b29ce7cc555208d3f8cf5 + 931bc0d178882c11daf9e38ae88858691e2df2b9 diff --git a/eng/Versions.props b/eng/Versions.props index 452545bddee4e..e5b4e0d17bac9 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.25168.1 + 2.0.0-beta5.25170.1 8.0.0 8.0.0 8.0.0 From 8d3c3e37342b6c9c595c1da5219424f056024e57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Mar 2025 05:02:35 +0000 Subject: [PATCH 05/10] Update dependencies from https://github.com/dotnet/command-line-api build 20250324.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.552801 -> To Version 0.1.617401 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ddf6c6455301..1e126b7593a53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,14 +13,14 @@ d794781cc75921b4ebbefe2eabdb0d6cd1713005 - + https://github.com/dotnet/command-line-api - 931bc0d178882c11daf9e38ae88858691e2df2b9 + 599faf215f4c0efe952d0251ab8fba4761f14a19 - + https://github.com/dotnet/command-line-api - 931bc0d178882c11daf9e38ae88858691e2df2b9 + 599faf215f4c0efe952d0251ab8fba4761f14a19 diff --git a/eng/Versions.props b/eng/Versions.props index e5b4e0d17bac9..53ed47f9584ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,7 +46,7 @@ Versions managed by Arcade (see Versions.Details.xml) --> - 2.0.0-beta5.25170.1 + 2.0.0-beta5.25174.1 8.0.0 8.0.0 8.0.0 From cfa7bf009b6f92e2af3b437863d9ca3294749d17 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Apr 2025 05:02:03 +0000 Subject: [PATCH 06/10] Update dependencies from https://github.com/dotnet/command-line-api build 20250408.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.552801 -> To Version 0.1.620801 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e126b7593a53..4abaf9f764596 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,14 +13,14 @@ d794781cc75921b4ebbefe2eabdb0d6cd1713005 - + https://github.com/dotnet/command-line-api - 599faf215f4c0efe952d0251ab8fba4761f14a19 + 48bd86bdcd926a194e1581a60d820d12a64ef3c6 - + https://github.com/dotnet/command-line-api - 599faf215f4c0efe952d0251ab8fba4761f14a19 + 48bd86bdcd926a194e1581a60d820d12a64ef3c6 diff --git a/eng/Versions.props b/eng/Versions.props index 53ed47f9584ed..dce39029d84cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,7 +46,7 @@ Versions managed by Arcade (see Versions.Details.xml) --> - 2.0.0-beta5.25174.1 + 2.0.0-beta5.25208.1 8.0.0 8.0.0 8.0.0 From c4c1b842158f4314c7bce81b3ab0e7793503ffbd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Apr 2025 05:02:11 +0000 Subject: [PATCH 07/10] Update dependencies from https://github.com/dotnet/command-line-api build 20250409.2 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.552801 -> To Version 0.1.620902 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4abaf9f764596..167df55aa332c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,14 +13,14 @@ d794781cc75921b4ebbefe2eabdb0d6cd1713005 - + https://github.com/dotnet/command-line-api - 48bd86bdcd926a194e1581a60d820d12a64ef3c6 + eb0ff63faeae4e5fe96a6217dbf4a79b60a2f4d4 - + https://github.com/dotnet/command-line-api - 48bd86bdcd926a194e1581a60d820d12a64ef3c6 + eb0ff63faeae4e5fe96a6217dbf4a79b60a2f4d4 diff --git a/eng/Versions.props b/eng/Versions.props index dce39029d84cf..dd919a69ad755 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,7 +46,7 @@ Versions managed by Arcade (see Versions.Details.xml) --> - 2.0.0-beta5.25208.1 + 2.0.0-beta5.25209.2 8.0.0 8.0.0 8.0.0 From 7dafd64c2d7d13786dddce71f42574498e405392 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Apr 2025 05:02:13 +0000 Subject: [PATCH 08/10] Update dependencies from https://github.com/dotnet/command-line-api build 20250410.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.552801 -> To Version 0.1.621001 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 167df55aa332c..5293492e96e4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,14 +13,14 @@ d794781cc75921b4ebbefe2eabdb0d6cd1713005 - + https://github.com/dotnet/command-line-api - eb0ff63faeae4e5fe96a6217dbf4a79b60a2f4d4 + e9b0511d7f1128e2bc3be7a658a2a4ea977e602d - + https://github.com/dotnet/command-line-api - eb0ff63faeae4e5fe96a6217dbf4a79b60a2f4d4 + e9b0511d7f1128e2bc3be7a658a2a4ea977e602d diff --git a/eng/Versions.props b/eng/Versions.props index dd919a69ad755..7b6ce25f16a8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,7 +46,7 @@ Versions managed by Arcade (see Versions.Details.xml) --> - 2.0.0-beta5.25209.2 + 2.0.0-beta5.25210.1 8.0.0 8.0.0 8.0.0 From 4b86527beabef551806ecb90a2ec08dd66f73e78 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Tue, 28 Jan 2025 11:22:31 -0800 Subject: [PATCH 09/10] System.CommandLine update (#76948) This PR consists of #76851 (the maestro PR) and actual changes required to update S.CL. # Conflicts: # eng/Version.Details.xml # eng/Versions.props --- src/Features/Lsif/Generator/Program.cs | 16 ++++----- .../Program.cs | 33 +++++++++---------- src/Tools/BuildValidator/Program.cs | 18 +++++----- src/Workspaces/MSBuild/BuildHost/Program.cs | 10 +++--- 4 files changed, 38 insertions(+), 39 deletions(-) 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 6f12720481727..f64282837d545 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)!; From b9ab4b7d28cdae49325bbcb3c308a864418d1308 Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Mon, 14 Apr 2025 15:06:58 +0200 Subject: [PATCH 10/10] fix the build? --- .../Microsoft.CodeAnalysis.LanguageServer/Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs index 50286b159474b..56c2d092bf6fe 100644 --- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs +++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs @@ -171,7 +171,7 @@ static async Task RunAsync(ServerConfiguration serverConfiguration, Cancellation } } -static RootCommand CreateCommandLineParser() +static CommandLineConfiguration CreateCommandLineParser() { var debugOption = new Option("--debug") { @@ -300,7 +300,7 @@ static RootCommand CreateCommandLineParser() return RunAsync(serverConfiguration, cancellationToken); }); - var config = new CliConfiguration(rootCommand) + var config = new CommandLineConfiguration(rootCommand) { // By default, System.CommandLine will catch all exceptions, log them to the console, and return a non-zero exit code. // Unfortunately this makes .NET's crash dump collection environment variables (e.g. 'DOTNET_DbgEnableMiniDump')