fix + test adaptions

src/coverlet.collector/DataCollection/CoverletCoverageCollector.cs

@@ -8,7 +8,9 @@
 using System.Xml;
 using Coverlet.Collector.Utilities;
 using Coverlet.Collector.Utilities.Interfaces;
+using coverlet.core.Abstractions;
 using Coverlet.Core.Abstractions;
+using coverlet.core.Helpers;
 using Coverlet.Core.Helpers;
 using Coverlet.Core.Symbols;
 using Microsoft.Extensions.DependencyInjection;
@@ -224,11 +226,13 @@ private static IServiceCollection GetDefaultServiceCollection(TestPlatformEqtTra
             serviceCollection.AddTransient<IRetryHelper, RetryHelper>();
             serviceCollection.AddTransient<IProcessExitHandler, ProcessExitHandler>();
             serviceCollection.AddTransient<IFileSystem, FileSystem>();
+            serviceCollection.AddTransient<IAssemblyAdapter, AssemblyAdapter>();
             serviceCollection.AddTransient<ILogger, CoverletLogger>(_ => new CoverletLogger(eqtTrace, logger));
             // We need to keep singleton/static semantics
             serviceCollection.AddSingleton<IInstrumentationHelper, InstrumentationHelper>();
             // We cache resolutions
-            serviceCollection.AddSingleton<ISourceRootTranslator, SourceRootTranslator>(serviceProvider => new SourceRootTranslator(testModule, serviceProvider.GetRequiredService<ILogger>(), serviceProvider.GetRequiredService<IFileSystem>()));
+            serviceCollection.AddSingleton<ISourceRootTranslator, SourceRootTranslator>(serviceProvider =>
+                new SourceRootTranslator(testModule, serviceProvider.GetRequiredService<ILogger>(), serviceProvider.GetRequiredService<IFileSystem>(), serviceProvider.GetRequiredService<IAssemblyAdapter>()));
             serviceCollection.AddSingleton<ICecilSymbolHelper, CecilSymbolHelper>();
             return serviceCollection;
         }

src/coverlet.collector/build/netstandard1.0/coverlet.collector.targets

@@ -44,7 +44,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
       <_mapping Include="@(_byProject->'%(Identity)|%(OriginalPath)=%(MappedPath)')" />
     </ItemGroup>
     <PropertyGroup>
-      <_sourceRootMappingFilePath>$([MSBuild]::EnsureTrailingSlash('$(OutputPath)'))CoverletSourceRootsMapping</_sourceRootMappingFilePath>
+      <_sourceRootMappingFilePath>$([MSBuild]::EnsureTrailingSlash('$(OutputPath)'))CoverletSourceRootsMapping_$(AssemblyName)</_sourceRootMappingFilePath>
     </PropertyGroup>
     <WriteLinesToFile File="$(_sourceRootMappingFilePath)" Lines="@(_mapping)"
                       Overwrite="true" Encoding="Unicode"

src/coverlet.core/Abstractions/IAssemblyAdapter.cs

@@ -0,0 +1,10 @@
+// Copyright (c) Toni Solarin-Sodara
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Coverlet.Core.Abstractions
+{
+    internal interface IAssemblyAdapter
+    {
+        string GetAssemblyName(string assemblyPath);
+    }
+}

src/coverlet.core/Helpers/AssemblyAdapter.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Toni Solarin-Sodara
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Reflection;
+using Coverlet.Core.Abstractions;
+
+namespace Coverlet.Core.Helpers
+{
+    internal class AssemblyAdapter : IAssemblyAdapter
+    {
+        public string GetAssemblyName(string assemblyPath)
+        {
+            return AssemblyName.GetAssemblyName(assemblyPath).Name;
+        }
+    }
+}

src/coverlet.core/Helpers/SourceRootTranslator.cs

@@ -22,7 +22,7 @@ internal class SourceRootTranslator : ISourceRootTranslator
         private readonly IFileSystem _fileSystem;
         private readonly Dictionary<string, List<SourceRootMapping>> _sourceRootMapping;
         private readonly Dictionary<string, List<string>> _sourceToDeterministicPathMapping;
