Updated azure-pipelines-task-lib version

microsoft · Mar 9, 2020 · d68da0c · d68da0c
1 parent 7c5f125
commit d68da0c
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 98 deletions.
diff --git a/Tasks/XamarinTestCloudV1/package-lock.json b/Tasks/XamarinTestCloudV1/package-lock.json
diff --git a/Tasks/XamarinTestCloudV1/package.json b/Tasks/XamarinTestCloudV1/package.json
@@ -17,6 +17,6 @@
   },
   "homepage": "https://github.com/Microsoft/azure-pipelines-tasks#readme",
   "dependencies": {
-    "vsts-task-lib": "^0.9.20"
+    "azure-pipelines-task-lib": "^2.9.3"
   }
 }
diff --git a/Tasks/XamarinTestCloudV1/task.json b/Tasks/XamarinTestCloudV1/task.json
@@ -13,8 +13,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 151,
-        "Patch": 1
+        "Minor": 167,
+        "Patch": 0
     },
     "demands": [],
     "minimumAgentVersion": "1.83.0",

diff --git a/Tasks/XamarinTestCloudV1/task.loc.json b/Tasks/XamarinTestCloudV1/task.loc.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 151,
-    "Patch": 1
+    "Minor": 167,
+    "Patch": 0
   },
   "demands": [],
   "minimumAgentVersion": "1.83.0",

diff --git a/Tasks/XamarinTestCloudV1/xamarintestcloud.ts b/Tasks/XamarinTestCloudV1/xamarintestcloud.ts
@@ -1,10 +1,7 @@
-/// <reference path="../../definitions/vsts-task-lib.d.ts" />
-/// <reference path="../../definitions/shelljs.d.ts" />
-
-import fs = require('fs');
+import fs = require('fs');
 import path = require('path');
 import os = require('os');
-import tl = require('vsts-task-lib/task');
+import tl = require('azure-pipelines-task-lib/task');
 
 var isWin = /^win/.test(process.platform);
 
@@ -26,7 +23,10 @@ var publishNUnitResults = tl.getInput('publishNUnitResults', false);
 // Define error handler
 var onError = function (errorMsg) {
     tl.error(errorMsg);
-    tl.exit(1);
+
+    // This code came from here: https://github.com/microsoft/azure-pipelines-task-lib/blob/releases/0.7/node/lib/task.ts 'exit(1)'
+    tl.setResult(tl.TaskResult.Failed, tl.loc('LIB_ReturnCode', 1));
+    process.exit(0);
 }
 
 function findFiles(pattern: string) : string [] {
@@ -66,7 +66,7 @@ function findFiles(pattern: string) : string [] {
 
         // Find files matching the specified pattern
         tl.debug('Matching glob pattern: ' + pattern);
-        filesList = tl.match(allFiles, pattern, matchOptions);
+        filesList = tl.match(allFiles, pattern, null, matchOptions);
     }
     return filesList;
 }
@@ -179,10 +179,10 @@ function publishTestResults() {
     if (publishNUnitResults == 'true') {
 
         var allFiles = tl.find(testDir);
-        var matchingTestResultsFiles = tl.match(allFiles, 'xamarintest_' + buildId + '*.xml', {matchBase: true});
+        var matchingTestResultsFiles = tl.match(allFiles, 'xamarintest_' + buildId + '*.xml', null, {matchBase: true}) || [];
 
         var tp = new tl.TestPublisher("NUnit");
-        tp.publish(matchingTestResultsFiles, false, "", "", "", "");
+        tp.publish(matchingTestResultsFiles.toString(), "", "", "", "", "");
     }
 }
 
@@ -233,7 +233,7 @@ var submitToTestCloud = function (index) {
         var ipaFolder = path.dirname(path.dirname(appFiles[index]));
         tl.debug('Checking for dSYM files under: ' + ipaFolder);
         var alldsymFiles = tl.find(ipaFolder);
-        var dsymFiles = tl.match(alldsymFiles, dsym, {matchBase: true});
+        var dsymFiles = tl.match(alldsymFiles, dsym, null, {matchBase: true});
 
         if (!dsymFiles || dsymFiles.length == 0) {
             tl.warning('No matching dSYM files were found with pattern: ' + dsym);

diff --git a/Tasks/XamariniOSV2/package-lock.json b/Tasks/XamariniOSV2/package-lock.json
diff --git a/Tasks/XamariniOSV2/task.json b/Tasks/XamariniOSV2/task.json
@@ -12,7 +12,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 166,
+        "Minor": 167,
         "Patch": 0
     },
     "releaseNotes": "iOS signing set up has been removed from the task. Use `Secure Files` with supporting tasks `Install Apple Certificate` and `Install Apple Provisioning Profile` to setup signing. Updated options to work better with `Visual Studio for Mac`.",

diff --git a/Tasks/XamariniOSV2/task.loc.json b/Tasks/XamariniOSV2/task.loc.json
@@ -12,7 +12,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 166,
+    "Minor": 167,
     "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",