use System.CommandLine for coverlet.console (#1486)

* use System.CommandLine for coverlet.console

* resolve review comments and add DotnetTool tests

* add space between CLI argument (#1499)

matches the same argument further down

* Fix resolving assemblies from frameworks not referenced by coverlet itself (#1449)

* Make tests run on all platforms (#1492)

* Integration test for assembly resolver for mvc.razor (#1502)

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* remove spelling configuration

* use System.CommandLine for coverlet.console

* resolve review comments and add DotnetTool tests

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* Update src/coverlet.console/Program.cs

Co-authored-by: David Müller <[email protected]>

* remove spelling configuration

---------

Co-authored-by: David Markowitz <[email protected]>
Co-authored-by: Lukas Grützmacher <[email protected]>
Co-authored-by: Cédric Luthi <[email protected]>
Co-authored-by: David Müller <[email protected]>

Author: 5 people

.editorconfig

@@ -42,7 +42,7 @@ end_of_line = crlf
 
 # Code files
 [*.{cs,csx,vb,vbx}]
-indent_size = 4
+indent_size = 2
 insert_final_newline = true
 charset = utf-8-bom
 ###############################
@@ -132,12 +132,15 @@ dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
 dotnet_diagnostic.IDE1006.severity = warning
 # IDE0090: Use 'new(...)'
 dotnet_diagnostic.IDE0090.severity = warning
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 2
+end_of_line = crlf
 ###############################
 # C# Coding Conventions       #
 ###############################
 [*.cs]
 # Organize usings
-csharp_using_directive_placement = outside_namespace:warning
+csharp_using_directive_placement = outside_namespace:silent
 # var preferences - use keywords instead of BCL types, and permit var only when the type is clear
 csharp_style_var_for_built_in_types = false:warning
 csharp_style_var_when_type_is_apparent = true:warning
@@ -213,3 +216,10 @@ csharp_space_between_square_brackets = false
 # Wrapping preferences
 csharp_preserve_single_line_statements = true
 csharp_preserve_single_line_blocks = true
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent

Directory.Build.props

@@ -13,7 +13,7 @@
     <AnalysisLevel>preview</AnalysisLevel>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <LangVersion>preview</LangVersion>
-    <NoWarn>$(NoWarn);NU5105</NoWarn>
+    <NoWarn>$(NoWarn);NU5105;CS1591</NoWarn>
     <RestoreSources>
       https://api.nuget.org/v3/index.json;
     </RestoreSources>
@@ -25,7 +25,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
   </ItemGroup>
 </Project>

Directory.Build.targets

@@ -1,6 +1,5 @@
 <Project>
   <ItemGroup>
-    <PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="2.3.4" />
     <PackageReference Update="Microsoft.Build.Utilities.Core" Version="15.5.180"/>
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
     <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
@@ -25,6 +24,7 @@
     <PackageReference Update="xunit.assert" Version="2.4.2" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1"/>
     <PackageReference Update="Tmds.ExecFunction" Version="0.4.0" />
+    <PackageReference Update="System.CommandLine" Version="2.0.0-beta4.22272.1" />
   </ItemGroup>
 
   <!-- Deterministic build workaround -->

Documentation/GlobalTool.md

@@ -17,16 +17,14 @@ Arguments:
   <ASSEMBLY|DIRECTORY>                  Path to the test assembly or application directory.
 
 Options:
-  -h|--help                             Show help information
-  -v|--version                          Show version information
-  -t|--target                           Path to the test runner application.
+  -t|--target (REQUIRED)                Path to the test runner application.
   -a|--targetargs                       Arguments to be passed to the test runner.
   -o|--output                           Output of the generated coverage report
   -v|--verbosity                        Sets the verbosity level of the command. Allowed values are quiet, minimal, normal, detailed.
-  -f|--format                           Format of the generated coverage report.
+  -f|--format                           Format of the generated coverage report. [default: json]
   --threshold                           Exits with error if the coverage % is below value.
   --threshold-type                      Coverage type to apply the threshold to.
-  --threshold-stat                      Coverage statistic used to enforce the threshold value.
+  --threshold-stat                      Coverage statistic used to enforce the threshold value. [default: Minimum]
   --exclude                             Filter expressions to exclude specific modules and types.
   --include                             Filter expressions to include only specific modules and types.
   --exclude-by-file                     Glob patterns specifying source files to exclude.
@@ -39,6 +37,8 @@ Options:
   --use-source-link                     Specifies whether to use SourceLink URIs in place of file system paths.
   --does-not-return-attribute           Attributes that mark methods that do not return.
   --exclude-assemblies-without-sources  Specifies behaviour of heuristic to ignore assemblies with missing source documents.
+  --version                             Show version information
+  -?, -h, --help                        Show help and usage information
 ```
 
 NB. For a [multiple value] options you have to specify values multiple times i.e.

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.408",
+    "version": "6.0.410",
     "rollForward": "latestMajor"
   }
 }

src/coverlet.collector/DataCollection/CoverageWrapper.cs

@@ -17,6 +17,10 @@ internal class CoverageWrapper : ICoverageWrapper
         /// </summary>
         /// <param name="settings">Coverlet settings</param>
         /// <param name="coverletLogger">Coverlet logger</param>
+        /// <param name="instrumentationHelper"></param>
+        /// <param name="fileSystem"></param>
+        /// <param name="sourceRootTranslator"></param>
+        /// <param name="cecilSymbolHelper"></param>
         /// <returns>Coverage object</returns>
         public Coverage CreateCoverage(CoverletSettings settings, ILogger coverletLogger, IInstrumentationHelper instrumentationHelper, IFileSystem fileSystem, ISourceRootTranslator sourceRootTranslator, ICecilSymbolHelper cecilSymbolHelper)
         {

src/coverlet.collector/coverlet.collector.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyTitle>coverlet.collector</AssemblyTitle>