-        private const string MappingFileName = "CoverletSourceRootsMapping";
+        private readonly string _mappingFileName;
         private Dictionary<string, string> _resolutionCacheFiles;
 
         public SourceRootTranslator(ILogger logger, IFileSystem fileSystem)
@@ -32,7 +32,7 @@ public SourceRootTranslator(ILogger logger, IFileSystem fileSystem)
             _sourceRootMapping = new Dictionary<string, List<SourceRootMapping>>();
         }
 
-        public SourceRootTranslator(string moduleTestPath, ILogger logger, IFileSystem fileSystem)
+        public SourceRootTranslator(string moduleTestPath, ILogger logger, IFileSystem fileSystem, IAssemblyAdapter assemblyAdapter)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
@@ -44,6 +44,10 @@ public SourceRootTranslator(string moduleTestPath, ILogger logger, IFileSystem f
             {
                 throw new FileNotFoundException($"Module test path '{moduleTestPath}' not found", moduleTestPath);
             }
+
+            string assemblyName = assemblyAdapter.GetAssemblyName(moduleTestPath);
+            _mappingFileName = $"CoverletSourceRootsMapping_{assemblyName}";
+
             _sourceRootMapping = LoadSourceRootMapping(Path.GetDirectoryName(moduleTestPath));
             _sourceToDeterministicPathMapping = LoadSourceToDeterministicPathMapping(_sourceRootMapping);
         }
