Refactor explicit and implicit variable usage to comply with dotnet code style rules

Author: Joseph Sun

src/coverlet.console/Program.cs

@@ -34,7 +34,7 @@ static int Main(string[] args)
       var verbosity = new Option<LogLevel>(new[] { "--verbosity", "-v" }, () => LogLevel.Normal, "Sets the verbosity level of the command. Allowed values are quiet, minimal, normal, detailed.") { Arity = ArgumentArity.ZeroOrOne };
       var formats = new Option<string[]>(new[] { "--format", "-f" }, () => new[] { "json" }, "Format of the generated coverage report.") { Arity = ArgumentArity.ZeroOrMore, AllowMultipleArgumentsPerToken = true };
       var threshold = new Option<string>("--threshold", "Exits with error if the coverage % is below value.") { Arity = ArgumentArity.ZeroOrOne };
-      var thresholdTypes = new Option<List<string>>("--threshold-type", () => new List<string>(new string[] { "line", "branch", "method" }), "Coverage type to apply the threshold to.").FromAmong("line", "branch", "method");
+      Option<List<string>> thresholdTypes = new Option<List<string>>("--threshold-type", () => new List<string>(new string[] { "line", "branch", "method" }), "Coverage type to apply the threshold to.").FromAmong("line", "branch", "method");
       var thresholdStat = new Option<ThresholdStatistic>("--threshold-stat", () => ThresholdStatistic.Minimum, "Coverage statistic used to enforce the threshold value.") { Arity = ArgumentArity.ZeroOrOne };
       var excludeFilters = new Option<string[]>("--exclude", "Filter expressions to exclude specific modules and types.") { Arity = ArgumentArity.ZeroOrMore, AllowMultipleArgumentsPerToken = true };
       var includeFilters = new Option<string[]>("--include", "Filter expressions to include only specific modules and types.") { Arity = ArgumentArity.ZeroOrMore, AllowMultipleArgumentsPerToken = true };
@@ -49,6 +49,7 @@ static int Main(string[] args)
       var doesNotReturnAttributes = new Option<string[]>("--does-not-return-attribute", "Attributes that mark methods that do not return") { Arity = ArgumentArity.ZeroOrMore, AllowMultipleArgumentsPerToken = true };
       var excludeAssembliesWithoutSources = new Option<string>("--exclude-assemblies-without-sources", "Specifies behaviour of heuristic to ignore assemblies with missing source documents.") { Arity = ArgumentArity.ZeroOrOne };
       var sourceMappingFile = new Option<string>("--source-mapping-file", "Specifies the path to a SourceRootsMappings file.") { Arity = ArgumentArity.ZeroOrOne };
+      var unloadCoverletModuleOnly = new Option<bool>("--unload-coverlet-module-only", "Specifies Whether or not coverlet will generate a report"){ Arity = ArgumentArity.ZeroOrOne };
 
       RootCommand rootCommand = new()
       {
@@ -73,7 +74,8 @@ static int Main(string[] args)
         useSourceLink,
         doesNotReturnAttributes,
         excludeAssembliesWithoutSources,
-        sourceMappingFile
+        sourceMappingFile,
+        unloadCoverletModuleOnly
       };
 
       rootCommand.Description = "Cross platform .NET Core code coverage tool";
@@ -102,11 +104,12 @@ static int Main(string[] args)
         string[] doesNotReturnAttributesValue = context.ParseResult.GetValueForOption(doesNotReturnAttributes);
         string excludeAssembliesWithoutSourcesValue = context.ParseResult.GetValueForOption(excludeAssembliesWithoutSources);
         string sourceMappingFileValue = context.ParseResult.GetValueForOption(sourceMappingFile);
+        bool unloadCoverletModuleOnlyBool = context.ParseResult.GetValueForOption(unloadCoverletModuleOnly);
 
         if (string.IsNullOrEmpty(moduleOrAppDirectoryValue) || string.IsNullOrWhiteSpace(moduleOrAppDirectoryValue))
           throw new ArgumentException("No test assembly or application directory specified.");
 
-        var taskStatus = await HandleCommand(moduleOrAppDirectoryValue,
+        int taskStatus = await HandleCommand(moduleOrAppDirectoryValue,
                       targetValue,
                       targsValue,
                       outputValue,
@@ -127,7 +130,8 @@ static int Main(string[] args)
                       useSourceLinkValue,
                       doesNotReturnAttributesValue,
                       excludeAssembliesWithoutSourcesValue,
-                      sourceMappingFileValue);
+                      sourceMappingFileValue,
+                      unloadCoverletModuleOnlyBool);
         context.ExitCode = taskStatus;
 
       });
