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

Update secure files common to azure-devops-node-api v7.2 #10070

Merged
merged 1 commit into from
Apr 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
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
67 changes: 41 additions & 26 deletions Tasks/AndroidSigningV2/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/AndroidSigningV2/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": 150,
"Minor": 151,
"Patch": 0
},
"demands": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AndroidSigningV2/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": 150,
"Minor": 151,
"Patch": 0
},
"demands": [
Expand Down
67 changes: 41 additions & 26 deletions Tasks/AndroidSigningV3/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/AndroidSigningV3/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 3,
"Minor": 150,
"Minor": 151,
"Patch": 0
},
"releaseNotes": "This version of the task uses apksigner instead of jarsigner to sign APKs.",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AndroidSigningV3/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 3,
"Minor": 150,
"Minor": 151,
"Patch": 0
},
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down
66 changes: 42 additions & 24 deletions Tasks/Common/securefiles-common/package-lock.json

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

6 changes: 4 additions & 2 deletions Tasks/Common/securefiles-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
},
"homepage": "https://github.com/Microsoft/azure-pipelines-tasks#readme",
"dependencies": {
"azure-pipelines-task-lib": "^2.8.0",
"vso-node-api": "6.5.0"
"@types/node": "^6.0.0",
"@types/q": "^1.5.2",
"azure-devops-node-api": "7.2.0",
"azure-pipelines-task-lib": "^2.8.0"
}
}
8 changes: 4 additions & 4 deletions Tasks/Common/securefiles-common/securefiles-common.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import * as fs from 'fs';
import * as Q from 'q';
import * as tl from 'azure-pipelines-task-lib/task';
import * as vsts from 'vso-node-api';
import { getPersonalAccessTokenHandler, WebApi } from 'azure-devops-node-api';

export class SecureFileHelpers {
serverConnection: vsts.WebApi;
serverConnection: WebApi;

constructor() {
const serverUrl: string = tl.getVariable('System.TeamFoundationCollectionUri');
const serverCreds: string = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false);
const authHandler = vsts.getPersonalAccessTokenHandler(serverCreds);
const authHandler = getPersonalAccessTokenHandler(serverCreds);

const proxy = tl.getHttpProxyConfiguration();
const options = proxy ? { proxy, ignoreSslError: true } : undefined;

this.serverConnection = new vsts.WebApi(serverUrl, authHandler, options);
this.serverConnection = new WebApi(serverUrl, authHandler, options);
}

/**
Expand Down
8 changes: 0 additions & 8 deletions Tasks/Common/securefiles-common/typings.json

This file was deleted.

Loading