Skip to content

Commit 737d3db

Browse files
committed
bundle 7zr
1 parent ecf688e commit 737d3db

File tree

13 files changed

+58
-3695
lines changed

13 files changed

+58
-3695
lines changed

Tasks/NodeToolV0/make.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
{
2-
"taskResources": [
3-
"trynodetool.sh"
2+
"externals": {
3+
"archivePackages": [
4+
{
5+
"archiveName": "7zr.zip",
6+
"url": "https://vstsagenttools.blob.core.windows.net/tools/7zr/1805_x86/7zr.zip",
7+
"dest": "./"
8+
}
49
]
10+
}
511
}

Tasks/NodeToolV0/nodetool.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
//import toolLib = require('vsts-task-tool-lib/tool');
2-
//import taskLib = require('vsts-task-lib/task');
3-
import * as toolLib from 'vsts-task-tool-lib/tool';
41
import * as taskLib from 'vsts-task-lib/task';
2+
import * as toolLib from 'vsts-task-tool-lib/tool';
53
import * as restm from 'typed-rest-client/RestClient';
64
import * as os from 'os';
75
import * as path from 'path';
@@ -159,8 +157,8 @@ async function acquireNode(version: string): Promise<string> {
159157
throw new Error('Expected Agent.TempDirectory to be set');
160158
}
161159

162-
extPath = path.join(extPath, 'n'); // use as short a path as possible due to nested node_modules folders
163-
extPath = await toolLib.extract7z(downloadPath, extPath);
160+
let _7zPath = path.join(__dirname, '7zr.exe');
161+
extPath = await toolLib.extract7z(downloadPath, extPath, _7zPath);
164162
}
165163
else {
166164
extPath = await toolLib.extractTar(downloadPath);

Tasks/NodeToolV0/package-lock.json

Lines changed: 40 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/NodeToolV0/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
},
2323
"homepage": "https://github.com/microsoft/vsts-tasks#readme",
2424
"dependencies": {
25-
"vsts-task-tool-lib": "0.4.0"
25+
"@types/node": "^6.0.101",
26+
"@types/q": "^1.0.7",
27+
"typed-rest-client": "1.0.7",
28+
"vsts-task-lib": "2.4.0",
29+
"vsts-task-tool-lib": "0.9.0"
2630
}
2731
}

Tasks/NodeToolV0/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "Microsoft Corporation",
1313
"version": {
1414
"Major": 0,
15-
"Minor": 124,
15+
"Minor": 136,
1616
"Patch": 0
1717
},
1818
"satisfies": ["Node"],

Tasks/NodeToolV0/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "Microsoft Corporation",
1313
"version": {
1414
"Major": 0,
15-
"Minor": 124,
15+
"Minor": 136,
1616
"Patch": 0
1717
},
1818
"satisfies": [

Tasks/NodeToolV0/typings/globals/mocha/index.d.ts

Lines changed: 0 additions & 202 deletions
This file was deleted.

Tasks/NodeToolV0/typings/globals/mocha/typings.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)