@@ -75,7 +79,7 @@ public SourceRootTranslator(string moduleTestPath, ILogger logger, IFileSystem f
         {
             var mapping = new Dictionary<string, List<SourceRootMapping>>();
 
-            string mappingFilePath = Path.Combine(directory, MappingFileName);
+            string mappingFilePath = Path.Combine(directory, _mappingFileName);
             if (!_fileSystem.Exists(mappingFilePath))
             {
                 return mapping;

src/coverlet.msbuild.tasks/InstrumentationTask.cs

@@ -73,11 +73,13 @@ public override bool Execute()
             IServiceCollection serviceCollection = new ServiceCollection();
             serviceCollection.AddTransient<IProcessExitHandler, ProcessExitHandler>();
             serviceCollection.AddTransient<IFileSystem, FileSystem>();
+            serviceCollection.AddTransient<IAssemblyAdapter, AssemblyAdapter>();
             serviceCollection.AddTransient<IConsole, SystemConsole>();
             serviceCollection.AddTransient<ILogger, MSBuildLogger>(_ => _logger);
             serviceCollection.AddTransient<IRetryHelper, RetryHelper>();
             // We cache resolutions
-            serviceCollection.AddSingleton<ISourceRootTranslator, SourceRootTranslator>(serviceProvider => new SourceRootTranslator(Path, serviceProvider.GetRequiredService<ILogger>(), serviceProvider.GetRequiredService<IFileSystem>()));
+            serviceCollection.AddSingleton<ISourceRootTranslator, SourceRootTranslator>(serviceProvider =>
+                new SourceRootTranslator(Path, serviceProvider.GetRequiredService<ILogger>(), serviceProvider.GetRequiredService<IFileSystem>(), serviceProvider.GetRequiredService<IAssemblyAdapter>()));
             // We need to keep singleton/static semantics
             serviceCollection.AddSingleton<IInstrumentationHelper, InstrumentationHelper>();
             serviceCollection.AddSingleton<ICecilSymbolHelper, CecilSymbolHelper>();

src/coverlet.msbuild.tasks/coverlet.msbuild.targets

@@ -24,7 +24,7 @@
       <_mapping Include="@(_byProject->'%(Identity)|%(OriginalPath)=%(MappedPath)')" />
     </ItemGroup>
     <PropertyGroup>
-      <_sourceRootMappingFilePath>$([MSBuild]::EnsureTrailingSlash('$(OutputPath)'))CoverletSourceRootsMapping</_sourceRootMappingFilePath>
+      <_sourceRootMappingFilePath>$([MSBuild]::EnsureTrailingSlash('$(OutputPath)'))CoverletSourceRootsMapping_$(AssemblyName)</_sourceRootMappingFilePath>
     </PropertyGroup>
     <WriteLinesToFile File="$(_sourceRootMappingFilePath)" Lines="@(_mapping)"
                       Overwrite="true" Encoding="Unicode"

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

@@ -31,7 +31,7 @@ public void TestCoverageSkipModule__AssemblyMarkedAsExcludeFromCodeCoverage()
 
             var instrumentationHelper =
                 new InstrumentationHelper(new ProcessExitHandler(), new RetryHelper(), new FileSystem(), new Mock<ILogger>().Object,
-                                          new SourceRootTranslator(excludedbyattributeDll, new Mock<ILogger>().Object, new FileSystem()));
+                                          new SourceRootTranslator(excludedbyattributeDll, new Mock<ILogger>().Object, new FileSystem(), new AssemblyAdapter()));
 
             var parameters = new CoverageParameters
             {

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

@@ -29,7 +29,7 @@ public void TestCoverage()
             // TODO: Find a way to mimick hits
             var instrumentationHelper =
                 new InstrumentationHelper(new ProcessExitHandler(), new RetryHelper(), new FileSystem(), new Mock<ILogger>().Object,
-                                          new SourceRootTranslator(module, new Mock<ILogger>().Object, new FileSystem()));
+                                          new SourceRootTranslator(module, new Mock<ILogger>().Object, new FileSystem(), new AssemblyAdapter()));
 
             var parameters = new CoverageParameters
             {
@@ -67,7 +67,7 @@ public void TestCoverageWithTestAssembly()
 
             var instrumentationHelper =
                 new InstrumentationHelper(new ProcessExitHandler(), new RetryHelper(), new FileSystem(), new Mock<ILogger>().Object,
-                                          new SourceRootTranslator(module, new Mock<ILogger>().Object, new FileSystem()));
+                                          new SourceRootTranslator(module, new Mock<ILogger>().Object, new FileSystem(), new AssemblyAdapter()));
 
             var parameters = new CoverageParameters
             {
@@ -83,7 +83,7 @@ public void TestCoverageWithTestAssembly()
             };
 
             var coverage = new Coverage(Path.Combine(directory.FullName, Path.GetFileName(module)), parameters, _mockLogger.Object, instrumentationHelper, new FileSystem(),
-                                        new SourceRootTranslator(module, _mockLogger.Object, new FileSystem()), new CecilSymbolHelper());
+                                        new SourceRootTranslator(module, _mockLogger.Object, new FileSystem(), new AssemblyAdapter()), new CecilSymbolHelper());
             coverage.PrepareModules();
 
             CoverageResult result = coverage.GetCoverageResult();

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

@@ -173,7 +173,7 @@ private static void SetTestContainer(string testModule = null, bool disableResto
                 serviceCollection.AddSingleton<ISourceRootTranslator, SourceRootTranslator>(serviceProvider =>
                 string.IsNullOrEmpty(testModule) ?
                 new SourceRootTranslator(serviceProvider.GetRequiredService<ILogger>(), serviceProvider.GetRequiredService<IFileSystem>()) :
-                new SourceRootTranslator(testModule, serviceProvider.GetRequiredService<ILogger>(), serviceProvider.GetRequiredService<IFileSystem>()));
+                new SourceRootTranslator(testModule, serviceProvider.GetRequiredService<ILogger>(), serviceProvider.GetRequiredService<IFileSystem>(), serviceProvider.GetRequiredService<IAssemblyAdapter>()));
 
                 serviceCollection.AddSingleton<ICecilSymbolHelper, CecilSymbolHelper>();
 

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

@@ -16,7 +16,7 @@ namespace Coverlet.Core.Helpers.Tests
     public class InstrumentationHelperTests
     {
         private readonly InstrumentationHelper _instrumentationHelper =
-            new(new ProcessExitHandler(), new RetryHelper(), new FileSystem(), new Mock<ILogger>().Object, new SourceRootTranslator(typeof(InstrumentationHelperTests).Assembly.Location, new Mock<ILogger>().Object, new FileSystem()));
+            new(new ProcessExitHandler(), new RetryHelper(), new FileSystem(), new Mock<ILogger>().Object, new SourceRootTranslator(typeof(InstrumentationHelperTests).Assembly.Location, new Mock<ILogger>().Object, new FileSystem(), new AssemblyAdapter()));
 
         [Fact]
         public void TestGetDependencies()
@@ -41,7 +41,7 @@ public void EmbeddedPortablePDPHasLocalSource_NoDocumentsExist_ReturnsFalse()
             fileSystem.Setup(x => x.Exists(It.IsAny<string>())).Returns(false);
 
             var instrumentationHelper =
-                new InstrumentationHelper(new ProcessExitHandler(), new RetryHelper(), fileSystem.Object, new Mock<ILogger>().Object, new SourceRootTranslator(typeof(InstrumentationHelperTests).Assembly.Location, new Mock<ILogger>().Object, new FileSystem()));
+                new InstrumentationHelper(new ProcessExitHandler(), new RetryHelper(), fileSystem.Object, new Mock<ILogger>().Object, new SourceRootTranslator(typeof(InstrumentationHelperTests).Assembly.Location, new Mock<ILogger>().Object, new FileSystem(), new AssemblyAdapter()));
 
             Assert.False(instrumentationHelper.PortablePdbHasLocalSource(typeof(InstrumentationHelperTests).Assembly.Location, AssemblySearchType.MissingAny));
             Assert.False(instrumentationHelper.PortablePdbHasLocalSource(typeof(InstrumentationHelperTests).Assembly.Location, AssemblySearchType.MissingAll));
@@ -69,7 +69,7 @@ public void EmbeddedPortablePDPHasLocalSource_FirstDocumentDoesNotExist_ReturnsE
                 });
 
             var instrumentationHelper =
