(build) publish test results

Author: arturcic

build/pack.cake

@@ -42,19 +42,25 @@ Task("Test")
         {
             actions.Add(() =>
             {
-                var settings = new DotNetCoreTestSettings
-                {
+                var testResultsPath = parameters.Paths.Directories.TestResultsOutput + "/";
+                var projectName = $"{project.GetFilenameWithoutExtension()}.{framework}";
+                var settings = new DotNetCoreTestSettings {
                     Framework = framework,
                     NoBuild = true,
                     NoRestore = true,
-                    Configuration = parameters.Configuration
+                    Configuration = parameters.Configuration,
                 };
 
+                if (!parameters.IsRunningOnMacOS) {
+                    settings.TestAdapterPath = new DirectoryPath(".");
+                    settings.Logger = $"nunit;LogFilePath={MakeAbsolute(new FilePath($"{testResultsPath}{projectName}.results.xml"))}";
+                }
+
                 var coverletSettings = new CoverletSettings {
                     CollectCoverage = true,
                     CoverletOutputFormat = CoverletOutputFormat.opencover,
-                    CoverletOutputDirectory = parameters.Paths.Directories.TestCoverageOutput + "/",
-                    CoverletOutputName = $"{project.GetFilenameWithoutExtension()}.{framework}.coverage.xml"
+                    CoverletOutputDirectory = testResultsPath,
+                    CoverletOutputName = $"{projectName}.coverage.xml"
                 };
 
                 if (IsRunningOnUnix())
@@ -79,6 +85,21 @@ Task("Test")
 {
     var error = (exception as AggregateException).InnerExceptions[0];
     Error(error.Dump());
+})
+.Finally(() =>
+{
+    var parameters = Context.Data.Get<BuildParameters>();
+    var testResultsFiles = GetFiles(parameters.Paths.Directories.TestResultsOutput + "/*.results.xml");
+    if (parameters.IsRunningOnAzurePipeline)
+    {
+        if (testResultsFiles.Any()) {
+            var data = new TFBuildPublishTestResultsData {
+                TestResultsFiles = testResultsFiles.ToArray(),
+                TestRunner = TFTestRunnerType.NUnit
+            };
+            TFBuild.Commands.PublishTestResults(data);
+        }
+    }
 });
 
 #endregion

build/publish.cake

@@ -38,7 +38,7 @@ Task("Publish-Coverage")
     .IsDependentOnWhen("Test", singleStageRun)
     .Does<BuildParameters>((parameters) =>
 {
-    var coverageFiles = GetFiles(parameters.Paths.Directories.TestCoverageOutput + "/*.coverage.xml");
+    var coverageFiles = GetFiles(parameters.Paths.Directories.TestResultsOutput + "/*.coverage.xml");
 
     var token = parameters.Credentials.CodeCov.Token;
     if(string.IsNullOrEmpty(token)) {
@@ -69,10 +69,6 @@ Task("Publish-AppVeyor")
     {
         if (FileExists(package.PackagePath)) { AppVeyor.UploadArtifact(package.PackagePath); }
     }
-
-    if (FileExists(parameters.Paths.Files.TestCoverageOutputFilePath)) {
-        AppVeyor.UploadTestResults(parameters.Paths.Files.TestCoverageOutputFilePath, AppVeyorTestResultsType.NUnit3);
-    }
 })
 .OnError(exception =>
 {
@@ -96,14 +92,6 @@ Task("Publish-AzurePipeline")
     {
         if (FileExists(package.PackagePath)) { TFBuild.Commands.UploadArtifact("packages", package.PackagePath, package.PackageName); }
     }
-
-    if (FileExists(parameters.Paths.Files.TestCoverageOutputFilePath)) {
-        var data = new TFBuildPublishTestResultsData {
-            TestResultsFiles = new[] { parameters.Paths.Files.TestCoverageOutputFilePath },
-            TestRunner = TFTestRunnerType.NUnit
-        };
-        TFBuild.Commands.PublishTestResults(data);
-    }
 })
 .OnError(exception =>
 {

build/utils/parameters.cake

@@ -123,7 +123,6 @@ public class BuildParameters
         Artifacts = BuildArtifacts.GetArtifacts(new[] {
             files.ZipArtifactPathDesktop,
             files.ZipArtifactPathCoreClr,
-            files.TestCoverageOutputFilePath,
             files.ReleaseNotesOutputFilePath,
             files.VsixOutputFilePath,
             files.GemOutputFilePath

build/utils/paths.cake

@@ -34,24 +34,22 @@ public class BuildPaths
         var artifactsBinCoreFxDir         = artifactsBinDir.Combine(parameters.CoreFxVersion);
         var nugetRootDir                  = artifactsDir.Combine("nuget");
         var buildArtifactDir              = artifactsDir.Combine("build-artifact");
-        var testCoverageOutputDir         = artifactsDir.Combine("code-coverage");
+        var testResultsOutputDir         = artifactsDir.Combine("test-results");
 
         var zipArtifactPathCoreClr = artifactsDir.CombineWithFilePath("GitVersion-bin-corefx-v" + semVersion + ".zip");
         var zipArtifactPathDesktop = artifactsDir.CombineWithFilePath("GitVersion-bin-fullfx-v" + semVersion + ".zip");
 
-        var testCoverageOutputFilePath = testCoverageOutputDir.CombineWithFilePath("TestResult.xml");
-
         var releaseNotesOutputFilePath = buildArtifactDir.CombineWithFilePath("releasenotes.md");
         var gemOutputFilePath  = buildArtifactDir.CombineWithFilePath("gitversion-" + version.GemVersion + ".gem");
 
         var vsixSuffix = parameters.IsStableRelease() ? "" : "preview-";
-        var vsixOutputFilePath = buildArtifactDir.CombineWithFilePath("gittools.gitversion-" + vsixSuffix + version.VsixVersion + ".vsix");        
+        var vsixOutputFilePath = buildArtifactDir.CombineWithFilePath("gittools.gitversion-" + vsixSuffix + version.VsixVersion + ".vsix");
 
         // Directories
         var buildDirectories = new BuildDirectories(
             artifactsDir,
             buildArtifactDir,
-            testCoverageOutputDir,
+            testResultsOutputDir,
             nugetRootDir,
             artifactsBinDir,
             artifactsBinFullFxDir,
@@ -65,7 +63,6 @@ public class BuildPaths
             context,
             zipArtifactPathCoreClr,
             zipArtifactPathDesktop,
-            testCoverageOutputFilePath,
             releaseNotesOutputFilePath,
             vsixOutputFilePath,
             gemOutputFilePath);
@@ -82,7 +79,6 @@ public class BuildFiles
 {
     public FilePath ZipArtifactPathCoreClr { get; private set; }
     public FilePath ZipArtifactPathDesktop { get; private set; }
-    public FilePath TestCoverageOutputFilePath { get; private set; }
     public FilePath ReleaseNotesOutputFilePath { get; private set; }
     public FilePath VsixOutputFilePath { get; private set; }
     public FilePath GemOutputFilePath { get; private set; }
@@ -91,15 +87,13 @@ public class BuildFiles
         ICakeContext context,
         FilePath zipArtifactPathCoreClr,
         FilePath zipArtifactPathDesktop,
-        FilePath testCoverageOutputFilePath,
         FilePath releaseNotesOutputFilePath,
         FilePath vsixOutputFilePath,
         FilePath gemOutputFilePath
         )
     {
         ZipArtifactPathCoreClr = zipArtifactPathCoreClr;
         ZipArtifactPathDesktop = zipArtifactPathDesktop;
-        TestCoverageOutputFilePath = testCoverageOutputFilePath;
         ReleaseNotesOutputFilePath = releaseNotesOutputFilePath;
         VsixOutputFilePath = vsixOutputFilePath;
         GemOutputFilePath = gemOutputFilePath;
@@ -111,7 +105,7 @@ public class BuildDirectories
     public DirectoryPath Artifacts { get; private set; }
     public DirectoryPath NugetRoot { get; private set; }
     public DirectoryPath BuildArtifact { get; private set; }
-    public DirectoryPath TestCoverageOutput { get; private set; }
+    public DirectoryPath TestResultsOutput { get; private set; }
     public DirectoryPath ArtifactsBin { get; private set; }
     public DirectoryPath ArtifactsBinFullFx { get; private set; }
     public DirectoryPath ArtifactsBinFullFxPortable { get; private set; }
@@ -123,7 +117,7 @@ public class BuildDirectories
     public BuildDirectories(
         DirectoryPath artifactsDir,
         DirectoryPath buildArtifactDir,
-        DirectoryPath testCoverageOutputDir,
+        DirectoryPath testResultsOutputDir,
         DirectoryPath nugetRootDir,
         DirectoryPath artifactsBinDir,
         DirectoryPath artifactsBinFullFxDir,
@@ -135,7 +129,7 @@ public class BuildDirectories
     {
         Artifacts = artifactsDir;
         BuildArtifact = buildArtifactDir;
-        TestCoverageOutput = testCoverageOutputDir;
+        TestResultsOutput = testResultsOutputDir;
         NugetRoot = nugetRootDir;
         ArtifactsBin = artifactsBinDir;
         ArtifactsBinFullFx = artifactsBinFullFxDir;
@@ -146,7 +140,7 @@ public class BuildDirectories
         ToClean = new[] {
             Artifacts,
             BuildArtifact,
-            TestCoverageOutput,
+            TestResultsOutput,
             NugetRoot,
             ArtifactsBin,
             ArtifactsBinFullFx,

src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -22,6 +22,7 @@
     </PackageReference>
     <PackageReference Include="NUnit" Version="3.12.0" />
     <packagereference Include="NUnit3TestAdapter" Version="3.13.0"></packagereference>
+    <PackageReference Include="NunitXml.TestLogger" Version="2.1.41" />
     <PackageReference Include="Shouldly" Version="4.0.0-beta0002" />
     <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
   </ItemGroup>

src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

@@ -17,6 +17,7 @@
     </PackageReference>
     <PackageReference Include="NUnit" Version="3.12.0"></PackageReference>
     <packagereference Include="NUnit3TestAdapter" Version="3.13.0"></packagereference>
+    <PackageReference Include="NunitXml.TestLogger" Version="2.1.41" />
     <PackageReference Include="Shouldly" Version="4.0.0-beta0002"></PackageReference>
   </ItemGroup>
   <ItemGroup>

src/GitVersionTask.Tests/GitVersionTask.Tests.csproj

@@ -16,6 +16,7 @@
     </PackageReference>
     <PackageReference Include="NUnit" Version="3.12.0"></PackageReference>
     <packagereference Include="NUnit3TestAdapter" Version="3.13.0"></packagereference>
+    <PackageReference Include="NunitXml.TestLogger" Version="2.1.41" />
     <PackageReference Include="Shouldly" Version="4.0.0-beta0002"></PackageReference>
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.0.461" />
   </ItemGroup>