Optimizing the performance of CoveragePublisher for all scenarios (#1…

…8281) * Updated TestAgent version from 2.205.0 to 2.210.0 * Optimize the performance of the CoveragePublisher * Added binaries for linux and macos agents
microsoft · Jun 9, 2023 · 7acfb8e · 7acfb8e
1 parent 3a0ab37
commit 7acfb8e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/Tasks/Common/coveragepublisher/coveragepublisher.ts b/Tasks/Common/coveragepublisher/coveragepublisher.ts
@@ -5,6 +5,7 @@ import * as os from 'os';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as UUID from 'uuid/v4';
+import {execSync} from 'child_process';
 
 export async function PublishCodeCoverage(inputFiles: string[], sourceDirectory?: string) {
     var reportDirectory = path.join(getTempFolder(), UUID());
@@ -28,19 +29,38 @@ async function publishCoverage(inputFiles: string[], reportDirectory: string, pa
         return false;
     }
 
-    if (!dotnetPath && osvar === 'win32') {
+    if (osvar === 'win32') {
         // use full .NET to execute
         dotnet = taskLib.tool(path.join(__dirname, 'CoveragePublisher', 'CoveragePublisher.Console.exe'));
-    } else {
+    } 
+    else if(osvar==='linux')
+    {
+         // use full .NET to execute
+        var filepath=path.join(__dirname, 'CoveragePublisher','linux-x64', 'CoveragePublisher.Console');
+        execSync('chmod +x '+filepath);
+        dotnet=taskLib.tool(filepath);
+    }
+    else if(osvar==='darwin')
+    {
+         // use full .NET to execute
+        var filepath=path.join(__dirname, 'CoveragePublisher', 'osx-x64', 'CoveragePublisher.Console');
+        execSync('chmod +x '+filepath);
+        dotnet=taskLib.tool(filepath);
+    }
+    else{
         dotnet = taskLib.tool(dotnetPath);
         dotnet.arg(path.join(__dirname, "CoveragePublisher", 'CoveragePublisher.Console.dll'));
     }
 
-    dotnet.arg('"' + inputFiles.join('" "') + '"');
-    dotnet.arg('--reportDirectory ' + reportDirectory);
+    for (const inputFile of inputFiles) {
+        dotnet.arg(inputFile);
+    }
+    dotnet.arg('--reportDirectory');
+    dotnet.arg(reportDirectory);
 
     if(!isNullOrWhitespace(pathToSources)) {
-        dotnet.arg('--sourceDirectory ' + pathToSources);
+        dotnet.arg('--sourceDirectory');
+        dotnet.arg(pathToSources);
     }
 
     try {

diff --git a/Tasks/Common/coveragepublisher/make.json b/Tasks/Common/coveragepublisher/make.json
@@ -2,7 +2,7 @@
     "externals": {
         "archivePackages": [
             {
-                "url": "https://coveragepublishers.blob.core.windows.net/coveragepublisher/19631413/CoveragePublisher.zip",
+                "url": "https://coveragepublishers.blob.core.windows.net/coveragepublisher/20071190/CoveragePublisher.zip",
                 "dest": "./"
             }
         ]

diff --git a/Tasks/PublishCodeCoverageResultsV2/task.json b/Tasks/PublishCodeCoverageResultsV2/task.json
@@ -15,7 +15,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 221,
+        "Minor": 223,
         "Patch": 0
     },
     "demands": [],

diff --git a/Tasks/PublishCodeCoverageResultsV2/task.loc.json b/Tasks/PublishCodeCoverageResultsV2/task.loc.json
@@ -15,7 +15,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 221,
+    "Minor": 223,
     "Patch": 0
   },
   "demands": [],