Revert (#3)

* Revert "Revert changes to CoverageWrapper.cs and ICoverageWrapper.cs"

This reverts commit 25feb24.

* Revert "Adjust arguement name to trigger the skip of coverage calculation"

This reverts commit c54c5cf.

* Revert "Add unit tests to new methods"

This reverts commit c3905a1.

* Revert "Revert refactorings caught by Geotab Analyzers"

This reverts commit cbe14cc.

* Revert "add unload modules unique specifically for use in coverlet.console"

This reverts commit 98f1f75.

* Revert "Remove possibly unneeded variables"

This reverts commit 6d2dd57.

* Revert "Unrollback change removals to integrate new changes with VSTest Integration"

This reverts commit 9d4de10.

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

This reverts commit e67ba69.

* Revert "Add minor documentation corrections and remove unneeded changes"

This reverts commit da1257e.

* Revert "Update documentation to clarify the modifications made and add some basic code clean up"

This reverts commit 0dfef6f.

* Revert "Fix problems encountered with newly added method and variables from unit testing with existing tests"

This reverts commit dcc3c29.

* Revert "Add new method to manually call the unloading of modules"

This reverts commit 88a5782.

---------

Co-authored-by: Joseph Sun <[email protected]>

Author: JosephSun2003

src/coverlet.console/Program.cs

@@ -49,7 +49,6 @@ 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 unloadCoverletFromModulesOnly = new Option<bool>("---only-unload-modules", "Specifies Whether or not coverlet will only unload after unit tests are finished and skip coverage calculation"){ Arity = ArgumentArity.ZeroOrOne };
 
       RootCommand rootCommand = new()
       {
@@ -74,8 +73,7 @@ static int Main(string[] args)
         useSourceLink,
         doesNotReturnAttributes,
         excludeAssembliesWithoutSources,
-        sourceMappingFile,
-        unloadCoverletFromModulesOnly
+        sourceMappingFile
       };
 
       rootCommand.Description = "Cross platform .NET Core code coverage tool";
@@ -104,7 +102,6 @@ static int Main(string[] args)
         string[] doesNotReturnAttributesValue = context.ParseResult.GetValueForOption(doesNotReturnAttributes);
         string excludeAssembliesWithoutSourcesValue = context.ParseResult.GetValueForOption(excludeAssembliesWithoutSources);
         string sourceMappingFileValue = context.ParseResult.GetValueForOption(sourceMappingFile);
-        bool unloadCoverletFromModulesOnlyBool = context.ParseResult.GetValueForOption(unloadCoverletFromModulesOnly);
 
         if (string.IsNullOrEmpty(moduleOrAppDirectoryValue) || string.IsNullOrWhiteSpace(moduleOrAppDirectoryValue))
           throw new ArgumentException("No test assembly or application directory specified.");
@@ -130,8 +127,7 @@ static int Main(string[] args)
                       useSourceLinkValue,
                       doesNotReturnAttributesValue,
                       excludeAssembliesWithoutSourcesValue,
-                      sourceMappingFileValue,
-                      unloadCoverletFromModulesOnlyBool);
+                      sourceMappingFileValue);
         context.ExitCode = taskStatus;
 
       });
@@ -158,8 +154,7 @@ private static Task<int> HandleCommand(string moduleOrAppDirectory,
                                                            bool useSourceLink,
                                                            string[] doesNotReturnAttributes,
                                                            string excludeAssembliesWithoutSources,
-                                                           string sourceMappingFile,
-                                                           bool unloadCoverletFromModulesOnly
+                                                           string sourceMappingFile
              )
     {
 
@@ -237,12 +232,6 @@ bool unloadCoverletFromModulesOnly
 
         string dOutput = output != null ? output : Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar.ToString();
 
-        if (unloadCoverletFromModulesOnly)
-        {
-          int unloadModuleExitCode = coverage.UnloadModules();
-          return Task.FromResult(unloadModuleExitCode);
-        }
-
         logger.LogInformation("\nCalculating coverage result...");
 
         CoverageResult result = coverage.GetCoverageResult();
@@ -396,6 +385,7 @@ bool unloadCoverletFromModulesOnly
 
         return Task.FromResult(exitCode);
 
+
       }
 
       catch (Win32Exception we) when (we.Source == "System.Diagnostics.Process")

src/coverlet.core/Coverage.cs

@@ -241,7 +241,7 @@ public CoverageResult GetCoverageResult()
         }
 
         modules.Add(Path.GetFileName(result.ModulePath), documents);
-        UnloadModule(result.ModulePath);
+        _instrumentationHelper.RestoreOriginalModule(result.ModulePath, Identifier);
       }
 
       // In case of anonymous delegate compiler generate a custom class and passes it as type.method delegate.
@@ -326,52 +326,6 @@ public CoverageResult GetCoverageResult()
       return coverageResult;
     }
 
