introduce CleanupBuildOutput method

Author: Bertk

test/coverlet.integration.tests/DeterministicBuild.cs

@@ -8,7 +8,6 @@
 using System.Xml.Linq;
 using Coverlet.Core;
 using Coverlet.Tests.Utils;
-using Coverlet.Tests.Xunit.Extensions;
 using Newtonsoft.Json;
 using Xunit;
 using Xunit.Abstractions;
@@ -127,14 +126,10 @@ public void Msbuild()
       Assert.True(File.Exists(testResultFile));
       AssertCoverage(standardOutput);
 
-      // Process exits hang on clean seem that process doesn't close, maybe some msbuild node reuse? btw manually tested
-      DotnetCli("clean", out standardOutput, out standardError, _testProjectPath);
-      // Assert.False(File.Exists(sourceRootMappingFilePath));
-      // RunCommand("git", "clean -fdx", out _, out _, _testProjectPath);
+      CleanupBuildOutput();
     }
 
-    [ConditionalFact]
-    [SkipOnOS(OS.Linux, "Hung up on Linux")]
+    [Fact]
     public void Msbuild_SourceLink()
     {
       string testResultPath = Path.Join(_testResultsPath, ((ITest)_testMember!.GetValue(_output)!).DisplayName);
@@ -176,17 +171,14 @@ public void Msbuild_SourceLink()
       Assert.Contains("raw.githubusercontent.com", File.ReadAllText(testResultFile));
       AssertCoverage(standardOutput, checkDeterministicReport: false);
 
-      // Process exits hang on clean seem that process doesn't close, maybe some msbuild node reuse? btw manually tested
-      DotnetCli("clean", out standardOutput, out standardError, _testProjectPath);
-      // Assert.False(File.Exists(sourceRootMappingFilePath));
-      // RunCommand("git", "clean -fdx", out _, out _, _testProjectPath);
+      CleanupBuildOutput();
     }
 
     [Fact]
     public void Collectors()
     {
       string testResultPath = Path.Join(_testResultsPath, ((ITest)_testMember!.GetValue(_output)!).DisplayName);
-      string testLogFilesPath = Path.Join(_testBinaryPath, ((ITest)_testMember!.GetValue(_output)!).DisplayName);
+      string testLogFilesPath = Path.Join(_testResultsPath, ((ITest)_testMember!.GetValue(_output)!).DisplayName, "log");
       string logFilename = string.Concat(((ITest)_testMember!.GetValue(_output)!).DisplayName, ".binlog");
 
       CreateDeterministicTestPropsFile();
@@ -234,17 +226,14 @@ public void Collectors()
       Assert.Contains("[coverlet]Initialize CoverletInProcDataCollector", File.ReadAllText(Directory.GetFiles(testLogFilesPath, "log.host.*.txt").Single()));
       Assert.Contains("[coverlet]Mapping resolved", dataCollectorLogContent);
 
-      // Process exits hang on clean seem that process doesn't close, maybe some msbuild node reuse? btw manually tested
-      DotnetCli("clean", out standardOutput, out standardError, _testProjectPath);
-      // Assert.False(File.Exists(sourceRootMappingFilePath));
-      // RunCommand("git", "clean -fdx", out _, out _, _testProjectPath);
+      CleanupBuildOutput();
     }
 
     [Fact]
     public void Collectors_SourceLink()
     {
       string testResultPath = Path.Join(_testResultsPath, ((ITest)_testMember!.GetValue(_output)!).DisplayName);
-      string testLogFilesPath = Path.Join(_testBinaryPath, ((ITest)_testMember!.GetValue(_output)!).DisplayName);
+      string testLogFilesPath = Path.Join(_testResultsPath, ((ITest)_testMember!.GetValue(_output)!).DisplayName, "log");
       string logFilename = string.Concat(((ITest)_testMember!.GetValue(_output)!).DisplayName, ".binlog");
 
       CreateDeterministicTestPropsFile();
@@ -305,10 +294,7 @@ public void Collectors_SourceLink()
       Assert.Contains("[coverlet]Initialize CoverletInProcDataCollector", File.ReadAllText(Directory.GetFiles(testLogFilesPath, "log.host.*.txt").Single()));
       Assert.Contains("[coverlet]Mapping resolved", dataCollectorLogContent);
 
-      // Process exits hang on clean seem that process doesn't close, maybe some msbuild node reuse? btw manually tested
-      DotnetCli("clean", out standardOutput, out standardError, _testProjectPath);
-      // Assert.False(File.Exists(sourceRootMappingFilePath));
-      // RunCommand("git", "clean -fdx", out _, out _, _testProjectPath);
+      CleanupBuildOutput();
     }
 
     private static void DeleteTestIntermediateFiles(string testResultsPath)
@@ -342,6 +328,19 @@ private static void DeleteLogFiles(string directory)
       }
 
     }
+    private void CleanupBuildOutput()
+    {
+      if (Directory.Exists(_testBinaryPath))
+      {
+        Directory.Delete(_testBinaryPath, recursive: true);
+      }
+
+      string intermediateBuildOutput = _testBinaryPath.Replace("bin", "obj");
+      if (Directory.Exists(intermediateBuildOutput))
+      {
+        Directory.Delete(intermediateBuildOutput, recursive: true);
+      }
+    }
     private static void DeleteCoverageFiles(string directory)
     {
       if (Directory.Exists(directory))