-                new InstrumentationHelper(new ProcessExitHandler(), new RetryHelper(), fileSystem.Object, new Mock<ILogger>().Object, new SourceRootTranslator(typeof(InstrumentationHelperTests).Assembly.Location, new Mock<ILogger>().Object, new FileSystem()));
+                new InstrumentationHelper(new ProcessExitHandler(), new RetryHelper(), fileSystem.Object, new Mock<ILogger>().Object, new SourceRootTranslator(typeof(InstrumentationHelperTests).Assembly.Location, new Mock<ILogger>().Object, new FileSystem(), new AssemblyAdapter()));
 
             Assert.Equal(result, instrumentationHelper.PortablePdbHasLocalSource(typeof(InstrumentationHelperTests).Assembly.Location, (AssemblySearchType) assemblySearchType));
         }

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

@@ -18,14 +18,16 @@ public void Translate_Success()
         {
             string fileToTranslate = "/_/src/coverlet.core/obj/Debug/netstandard2.0/coverlet.core.pdb";
             var logger = new Mock<ILogger>();
+            var assemblyAdapter = new Mock<IAssemblyAdapter>();
+            assemblyAdapter.Setup(x => x.GetAssemblyName(It.IsAny<string>())).Returns("testLib");
             var fileSystem = new Mock<IFileSystem>();
             fileSystem.Setup(f => f.Exists(It.IsAny<string>())).Returns((string p) =>
             {
-                if (p == "testLib.dll" || p == @"C:\git\coverlet\src\coverlet.core\obj\Debug\netstandard2.0\coverlet.core.pdb" || p == "CoverletSourceRootsMapping") return true;
+                if (p == "testLib.dll" || p == @"C:\git\coverlet\src\coverlet.core\obj\Debug\netstandard2.0\coverlet.core.pdb" || p == "CoverletSourceRootsMapping_testLib") return true;
                 return false;
             });
             fileSystem.Setup(f => f.ReadAllLines(It.IsAny<string>())).Returns(File.ReadAllLines(@"TestAssets/CoverletSourceRootsMappingTest"));
-            var translator = new SourceRootTranslator("testLib.dll", logger.Object, fileSystem.Object);
+            var translator = new SourceRootTranslator("testLib.dll", logger.Object, fileSystem.Object, assemblyAdapter.Object);
             Assert.Equal(@"C:\git\coverlet\src\coverlet.core\obj\Debug\netstandard2.0\coverlet.core.pdb", translator.ResolveFilePath(fileToTranslate));
             Assert.Equal(@"C:\git\coverlet\src\coverlet.core\obj\Debug\netstandard2.0\coverlet.core.pdb", translator.ResolveFilePath(fileToTranslate));
         }
