Add option for additional assembly probe dirs

Author: ViktorHofer

README.md

@@ -58,6 +58,7 @@ Arguments:
 Options:
   -h|--help          Show help information
   -v|--version       Show version information
+  -m|--moduleDir     Path to the directory to probe for additional modules.
   -t|--target        Path to the test runner application.
   -a|--targetargs    Arguments to be passed to the test runner.
   -o|--output        Output of the generated coverage report

src/coverlet.console/Program.cs

@@ -24,6 +24,7 @@ static int Main(string[] args)
             app.VersionOption("-v|--version", GetAssemblyVersion());
 
             CommandArgument module = app.Argument("<ASSEMBLY>", "Path to the test assembly.");
+            CommandOption moduleDirs = app.Option("-m|--moduleDir", "Path to the directory to probe for additional modules.", CommandOptionType.MultipleValue);
             CommandOption target = app.Option("-t|--target", "Path to the test runner application.", CommandOptionType.SingleValue);
             CommandOption targs = app.Option("-a|--targetargs", "Arguments to be passed to the test runner.", CommandOptionType.SingleValue);
             CommandOption output = app.Option("-o|--output", "Output of the generated coverage report", CommandOptionType.SingleValue);
@@ -43,7 +44,7 @@ static int Main(string[] args)
                 if (!target.HasValue())
                     throw new CommandParsingException(app, "Target must be specified.");
 
-                Coverage coverage = new Coverage(module.Value, excludeFilters.Values.ToArray(), includeFilters.Values.ToArray(), excludedSourceFiles.Values.ToArray(), mergeWith.Value());
+                Coverage coverage = new Coverage(module.Value, moduleDirs.Values.ToArray(), excludeFilters.Values.ToArray(), includeFilters.Values.ToArray(), excludedSourceFiles.Values.ToArray(), mergeWith.Value());
                 coverage.PrepareModules();
 
                 Process process = new Process();

src/coverlet.core/Coverage.cs

@@ -14,6 +14,7 @@ namespace Coverlet.Core
     public class Coverage
     {
         private string _module;
+        private string[] _moduleDirs;
         private string _identifier;
         private string[] _excludeFilters;
         private string[] _includeFilters;
@@ -26,9 +27,10 @@ public string Identifier
             get { return _identifier; }
         }
 
-        public Coverage(string module, string[] excludeFilters, string[] includeFilters, string[] excludedSourceFiles, string mergeWith)
+        public Coverage(string module, string[] moduleDirs, string[] excludeFilters, string[] includeFilters, string[] excludedSourceFiles, string mergeWith)
         {
             _module = module;
+            _moduleDirs = moduleDirs ?? throw new ArgumentNullException(nameof(moduleDirs));
             _excludeFilters = excludeFilters;
             _includeFilters = includeFilters;
             _excludedSourceFiles = excludedSourceFiles;
@@ -40,7 +42,7 @@ public Coverage(string module, string[] excludeFilters, string[] includeFilters,
 
         public void PrepareModules()
         {
-            string[] modules = InstrumentationHelper.GetCoverableModules(_module);
+            string[] modules = InstrumentationHelper.GetCoverableModules(_module, _moduleDirs);
             string[] excludes =  InstrumentationHelper.GetExcludedFiles(_excludedSourceFiles);
             _excludeFilters = _excludeFilters?.Where(f => InstrumentationHelper.IsValidFilterExpression(f)).ToArray();
             _includeFilters = _includeFilters?.Where(f => InstrumentationHelper.IsValidFilterExpression(f)).ToArray();

src/coverlet.core/Helpers/InstrumentationHelper.cs

@@ -14,11 +14,24 @@ namespace Coverlet.Core.Helpers
 {
     internal static class InstrumentationHelper
     {
-        public static string[] GetCoverableModules(string module)
+        public static string[] GetCoverableModules(string module, string[] moduleDirs)
         {
-            IEnumerable<string> modules = Directory.EnumerateFiles(Path.GetDirectoryName(module)).Where(f => f.EndsWith(".exe") || f.EndsWith(".dll"));
-            modules = modules.Where(m => IsAssembly(m) && Path.GetFileName(m) != Path.GetFileName(module));
-            return modules.ToArray();
+            // Prepare all the directories in which we probe for modules.
+            string[] dirs = new string[moduleDirs.Length + 1];
+            moduleDirs.CopyTo(dirs, 0);
+            // Add the test assembly's directory.
+            dirs[dirs.Length - 1] = Path.GetDirectoryName(module);
+            
+            // The test module's name must be unique.
+            var uniqueModules = new HashSet<string>
+            {
+                Path.GetFileName(module)
+            };
+
+            return dirs.SelectMany(d => Directory.EnumerateFiles(d))
+                .Where(f => f.EndsWith(".exe") || f.EndsWith(".dll"))
+                .Where(m => IsAssembly(m) && uniqueModules.Add(Path.GetFileName(m)))
+                .ToArray();
         }
 
         public static bool HasPdb(string module)
@@ -43,7 +56,7 @@ public static bool HasPdb(string module)
         public static void BackupOriginalModule(string module, string identifier)
         {
             var backupPath = GetBackupPath(module, identifier);
-            File.Copy(module, backupPath);
+            File.Copy(module, backupPath, true);
         }
 
         public static void RestoreOriginalModule(string module, string identifier)

src/coverlet.msbuild.tasks/InstrumentationTask.cs

@@ -9,6 +9,7 @@ public class InstrumentationTask : Task
     {
         private static Coverage _coverage;
         private string _path;
+        private string _moduleDirs;
         private string _exclude;
         private string _include;
         private string _excludeByFile;
@@ -25,6 +26,12 @@ public string Path
             get { return _path; }
             set { _path = value; }
         }
+
+        public string ModuleDirs
+        {
+            get { return _moduleDirs; }
+            set { _moduleDirs = value; }
+        }
 
         public string Exclude
         {
@@ -54,11 +61,12 @@ public override bool Execute()
         {
             try
             {
+                var moduleDirs = _moduleDirs?.Split(',') ?? Array.Empty<string>();
                 var excludedSourceFiles = _excludeByFile?.Split(',');
                 var excludeFilters = _exclude?.Split(',');
                 var includeFilters = _include?.Split(',');
 
-                _coverage = new Coverage(_path, excludeFilters, includeFilters, excludedSourceFiles, _mergeWith);
+                _coverage = new Coverage(_path, moduleDirs, excludeFilters, includeFilters, excludedSourceFiles, _mergeWith);
                 _coverage.PrepareModules();
             }
             catch (Exception ex)

test/coverlet.core.tests/CoverageTests.cs

@@ -27,7 +27,7 @@ public void TestCoverage()
             // Since Coverage only instruments dependancies, we need a fake module here
             var testModule = Path.Combine(directory.FullName, "test.module.dll");
 
-            var coverage = new Coverage(testModule, Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>(), string.Empty);
+            var coverage = new Coverage(testModule, Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>(), string.Empty);
             coverage.PrepareModules();
 
             var result = coverage.GetCoverageResult();

test/coverlet.core.tests/Helpers/InstrumentationHelperTests.cs

@@ -12,7 +12,7 @@ public class InstrumentationHelperTests
         public void TestGetDependencies()
         {
             string module = typeof(InstrumentationHelperTests).Assembly.Location;
-            var modules = InstrumentationHelper.GetCoverableModules(module);
+            var modules = InstrumentationHelper.GetCoverableModules(module, Array.Empty<string>());
             Assert.False(Array.Exists(modules, m => m == module));
         }