1155 deterministicbuildfix

Directory.Build.targets

@@ -25,7 +25,7 @@
     <PackageReference Update="xunit" Version="2.4.1" />
     <PackageReference Update="xunit.assert" Version="2.4.1" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1"/>
-    <PackageReference Update="Tmds.ExecFunction" Version="0.4.0" />
+    <PackageReference Update="Tmds.ExecFunction" Version="0.5.0" />
   </ItemGroup>
 
   <!-- Deterministic build workaround -->

Documentation/Examples/VSTest/DeterministicBuild/HowTo.md

@@ -59,7 +59,7 @@ Add collectors package version generated to `"..\Documentation\Examples\VSTest\D
 Go to test project folder and run
 ```
 C:\git\coverlet\Documentation\Examples\VSTest\DeterministicBuild (detbuilddocs -> origin)
-λ dotnet test --collect:"XPlat Code Coverage" /p:DeterministicSourcePaths=true
+λ dotnet test --collect:"XPlat Code Coverage" /p:DeterministicSourcePaths=true -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.DeterministicReport=true
 Test run for C:\git\coverlet\Documentation\Examples\VSTest\DeterministicBuild\XUnitTestProject1\bin\Debug\netcoreapp3.1\XUnitTestProject1.dll(.NETCoreApp,Version=v3.1)
 Microsoft (R) Test Execution Command Line Tool Version 16.5.0
 Copyright (c) Microsoft Corporation.  All rights reserved.
@@ -78,5 +78,5 @@ Total tests: 1
 You should see on output folder the coverlet source root mapping file generated.  
 This is the confirmation that you're running coverage on deterministic build.
 ```
-Documentation\Examples\VSTest\DeterministicBuild\XUnitTestProject1\bin\Debug\netcoreapp3.1\CoverletSourceRootsMapping
+Documentation\Examples\VSTest\DeterministicBuild\XUnitTestProject1\bin\Debug\netcoreapp3.1\CoverletSourceRootsMapping_XUnitTestProject1
 ```

eng/build.yml

@@ -9,6 +9,14 @@ steps:
     version: 5.0.401
   displayName: Install .NET Core SDK 5.0.401
 
+- task: UseDotNet@2
+  inputs:
+    version: 6.0.300
+  displayName: Install .NET Core SDK 6.0.300
+
+- script: dotnet --info
+  displayName: dotnet --info
+
 - script: dotnet restore
   displayName: Restore packages
 
@@ -22,5 +30,5 @@ steps:
   displayName: Run tests
   inputs:
     command: test
-    arguments: -c $(BuildConfiguration) --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Include="[coverlet.collector]*%2c[coverlet.core]*%2c[coverlet.msbuild.tasks]*" /p:Exclude="[coverlet.core.tests.samples.netstandard]*%2c[coverlet.tests.xunit.extensions]*"
+    arguments: -c $(BuildConfiguration) --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Include="[coverlet.collector]*%2c[coverlet.core]*%2c[coverlet.msbuild.tasks]*" /p:Exclude="[coverlet.core.tests.samples.netstandard]*%2c[coverlet.tests.xunit.extensions]*" --blame-crash --blame-hang --blame-hang-timeout 15m
     testRunTitle: $(Agent.JobName)

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.401",
+    "version": "6.0.300",
     "rollForward": "latestMajor"
   }
 }

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/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)
@@ -44,6 +44,7 @@ public SourceRootTranslator(string moduleTestPath, ILogger logger, IFileSystem f
             {
                 throw new FileNotFoundException($"Module test path '{moduleTestPath}' not found", moduleTestPath);
             }
+            _mappingFileName = $"CoverletSourceRootsMapping_coverletsample.integration.determisticbuild";
             _sourceRootMapping = LoadSourceRootMapping(Path.GetDirectoryName(moduleTestPath));
             _sourceToDeterministicPathMapping = LoadSourceToDeterministicPathMapping(_sourceRootMapping);
         }
