Adjust MTP detection (#21315)

* Adjust MTP detection

* Update minor to 263

* Update minor to 263

* Handle errors reading global.json, just in case.

Added error handling when parsing global.json for test runner.

* updated task.loc.json

---------

Co-authored-by: Youssef1313 <[email protected]>
Co-authored-by: azure-pipelines-bot <[email protected]>
Co-authored-by: rishabhmalikMS <[email protected]>

Author: 4 people

Tasks/DotNetCoreCLIV2/dotnetcore.ts

@@ -3,7 +3,7 @@ import tr = require("azure-pipelines-task-lib/toolrunner");
 import path = require("path");
 import fs = require("fs");
 import ltx = require("ltx");
-import * as toml from 'toml';
+import * as JSON5 from 'json5';
 var archiver = require('archiver');
 var uuidV4 = require('uuid/v4');
 const nodeVersion = parseInt(process.version.split('.')[0].replace('v', ''));
@@ -147,12 +147,24 @@ export class dotNetExe {
     }
 
     private getIsMicrosoftTestingPlatform(): boolean {
-        if (!tl.exist("dotnet.config")) {
+        if (!tl.exist("global.json")) {
+            tl.debug("global.json not found. Test run is VSTest");
             return false;
         }
 
-        let dotnetConfig = fs.readFileSync("dotnet.config", 'utf8');
-        return toml.parse(dotnetConfig).dotnet?.test?.runner?.name === 'Microsoft.Testing.Platform';
+        let globalJsonContents = fs.readFileSync("global.json", 'utf8');
+        if (!globalJsonContents.length) {
+            return false;
+        }
+
+        try {
+            const testRunner = JSON5.parse(globalJsonContents)?.test?.runner;
+            tl.debug(`global.json is found. Test run is read as '${testRunner}'`);
+            return testRunner === 'Microsoft.Testing.Platform';
+        } catch (error) {
+            tl.warning(`Error occurred reading global.json: ${error}`);
+            return false;
+        }
     }
 
     private async executeTestCommand(): Promise<void> {

Tasks/DotNetCoreCLIV2/package-lock.json

@@ -26,7 +26,7 @@
     "azure-pipelines-task-lib": "4.16.0",
     "azure-pipelines-tasks-packaging-common": "3.246.2",
     "azure-pipelines-tasks-utility-common": "3.258.0",
-    "toml": "^3.0.0",
+    "json5": "^2.2.3",
     "uuid": "3.2.1"
   },
   "devDependencies": {

Tasks/DotNetCoreCLIV2/package.json

@@ -17,7 +17,7 @@
   "demands": [],
   "version": {
     "Major": 2,
-    "Minor": 259,
+    "Minor": 263,
     "Patch": 0
   },
   "minimumAgentVersion": "2.144.0",
@@ -604,4 +604,4 @@
     "Error_IncludeNuGetOrgEnabled": "Packages failed to restore. Edit your build task and set 'includeNuGetOrg' to 'false' or deselect 'Use packages from NuGet.org'.",
     "Warning_UnsupportedServiceConnectionAuth": "The service connection does not use a supported authentication method. Please use a service connection with personal access token based auth."
   }
-}
+}

Tasks/DotNetCoreCLIV2/task.json

@@ -17,7 +17,7 @@
   "demands": [],
   "version": {
     "Major": 2,
-    "Minor": 259,
+    "Minor": 263,
     "Patch": 0
   },
   "minimumAgentVersion": "2.144.0",