enable dotnetTool integration tests for linux and MayOs

Author: Bertk

eng/build.yml

@@ -45,6 +45,7 @@ steps:
     mergeTestResults: false
     publishRunAttachments: true
     failTaskOnFailedTests: true
+  condition:  succeededOrFailed()
 
 - template: publish-coverlet-result-files.yml
 

test/coverlet.integration.tests/DotnetTool.cs

@@ -4,7 +4,6 @@
 using System.IO;
 using System.Linq;
 using Coverlet.Tests.Utils;
-using Coverlet.Tests.Xunit.Extensions;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -61,64 +60,79 @@ public void StandAlone()
       AssertCoverage(clonedTemplateProject, standardOutput: standardOutput);
     }
 
-    [ConditionalFact]
-    [SkipOnOS(OS.Linux)]
-    [SkipOnOS(OS.MacOS)]
+    [Fact]
     public void StandAloneThreshold()
     {
       using ClonedTemplateProject clonedTemplateProject = CloneTemplateProject();
       UpdateNugetConfigWithLocalPackageFolder(clonedTemplateProject.ProjectRootPath!);
       string coverletToolCommandPath = InstallTool(clonedTemplateProject.ProjectRootPath!);
+      string outputPath = $"{clonedTemplateProject.ProjectRootPath}{Path.DirectorySeparatorChar}coverage.json";
       DotnetCli($"build -f  {_buildTargetFramework}  {clonedTemplateProject.ProjectRootPath}", out string standardOutput, out string standardError);
       string publishedTestFile = clonedTemplateProject.GetFiles("*" + ClonedTemplateProject.AssemblyName + ".dll").Single(f => !f.Contains("obj") && !f.Contains("ref"));
-      Assert.False(RunCommand(coverletToolCommandPath, $"\"{Path.GetDirectoryName(publishedTestFile)}\" --target \"dotnet\" --targetargs \"{publishedTestFile}\"  --threshold 80 --output \"{clonedTemplateProject.ProjectRootPath}\"\\", out standardOutput, out standardError));
+      Assert.False(RunCommand(coverletToolCommandPath, $"\"{Path.GetDirectoryName(publishedTestFile)}\" --target \"dotnet\" --targetargs \"{publishedTestFile}\"  --threshold 80 --output \"{outputPath}\"", out standardOutput, out standardError));
       if (!string.IsNullOrEmpty(standardError))
       {
         _output.WriteLine(standardError);
       }
+      else
+      {
+        // make standard output available in trx file
+        _output.WriteLine(standardOutput);
+      }
       Assert.Contains("Hello World!", standardOutput);
+      Assert.True(File.Exists($"{clonedTemplateProject.ProjectRootPath}{Path.DirectorySeparatorChar}coverage.json"));
       AssertCoverage(clonedTemplateProject, standardOutput: standardOutput);
       Assert.Contains("The minimum line coverage is below the specified 80", standardOutput);
       Assert.Contains("The minimum method coverage is below the specified 80", standardOutput);
     }
 