@@ -75,7 +76,8 @@ private Dictionary<string, List<SourceRootMapping>> LoadSourceRootMapping(string
         {
             var mapping = new Dictionary<string, List<SourceRootMapping>>();
 
-            string mappingFilePath = Path.Combine(directory, MappingFileName);
+            string mappingFilePath = Path.Combine(directory, _mappingFileName);
+            //throw new Exception(mappingFilePath + " --- " + _fileSystem.Exists(mappingFilePath));
             if (!_fileSystem.Exists(mappingFilePath))
             {
                 return mapping;

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/Helpers/SourceRootTranslatorTests.cs

@@ -21,7 +21,7 @@ public void Translate_Success()
             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"));
@@ -39,7 +39,7 @@ public void TranslatePathRoot_Success()
             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"));
@@ -55,7 +55,7 @@ public void Translate_EmptyFile()
             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]);
@@ -71,7 +71,7 @@ public void Translate_MalformedFile()
             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" });

test/coverlet.integration.tests/DeterministicBuild.cs

@@ -75,7 +75,7 @@ public void Msbuild()
             CreateDeterministicTestPropsFile();
             DotnetCli($"build -c {_buildConfiguration} /p:DeterministicSourcePaths=true", out string standardOutput, out string _, _testProjectPath);
             Assert.Contains("Build succeeded.", standardOutput);
-            string sourceRootMappingFilePath = Path.Combine(_testProjectPath, "bin", _buildConfiguration, _testProjectTfm!, "CoverletSourceRootsMapping");
+            string sourceRootMappingFilePath = Path.Combine(_testProjectPath, "bin", _buildConfiguration, _testProjectTfm!, $"CoverletSourceRootsMapping_coverletsample.integration.determisticbuild");
             Assert.True(File.Exists(sourceRootMappingFilePath), sourceRootMappingFilePath);
             Assert.True(!string.IsNullOrEmpty(File.ReadAllText(sourceRootMappingFilePath)), "Empty CoverletSourceRootsMapping file");
             Assert.Contains("=/_/", File.ReadAllText(sourceRootMappingFilePath));
@@ -98,7 +98,7 @@ public void Msbuild_SourceLink()
             CreateDeterministicTestPropsFile();
             DotnetCli($"build -c {_buildConfiguration} /p:DeterministicSourcePaths=true", out string standardOutput, out string _, _testProjectPath);
             Assert.Contains("Build succeeded.", standardOutput);
-            string sourceRootMappingFilePath = Path.Combine(_testProjectPath, "bin", _buildConfiguration, _testProjectTfm!, "CoverletSourceRootsMapping");
+            string sourceRootMappingFilePath = Path.Combine(_testProjectPath, "bin", _buildConfiguration, _testProjectTfm!, $"CoverletSourceRootsMapping_coverletsample.integration.determisticbuild");
             Assert.True(File.Exists(sourceRootMappingFilePath), sourceRootMappingFilePath);
             Assert.True(!string.IsNullOrEmpty(File.ReadAllText(sourceRootMappingFilePath)), "Empty CoverletSourceRootsMapping file");
             Assert.Contains("=/_/", File.ReadAllText(sourceRootMappingFilePath));
@@ -122,7 +122,7 @@ public void Collectors()
             CreateDeterministicTestPropsFile();
             DotnetCli($"build -c {_buildConfiguration} /p:DeterministicSourcePaths=true", out string standardOutput, out string _, _testProjectPath);
             Assert.Contains("Build succeeded.", standardOutput);
-            string sourceRootMappingFilePath = Path.Combine(_testProjectPath, "bin", GetAssemblyBuildConfiguration().ToString(), _testProjectTfm!, "CoverletSourceRootsMapping");
+            string sourceRootMappingFilePath = Path.Combine(_testProjectPath, "bin", GetAssemblyBuildConfiguration().ToString(), _testProjectTfm!, $"CoverletSourceRootsMapping_coverletsample.integration.determisticbuild");
             Assert.True(File.Exists(sourceRootMappingFilePath), sourceRootMappingFilePath);
             Assert.NotEmpty(File.ReadAllText(sourceRootMappingFilePath));
             Assert.Contains("=/_/", File.ReadAllText(sourceRootMappingFilePath));
@@ -150,7 +150,7 @@ public void Collectors_SourceLink()
             CreateDeterministicTestPropsFile();
             DotnetCli($"build -c {_buildConfiguration} /p:DeterministicSourcePaths=true", out string standardOutput, out string _, _testProjectPath);
             Assert.Contains("Build succeeded.", standardOutput);
-            string sourceRootMappingFilePath = Path.Combine(_testProjectPath, "bin", GetAssemblyBuildConfiguration().ToString(), _testProjectTfm!, "CoverletSourceRootsMapping");
+            string sourceRootMappingFilePath = Path.Combine(_testProjectPath, "bin", GetAssemblyBuildConfiguration().ToString(), _testProjectTfm!, $"CoverletSourceRootsMapping_coverletsample.integration.determisticbuild");
             Assert.True(File.Exists(sourceRootMappingFilePath), sourceRootMappingFilePath);
             Assert.NotEmpty(File.ReadAllText(sourceRootMappingFilePath));
             Assert.Contains("=/_/", File.ReadAllText(sourceRootMappingFilePath));