-    /// <summary>
-    /// unloads all modules that were instrumented
-    /// </summary>
-    /// <returns> exit code of module unloading </returns>
-    public int UnloadModules()
-    {
-      string[] modules = _instrumentationHelper.GetCoverableModules(_moduleOrAppDirectory,
-        _parameters.IncludeDirectories, _parameters.IncludeTestAssembly);
-
-      var validModules = _instrumentationHelper
-        .SelectModules(modules, _parameters.IncludeFilters, _parameters.ExcludeFilters);
-      var validModulesAsList = validModules.ToList();
-      foreach (string modulePath in validModulesAsList) {
-        try
-        {
-          _instrumentationHelper.RestoreOriginalModule(modulePath, Identifier);
-          _logger.LogVerbose("All Modules unloaded.");
-        }
-        catch (Exception e)
-        {
-          _logger.LogVerbose($"{e.InnerException} occured, module unloading aborted.");
-          return -1;
-        }
-      }
-
-      return 0;
-  }
-
-    /// <summary>
-    /// Invoke the unloading of modules and restoration of the original assembly files
-    /// </summary>
-    /// <param name="modulePath"></param>
-    /// <returns> exist code of unloading modules </returns>
-    public void UnloadModule(string modulePath)
-    {
-      try
-      {
-        _instrumentationHelper.RestoreOriginalModule(modulePath, Identifier);
-        _logger.LogVerbose($"Module at {modulePath} is unloaded.");
-      }
-      catch (Exception e)
-      {
-        _logger.LogVerbose($"{e.InnerException} occured, module unloading aborted.");
-      }
-    }
-
     private bool BranchInCompilerGeneratedClass(string methodName)
     {
       foreach (InstrumenterResult instrumentedResult in _results)

test/coverlet.core.tests/Coverage/CoverageTests.cs

@@ -177,77 +177,6 @@ public void TestCoverageMergeWithWrongParameter()
 
       directory.Delete(true);
     }
-
-    [Fact]
-    public void TestCoverageUnloadWithParameters()
-    {
-      string module = GetType().Assembly.Location;
-      string pdb = Path.Combine(Path.GetDirectoryName(module), Path.GetFileNameWithoutExtension(module) + ".pdb");
-
-      DirectoryInfo directory = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()));
-
-      File.Copy(module, Path.Combine(directory.FullName, Path.GetFileName(module)), true);
-      File.Copy(pdb, Path.Combine(directory.FullName, Path.GetFileName(pdb)), true);
-
-      var mockInstrumentationHelper = new Mock<IInstrumentationHelper>();
-
-      var parameters = new CoverageParameters
-      {
-        IncludeFilters = new string[] { "[coverlet.tests.projectsample.excludedbyattribute*]*" },
-        IncludeDirectories = Array.Empty<string>(),
-        ExcludeFilters = Array.Empty<string>(),
-        ExcludedSourceFiles = Array.Empty<string>(),
-        ExcludeAttributes = Array.Empty<string>(),
-        IncludeTestAssembly = false,
-        SingleHit = false,
-        MergeWith = string.Empty,
-        UseSourceLink = false
-      };
-
-      var coverage = new Coverage(Path.Combine(directory.FullName, Path.GetFileName(module)), parameters, _mockLogger.Object, mockInstrumentationHelper.Object, new FileSystem(), new SourceRootTranslator(_mockLogger.Object, new FileSystem()), new CecilSymbolHelper());
-      coverage.PrepareModules();
-      coverage.UnloadModule(Path.Combine(directory.FullName, Path.GetFileName(module)));
-
-      mockInstrumentationHelper.Verify(i => i.RestoreOriginalModule(It.Is<string>(v => v.Equals(Path.Combine(directory.FullName, Path.GetFileName(module)))), It.IsAny<string>()), Times.Once);
-      _mockLogger.Verify(l => l.LogVerbose(It.Is<string>(v => v.Equals($"Module at {Path.Combine(directory.FullName, Path.GetFileName(module))} is unloaded."))), Times.Once);
-    }
-
-    [Fact]
-    public void TestCoverageUnloadWithNoParameters()
-    {
-      string module = GetType().Assembly.Location;
-      string pdb = Path.Combine(Path.GetDirectoryName(module), Path.GetFileNameWithoutExtension(module) + ".pdb");
-
-      DirectoryInfo directory = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()));
-
-      File.Copy(module, Path.Combine(directory.FullName, Path.GetFileName(module)), true);
-      File.Copy(pdb, Path.Combine(directory.FullName, Path.GetFileName(pdb)), true);
-
-      var mockInstrumentationHelper = new Mock<IInstrumentationHelper>();
-        mockInstrumentationHelper
-          .Setup(x => x.SelectModules(It.IsAny<IEnumerable<string>>(), It.IsAny<string[]>(), It.IsAny<string[]>()))
-          .Returns(new List<string>(){"ModuleX"});
-
-      var parameters = new CoverageParameters
-      {
-        IncludeFilters = new string[] { "[coverlet.tests.projectsample.excludedbyattribute*]*" },
-        IncludeDirectories = Array.Empty<string>(),
-        ExcludeFilters = Array.Empty<string>(),
-        ExcludedSourceFiles = Array.Empty<string>(),
-        ExcludeAttributes = Array.Empty<string>(),
-        IncludeTestAssembly = false,
-        SingleHit = false,
-        MergeWith = string.Empty,
-        UseSourceLink = false
-      };
-
-      var coverage = new Coverage(Path.Combine(directory.FullName, Path.GetFileName(module)), parameters, _mockLogger.Object, mockInstrumentationHelper.Object, new FileSystem(), new SourceRootTranslator(_mockLogger.Object, new FileSystem()), new CecilSymbolHelper());
-      coverage.PrepareModules();
-      coverage.UnloadModules();
-
-      mockInstrumentationHelper.Verify(i => i.RestoreOriginalModule(It.Is<string>(v => v.Equals("ModuleX")), It.IsAny<string>()), Times.Once);
-      _mockLogger.Verify(l => l.LogVerbose(It.Is<string>(v => v.Equals("All Modules unloaded."))), Times.Once);
-    }
   }
 }