@@ -36,14 +38,16 @@ public void Translate_Success()
         public void TranslatePathRoot_Success()
         {
             var logger = new Mock<ILogger>();
+            var assemblyAdapter = new Mock<IAssemblyAdapter>();
+            assemblyAdapter.Setup(x => x.GetAssemblyName(It.IsAny<string>())).Returns("testLib");
             var fileSystem = new Mock<IFileSystem>();
             fileSystem.Setup(f => f.Exists(It.IsAny<string>())).Returns((string p) =>
             {
-                if (p == "testLib.dll" || p == @"C:\git\coverlet\src\coverlet.core\obj\Debug\netstandard2.0\coverlet.core.pdb" || p == "CoverletSourceRootsMapping") return true;
+                if (p == "testLib.dll" || p == @"C:\git\coverlet\src\coverlet.core\obj\Debug\netstandard2.0\coverlet.core.pdb" || p == "CoverletSourceRootsMapping_testLib") return true;
                 return false;
             });
             fileSystem.Setup(f => f.ReadAllLines(It.IsAny<string>())).Returns(File.ReadAllLines(@"TestAssets/CoverletSourceRootsMappingTest"));
-            var translator = new SourceRootTranslator("testLib.dll", logger.Object, fileSystem.Object);
+            var translator = new SourceRootTranslator("testLib.dll", logger.Object, fileSystem.Object, assemblyAdapter.Object);
             Assert.Equal(@"C:\git\coverlet\", translator.ResolvePathRoot("/_/")[0].OriginalPath);
         }
 
@@ -52,14 +56,16 @@ public void Translate_EmptyFile()
         {
             string fileToTranslate = "/_/src/coverlet.core/obj/Debug/netstandard2.0/coverlet.core.pdb";
             var logger = new Mock<ILogger>();
+            var assemblyAdapter = new Mock<IAssemblyAdapter>();
+            assemblyAdapter.Setup(x => x.GetAssemblyName(It.IsAny<string>())).Returns("testLib");
             var fileSystem = new Mock<IFileSystem>();
             fileSystem.Setup(f => f.Exists(It.IsAny<string>())).Returns((string p) =>
             {
-                if (p == "testLib.dll" || p == "CoverletSourceRootsMapping") return true;
+                if (p == "testLib.dll" || p == "CoverletSourceRootsMapping_testLib") return true;
                 return false;
             });
             fileSystem.Setup(f => f.ReadAllLines(It.IsAny<string>())).Returns(new string[0]);
-            var translator = new SourceRootTranslator("testLib.dll", logger.Object, fileSystem.Object);
+            var translator = new SourceRootTranslator("testLib.dll", logger.Object, fileSystem.Object, assemblyAdapter.Object);
             Assert.Equal(fileToTranslate, translator.ResolveFilePath(fileToTranslate));
         }
 
@@ -68,14 +74,16 @@ public void Translate_MalformedFile()
         {
             string fileToTranslate = "/_/src/coverlet.core/obj/Debug/netstandard2.0/coverlet.core.pdb";
             var logger = new Mock<ILogger>();
+            var assemblyAdapter = new Mock<IAssemblyAdapter>();
+            assemblyAdapter.Setup(x => x.GetAssemblyName(It.IsAny<string>())).Returns("testLib");
             var fileSystem = new Mock<IFileSystem>();
             fileSystem.Setup(f => f.Exists(It.IsAny<string>())).Returns((string p) =>
             {
-                if (p == "testLib.dll" || p == "CoverletSourceRootsMapping") return true;
+                if (p == "testLib.dll" || p == "CoverletSourceRootsMapping_testLib") return true;
                 return false;
             });
             fileSystem.Setup(f => f.ReadAllLines(It.IsAny<string>())).Returns(new string[1] { "malformedRow" });
-            var translator = new SourceRootTranslator("testLib.dll", logger.Object, fileSystem.Object);
+            var translator = new SourceRootTranslator("testLib.dll", logger.Object, fileSystem.Object, assemblyAdapter.Object);
             Assert.Equal(fileToTranslate, translator.ResolveFilePath(fileToTranslate));
             logger.Verify(l => l.LogWarning(It.IsAny<string>()), Times.Once);
         }