Update to System.CommandLine 2.0 and refactor usage (#1776) (#1777)

* Update to System.CommandLine 2.0 and refactor usage (#1776)

Updated the System.CommandLine package to the stable version 2.0.0.
Replaced deprecated `CommandLineParser.Parse` and `CommandLineConfiguration.InvokeAsync`
with `RootCommand.Parse` and `ParseResult.InvokeAsync` respectively.

* Update Changelog.md
- add improvements
- add new fixe 1776, 1764, 1741

Author: Bertk

Directory.Packages.props

@@ -37,7 +37,7 @@
     <PackageVersion Include="ReportGenerator.Core" Version="5.3.11" />
     <!--For test issue 809 https://github.com/coverlet-coverage/coverlet/issues/809-->
     <PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="8.1.8" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta6.25358.103" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.0" />
     <!--To test issue 1104 https://github.com/coverlet-coverage/coverlet/issues/1104-->
     <!-- latest Tmds.ExecFunction package uses EnvDTE V17.8.37221 -->
     <PackageVersion Include="Tmds.ExecFunction" Version="0.8.0" />

Documentation/Changelog.md

@@ -8,12 +8,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 ### Fixed
-
+- Fix System.CommandLine 2.0 release is available [#1776](https://github.com/coverlet-coverage/coverlet/issues/1776)
+- Fix Excluding From Coverage bad defaults from given example [#1764](https://github.com/coverlet-coverage/coverlet/issues/1764)
 - Fix branchpoint exclusion for sdk 8.0.407 [#1741](https://github.com/coverlet-coverage/coverlet/issues/1741)
-- Use `<TargetFramework>netstandard2.0</TargetFramework>` for _coverlet.collector_ and _coverlet.msbuild.tasks_ Packages´
 
 ### Improvements
 
+- Use multi targets projects for coverlet.collector, coverlet.msbuild.tasks packages [#1742](https://github.com/coverlet-coverage/coverlet/pull/1742)
+- Use .NET 8.0 target framework for coverlet.core and remove Newtonsoft.Json [#1733](https://github.com/coverlet-coverage/coverlet/pull/1733)
+- Use latest System.CommandLine version [#1660](https://github.com/coverlet-coverage/coverlet/pull/1660)
 - Upgraded minimum required .NET SDK and runtime to .NET 8.0 LTS (Long Term Support) (**Breaking Change**)
 - Use [xunit.v3](https://xunit.net/docs/getting-started/v3/whats-new) for tests and example code
 

src/coverlet.console/Program.cs

@@ -4,8 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Help;
-using System.CommandLine.Parsing;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
@@ -31,11 +29,11 @@ public static class Program
     static async Task<int> Main(string[] args)
     {
       Argument<string> moduleOrAppDirectory = new("path") { Description = "Path to the test assembly or application directory." };
-      Option<string> target = new("--target", aliases: new[] { "--target", "-t" }) { Description = "Path to the test runner application.", Arity = ArgumentArity.ZeroOrOne, Required = true };
-      Option<string> targs = new("--targetargs", aliases: new[] { "--targetargs", "-a" }) { Description = "Arguments to be passed to the test runner.", Arity = ArgumentArity.ZeroOrOne };
-      Option<string> output = new("--output", aliases: new[] { "--output", "-o" }) { Description = "Output of the generated coverage report", Arity = ArgumentArity.ZeroOrOne };
-      Option<LogLevel> verbosity = new("--verbosity", aliases: new[] { "--verbosity", "-v" }) { DefaultValueFactory = (_) => LogLevel.Normal, Description = "Sets the verbosity level of the command. Allowed values are quiet, minimal, normal, detailed.", Arity = ArgumentArity.ZeroOrOne };
-      Option<string[]> formats = new("--format", aliases: new[] { "--format", "-f" }) { DefaultValueFactory = (_) => new[] { "json" }, Description = "Format of the generated coverage report.", Arity = ArgumentArity.ZeroOrMore, AllowMultipleArgumentsPerToken = true };
+      Option<string> target = new("--target", "-t") { Description = "Path to the test runner application.", Arity = ArgumentArity.ZeroOrOne, Required = true };
+      Option<string> targs = new("--targetargs", "-a") { Description = "Arguments to be passed to the test runner.", Arity = ArgumentArity.ZeroOrOne };
+      Option<string> output = new("--output", "-o") { Description = "Output of the generated coverage report", Arity = ArgumentArity.ZeroOrOne };
+      Option<LogLevel> verbosity = new("--verbosity", "-v") { DefaultValueFactory = (_) => LogLevel.Normal, Description = "Sets the verbosity level of the command. Allowed values are quiet, minimal, normal, detailed.", Arity = ArgumentArity.ZeroOrOne };
+      Option<string[]> formats = new("--format", "-f") { DefaultValueFactory = (_) => new[] { "json" }, Description = "Format of the generated coverage report.", Arity = ArgumentArity.ZeroOrMore, AllowMultipleArgumentsPerToken = true };
       formats.AcceptOnlyFromAmong("json", "lcov", "opencover", "cobertura", "teamcity");
       Option<string> threshold = new("--threshold") { Description = "Exits with error if the coverage % is below value.", Arity = ArgumentArity.ZeroOrOne };
       Option<List<string>> thresholdTypes = new("--threshold-type") { DefaultValueFactory = (_) => ["line", "branch", "method"], Description = "Coverage type to apply the threshold to." };
@@ -56,37 +54,31 @@ static async Task<int> Main(string[] args)
       excludeAssembliesWithoutSources.AcceptOnlyFromAmong("MissingAll", "MissingAny", "None");
       Option<string> sourceMappingFile = new("--source-mapping-file") { Description = "Specifies the path to a SourceRootsMappings file.", Arity = ArgumentArity.ZeroOrOne };
 
-      RootCommand rootCommand = new("Cross platform .NET Core code coverage tool")
-      {
-        moduleOrAppDirectory,
-        target,
-        targs,
-        output,
-        verbosity,
-        formats,
-        threshold,
-        thresholdTypes,
-        thresholdStat,
-        excludeFilters,
-        includeFilters,
-        excludedSourceFiles,
-        includeDirectories,
-        excludeAttributes,
-        includeTestAssembly,
-        singleHit,
-        skipAutoProp,
-        mergeWith,
-        useSourceLink,
-        doesNotReturnAttributes,
-        excludeAssembliesWithoutSources,
-        sourceMappingFile
-      };
-      rootCommand.Add(new HelpOption());
-      rootCommand.Add(new VersionOption());
-
-      ParseResult parseResult = CommandLineParser.Parse(rootCommand, args);
-
-      rootCommand.SetAction(async (context) =>
+      RootCommand rootCommand = new("Cross platform .NET Core code coverage tool");
+      rootCommand.Arguments.Add(moduleOrAppDirectory);
+      rootCommand.Options.Add(target);
+      rootCommand.Options.Add(targs);
+      rootCommand.Options.Add(output);
+      rootCommand.Options.Add(verbosity);
+      rootCommand.Options.Add(formats);
+      rootCommand.Options.Add(threshold);
+      rootCommand.Options.Add(thresholdTypes);
+      rootCommand.Options.Add(thresholdStat);
+      rootCommand.Options.Add(excludeFilters);
+      rootCommand.Options.Add(includeFilters);
+      rootCommand.Options.Add(excludedSourceFiles);
+      rootCommand.Options.Add(includeDirectories);
+      rootCommand.Options.Add(excludeAttributes);
+      rootCommand.Options.Add(includeTestAssembly);
+      rootCommand.Options.Add(singleHit);
+      rootCommand.Options.Add(skipAutoProp);
+      rootCommand.Options.Add(mergeWith);
+      rootCommand.Options.Add(useSourceLink);
+      rootCommand.Options.Add(doesNotReturnAttributes);
+      rootCommand.Options.Add(excludeAssembliesWithoutSources);
+      rootCommand.Options.Add(sourceMappingFile);
+
+      rootCommand.SetAction(async (parseResult) =>
       {
         string moduleOrAppDirectoryValue = parseResult.GetValue(moduleOrAppDirectory);
         string targetValue = parseResult.GetValue(target);
@@ -136,13 +128,13 @@ static async Task<int> Main(string[] args)
                       doesNotReturnAttributesValue,
                       excludeAssembliesWithoutSourcesValue,
                       sourceMappingFileValue);
-        //context.ExitCode = taskStatus;
 
+        s_exitCode = taskStatus;
+        return taskStatus;
       });
 
-      CommandLineConfiguration config = new(rootCommand);
-
-      await config.InvokeAsync(args).ConfigureAwait(false);
+      ParseResult parseResult = rootCommand.Parse(args);
+      await parseResult.InvokeAsync();
       return s_exitCode;
     }
     private static Task<int> HandleCommand(string moduleOrAppDirectory,