@@ -154,7 +158,8 @@ private static Task<int> HandleCommand(string moduleOrAppDirectory,
                                                            bool useSourceLink,
                                                            string[] doesNotReturnAttributes,
                                                            string excludeAssembliesWithoutSources,
-                                                           string sourceMappingFile
+                                                           string sourceMappingFile,
+                                                           bool unloadCoverletModuleOnly
              )
     {
 
@@ -232,6 +237,12 @@ string sourceMappingFile
 
         string dOutput = output != null ? output : Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar.ToString();
 
+        if (unloadCoverletModuleOnly)
+        {
+          int unloadModuleExitCode = coverage.UnloadModule(moduleOrAppDirectory);
+          return Task.FromResult(unloadModuleExitCode);
+        }
+
         logger.LogInformation("\nCalculating coverage result...");
 
         CoverageResult result = coverage.GetCoverageResult();

src/coverlet.core/Coverage.cs

@@ -111,7 +111,7 @@ public CoveragePrepareResult PrepareModules()
       _parameters.IncludeFilters = _parameters.IncludeFilters?.Where(f => _instrumentationHelper.IsValidFilterExpression(f)).ToArray();
 
       IReadOnlyList<string> validModules = _instrumentationHelper.SelectModules(modules, _parameters.IncludeFilters, _parameters.ExcludeFilters).ToList();
-      foreach (var excludedModule in modules.Except(validModules))
+      foreach (string excludedModule in modules.Except(validModules))
       {
         _logger.LogVerbose($"Excluded module: '{excludedModule}'");
       }
@@ -337,10 +337,20 @@ public CoverageResult GetCoverageResult()
     /// of instrumentation in large scale testing utilising parallelization
     /// </summary>
     /// <param name="modulePath"></param>
-    public void UnloadModule(string modulePath)
+    public int UnloadModule(string modulePath)
     {
-      _unloadedModules.Add(modulePath);
-      _instrumentationHelper.RestoreOriginalModule(modulePath, Identifier);
+      try
+      {
+        _instrumentationHelper.RestoreOriginalModule(modulePath, Identifier);
+        _unloadedModules.Add(modulePath);
+      }
+      catch (Exception e)
+      {
+        _logger.LogVerbose($"{e.InnerException} occured, module unloading aborted.");
+        return -1;
+      }
+
+      return 0;
     }
 
     private bool BranchInCompilerGeneratedClass(string methodName)

test/coverlet.integration.tests/DeterministicBuild.cs

@@ -300,7 +300,7 @@ private static void DeleteTestIntermediateFiles(string testResultsPath)
     {
       if (Directory.Exists(testResultsPath))
       {
-        DirectoryInfo hdDirectory = new DirectoryInfo(testResultsPath);
+        var hdDirectory = new DirectoryInfo(testResultsPath);
 
         // search for directory "In" which has second copy e.g. '_fv-az365-374_2023-10-10_14_26_42\In\fv-az365-374\coverage.json'
         DirectoryInfo[] intermediateFolder = hdDirectory.GetDirectories("In", SearchOption.AllDirectories);
@@ -316,7 +316,7 @@ private static void DeleteLogFiles(string directory)
     {
       if (Directory.Exists(directory))
       {
-        DirectoryInfo hdDirectory = new DirectoryInfo(directory);
+        var hdDirectory = new DirectoryInfo(directory);
         FileInfo[] filesInDir = hdDirectory.GetFiles("log.*.txt");
 
         foreach (FileInfo foundFile in filesInDir)
@@ -344,7 +344,7 @@ private static void DeleteCoverageFiles(string directory)
     {
       if (Directory.Exists(directory))
       {
-        DirectoryInfo hdDirectory = new DirectoryInfo(directory);
+        var hdDirectory = new DirectoryInfo(directory);
         FileInfo[] filesInDir = hdDirectory.GetFiles("coverage.cobertura.xml");
 
         foreach (FileInfo foundFile in filesInDir)

test/coverlet.tests.projectsample.aspmvcrazor/Program.cs

@@ -1,12 +1,12 @@
 // Copyright (c) Toni Solarin-Sodara
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-var builder = WebApplication.CreateBuilder(args);
+WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddRazorPages();
 
-var app = builder.Build();
+WebApplication app = builder.Build();
 
 // Configure the HTTP request pipeline.
 if (!app.Environment.IsDevelopment())