Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated azure-pipelines-task-lib version #12497

Merged
merged 3 commits into from
Mar 9, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 20 additions & 72 deletions Tasks/XamarinTestCloudV1/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/XamarinTestCloudV1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions Tasks/XamarinTestCloudV1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 151,
"Patch": 1
"Minor": 167,
"Patch": 0
},
"demands": [],
"minimumAgentVersion": "1.83.0",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/XamarinTestCloudV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 151,
"Patch": 1
"Minor": 167,
"Patch": 0
},
"demands": [],
"minimumAgentVersion": "1.83.0",
Expand Down
20 changes: 10 additions & 10 deletions Tasks/XamarinTestCloudV1/xamarintestcloud.ts
Original file line number Diff line number Diff line change
@@ -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);

Expand All @@ -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 [] {
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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(), "", "", "", "", "");
}
}

Expand Down Expand Up @@ -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);
Expand Down
31 changes: 22 additions & 9 deletions Tasks/XamariniOSV2/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/XamariniOSV2/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -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`.",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/XamariniOSV2/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 166,
"Minor": 167,
"Patch": 0
},
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down