-    [ConditionalFact]
-    [SkipOnOS(OS.Linux)]
-    [SkipOnOS(OS.MacOS)]
+    [Fact]
     public void StandAloneThresholdLine()
     {
       using ClonedTemplateProject clonedTemplateProject = CloneTemplateProject();
       UpdateNugetConfigWithLocalPackageFolder(clonedTemplateProject.ProjectRootPath!);
       string coverletToolCommandPath = InstallTool(clonedTemplateProject.ProjectRootPath!);
+      string outputPath = $"{clonedTemplateProject.ProjectRootPath}{Path.DirectorySeparatorChar}coverage.json";
       DotnetCli($"build -f {_buildTargetFramework} {clonedTemplateProject.ProjectRootPath}", out string standardOutput, out string standardError);
       string publishedTestFile = clonedTemplateProject.GetFiles("*" + ClonedTemplateProject.AssemblyName + ".dll").Single(f => !f.Contains("obj") && !f.Contains("ref"));
-      Assert.False(RunCommand(coverletToolCommandPath, $"\"{Path.GetDirectoryName(publishedTestFile)}\" --target \"dotnet\" --targetargs \"{publishedTestFile}\"  --threshold 80 --threshold-type line --output \"{clonedTemplateProject.ProjectRootPath}\"\\", out standardOutput, out standardError));
+      Assert.False(RunCommand(coverletToolCommandPath, $"\"{Path.GetDirectoryName(publishedTestFile)}\" --target \"dotnet\" --targetargs \"{publishedTestFile}\"  --threshold 80 --threshold-type line --output \"{outputPath}\"", out standardOutput, out standardError));
       if (!string.IsNullOrEmpty(standardError))
       {
         _output.WriteLine(standardError);
       }
+      else
+      {
+        // make standard output available in trx file
+        _output.WriteLine(standardOutput);
+      }
       Assert.Contains("Hello World!", standardOutput);
+      Assert.True(File.Exists($"{clonedTemplateProject.ProjectRootPath}{Path.DirectorySeparatorChar}coverage.json"));
       AssertCoverage(clonedTemplateProject, standardOutput: standardOutput);
       Assert.Contains("The minimum line coverage is below the specified 80", standardOutput);
       Assert.DoesNotContain("The minimum method coverage is below the specified 80", standardOutput);
     }
 
-    [ConditionalFact]
-    [SkipOnOS(OS.Linux)]
-    [SkipOnOS(OS.MacOS)]
+    [Fact]
     public void StandAloneThresholdLineAndMethod()
     {
       using ClonedTemplateProject clonedTemplateProject = CloneTemplateProject();
       UpdateNugetConfigWithLocalPackageFolder(clonedTemplateProject.ProjectRootPath!);
       string coverletToolCommandPath = InstallTool(clonedTemplateProject.ProjectRootPath!);
+      string outputPath = $"{clonedTemplateProject.ProjectRootPath}{Path.DirectorySeparatorChar}coverage.json";
       DotnetCli($"build -f  {_buildTargetFramework}  {clonedTemplateProject.ProjectRootPath}", out string standardOutput, out string standardError);
       string publishedTestFile = clonedTemplateProject.GetFiles("*" + ClonedTemplateProject.AssemblyName + ".dll").Single(f => !f.Contains("obj") && !f.Contains("ref"));
-      Assert.False(RunCommand(coverletToolCommandPath, $"\"{Path.GetDirectoryName(publishedTestFile)}\" --target \"dotnet\" --targetargs \"{publishedTestFile}\"  --threshold 80 --threshold-type line --threshold-type method --output \"{clonedTemplateProject.ProjectRootPath}\"\\", out standardOutput, out standardError));
+      Assert.False(RunCommand(coverletToolCommandPath, $"\"{Path.GetDirectoryName(publishedTestFile)}\" --target \"dotnet\" --targetargs \"{publishedTestFile}\"  --threshold 80 --threshold-type line --threshold-type method --output \"{outputPath}\"", out standardOutput, out standardError));
       if (!string.IsNullOrEmpty(standardError))
       {
         _output.WriteLine(standardError);
       }
+      else
+      {
+        // make standard output available in trx file
+        _output.WriteLine(standardOutput);
+      }
       Assert.Contains("Hello World!", standardOutput);
+      Assert.True(File.Exists($"{clonedTemplateProject.ProjectRootPath}{Path.DirectorySeparatorChar}coverage.json"));
       AssertCoverage(clonedTemplateProject, standardOutput: standardOutput);
       Assert.Contains("The minimum line coverage is below the specified 80", standardOutput);
       Assert.Contains("The minimum method coverage is below the specified 80", standardOutput);

test/coverlet.tests.utils/TestUtils.cs

@@ -33,6 +33,9 @@ public static BuildConfiguration GetAssemblyBuildConfiguration()
 
     public static string GetAssemblyTargetFramework()
     {
+#if NET6_0
+      return "net6.0";
+#endif
 #if NET7_0
       return "net7.0";
 #endif