diff --git a/Tasks/Common/utility-common/telemetry.ts b/Tasks/Common/utility-common/telemetry.ts index 5fac14e19637..78f727fdbc78 100644 --- a/Tasks/Common/utility-common/telemetry.ts +++ b/Tasks/Common/utility-common/telemetry.ts @@ -34,10 +34,8 @@ export function emitTelemetry(area: string, feature: string, taskSpecificTelemet 'BUILD_REASON': tl.getVariable('BUILD_REASON'), 'BUILD_REPOSITORY_CLEAN': tl.getVariable('BUILD_REPOSITORY_CLEAN'), 'BUILD_REPOSITORY_GIT_SUBMODULECHECKOUT': tl.getVariable('BUILD_REPOSITORY_GIT_SUBMODULECHECKOUT'), - 'BUILD_REPOSITORY_ID': tl.getVariable('BUILD_REPOSITORY_ID'), 'BUILD_REPOSITORY_NAME': tl.getVariable('BUILD_REPOSITORY_NAME'), 'BUILD_REPOSITORY_PROVIDER': tl.getVariable('BUILD_REPOSITORY_PROVIDER'), - 'BUILD_REPOSITORY_URI': tl.getVariable('BUILD_REPOSITORY_URI'), 'BUILD_SOURCEVERSION': tl.getVariable('BUILD_SOURCEVERSION'), 'agent.proxyurl': tl.getVariable("agent.proxyurl") }; diff --git a/Tasks/Npm/Tests/L0.ts b/Tasks/Npm/Tests/L0.ts index 7d8ada81b6c8..53ad36e60b74 100644 --- a/Tasks/Npm/Tests/L0.ts +++ b/Tasks/Npm/Tests/L0.ts @@ -36,7 +36,7 @@ describe('Npm Task', function () { // npm failure dumps log it('npm failure dumps debug log from npm cache', (done: MochaDone) => { - this.timeout(1000); + this.timeout(3000); const debugLog = 'NPM_DEBUG_LOG'; let tp = path.join(__dirname, 'npm-failureDumpsLog-cacheDir.js'); @@ -51,7 +51,7 @@ describe('Npm Task', function () { }); it('npm failure dumps debug log from working directory', (done: MochaDone) => { - this.timeout(1000); + this.timeout(3000); const debugLog = 'NPM_DEBUG_LOG'; let tp = path.join(__dirname, 'npm-failureDumpsLog-workingDir.js'); diff --git a/Tasks/Npm/npm.ts b/Tasks/Npm/npm.ts index 9d39d2e19ca1..972ccbdddde5 100644 --- a/Tasks/Npm/npm.ts +++ b/Tasks/Npm/npm.ts @@ -66,7 +66,6 @@ async function _logNpmStartupVariables() { let npmTelem = { 'command': command, - 'customCommand': tl.getInput(NpmTaskInput.CustomCommand), 'verbose': tl.getInput(NpmTaskInput.Verbose), 'customRegistry': tl.getInput(NpmTaskInput.CustomRegistry), 'customFeed': tl.getInput(NpmTaskInput.CustomFeed), diff --git a/Tasks/Npm/package-lock.json b/Tasks/Npm/package-lock.json index 7b0d69b80cbc..1f49f490e51c 100644 --- a/Tasks/Npm/package-lock.json +++ b/Tasks/Npm/package-lock.json @@ -1,6 +1,6 @@ { "name": "vsts-npm-task", - "version": "1.0.14", + "version": "1.0.15", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -105,6 +105,11 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" }, + "semver-compare": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", + "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=" + }, "shelljs": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", @@ -139,7 +144,8 @@ "requires": { "semver": "5.5.0", "vso-node-api": "6.0.1-preview", - "vsts-task-lib": "2.0.6" + "vsts-task-lib": "2.0.6", + "vsts-task-tool-lib": "0.4.0" }, "dependencies": { "vso-node-api": { @@ -182,6 +188,42 @@ "shelljs": "0.3.0", "uuid": "3.2.1" } + }, + "vsts-task-tool-lib": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/vsts-task-tool-lib/-/vsts-task-tool-lib-0.4.0.tgz", + "integrity": "sha1-zOtRxyh3yWTI5E3p7eovZfyKyPk=", + "requires": { + "semver": "5.5.0", + "semver-compare": "1.0.0", + "typed-rest-client": "0.9.0", + "uuid": "3.2.1", + "vsts-task-lib": "2.0.4-preview" + }, + "dependencies": { + "typed-rest-client": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-0.9.0.tgz", + "integrity": "sha1-92jMDcP06VDwbgSCXDaz54NKofI=", + "requires": { + "tunnel": "0.0.4", + "underscore": "1.8.3" + } + }, + "vsts-task-lib": { + "version": "2.0.4-preview", + "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.4-preview.tgz", + "integrity": "sha1-nU63UAoL2a1Z429w8iqtxuK6+NI=", + "requires": { + "minimatch": "3.0.4", + "mockery": "1.7.0", + "q": "1.5.1", + "semver": "5.5.0", + "shelljs": "0.3.0", + "uuid": "3.2.1" + } + } + } } } } diff --git a/Tasks/Npm/package.json b/Tasks/Npm/package.json index 33cf41f6e298..dc13414bce54 100644 --- a/Tasks/Npm/package.json +++ b/Tasks/Npm/package.json @@ -1,6 +1,6 @@ { "name": "vsts-npm-task", - "version": "1.0.14", + "version": "1.0.15", "description": "VSTS NPM Task", "main": "npmtask.js", "scripts": { diff --git a/Tasks/Npm/task.json b/Tasks/Npm/task.json index be0343a2bb60..147f9294180e 100644 --- a/Tasks/Npm/task.json +++ b/Tasks/Npm/task.json @@ -9,7 +9,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 14 + "Patch": 15 }, "runsOn": [ "Agent", diff --git a/Tasks/Npm/task.loc.json b/Tasks/Npm/task.loc.json index bd9dddb88a87..34f13f278bd4 100644 --- a/Tasks/Npm/task.loc.json +++ b/Tasks/Npm/task.loc.json @@ -9,7 +9,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 14 + "Patch": 15 }, "runsOn": [ "Agent", diff --git a/Tasks/NuGetCommand/nugetcommandmain.ts b/Tasks/NuGetCommand/nugetcommandmain.ts index cc6b8be06a22..489e8aacf193 100644 --- a/Tasks/NuGetCommand/nugetcommandmain.ts +++ b/Tasks/NuGetCommand/nugetcommandmain.ts @@ -89,7 +89,6 @@ function _logNugetStartupVariables(nuGetPath: string, nugetVersion: string) { } let nugetTelem = { 'command': tl.getInput('command'), - 'arguments': tl.getInput('arguments'), 'NUGET_EXE_TOOL_PATH_ENV_VAR': tl.getVariable(nuGetGetter.NUGET_EXE_TOOL_PATH_ENV_VAR), 'NUGET_EXE_CUSTOM_LOCATION': tl.getVariable(NUGET_EXE_CUSTOM_LOCATION), 'searchPatternPack': tl.getPathInput('searchPatternPack'), diff --git a/Tasks/NuGetCommand/package-lock.json b/Tasks/NuGetCommand/package-lock.json index 241423fa0e57..79ab957298b9 100644 --- a/Tasks/NuGetCommand/package-lock.json +++ b/Tasks/NuGetCommand/package-lock.json @@ -1,6 +1,6 @@ { "name": "nugetcommand", - "version": "2.0.26", + "version": "2.0.27", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -121,7 +121,46 @@ "requires": { "semver": "5.5.0", "vso-node-api": "6.0.1-preview", - "vsts-task-lib": "2.0.6" + "vsts-task-lib": "2.0.6", + "vsts-task-tool-lib": "0.4.0" + }, + "dependencies": { + "typed-rest-client": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-0.9.0.tgz", + "integrity": "sha1-92jMDcP06VDwbgSCXDaz54NKofI=", + "requires": { + "tunnel": "0.0.4", + "underscore": "1.8.3" + } + }, + "vsts-task-tool-lib": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/vsts-task-tool-lib/-/vsts-task-tool-lib-0.4.0.tgz", + "integrity": "sha1-zOtRxyh3yWTI5E3p7eovZfyKyPk=", + "requires": { + "semver": "5.5.0", + "semver-compare": "1.0.0", + "typed-rest-client": "0.9.0", + "uuid": "3.2.1", + "vsts-task-lib": "2.0.4-preview" + }, + "dependencies": { + "vsts-task-lib": { + "version": "2.0.4-preview", + "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.4-preview.tgz", + "integrity": "sha1-nU63UAoL2a1Z429w8iqtxuK6+NI=", + "requires": { + "minimatch": "3.0.4", + "mockery": "1.7.0", + "q": "1.5.1", + "semver": "5.5.0", + "shelljs": "0.3.0", + "uuid": "3.2.1" + } + } + } + } } }, "uuid": { @@ -188,4 +227,4 @@ } } } -} \ No newline at end of file +} diff --git a/Tasks/NuGetCommand/package.json b/Tasks/NuGetCommand/package.json index 7ea840e30ceb..8e5b5e25c968 100644 --- a/Tasks/NuGetCommand/package.json +++ b/Tasks/NuGetCommand/package.json @@ -1,6 +1,6 @@ { "name": "nugetcommand", - "version": "2.0.26", + "version": "2.0.27", "description": "Restore, pack, or push NuGet packages, or run a NuGet command.", "main": "nugetcommandmain.js", "scripts": { diff --git a/Tasks/NuGetCommand/task.json b/Tasks/NuGetCommand/task.json index adba2dbb3841..deaf121e12e2 100644 --- a/Tasks/NuGetCommand/task.json +++ b/Tasks/NuGetCommand/task.json @@ -9,7 +9,7 @@ "version": { "Major": 2, "Minor": 0, - "Patch": 26 + "Patch": 27 }, "runsOn": [ "Agent", diff --git a/Tasks/NuGetCommand/task.loc.json b/Tasks/NuGetCommand/task.loc.json index e8561b871f5e..24482c80f1a5 100644 --- a/Tasks/NuGetCommand/task.loc.json +++ b/Tasks/NuGetCommand/task.loc.json @@ -9,7 +9,7 @@ "version": { "Major": 2, "Minor": 0, - "Patch": 26 + "Patch": 27 }, "runsOn": [ "Agent", @@ -524,4 +524,4 @@ "Warning_UpdatingNuGetVersion": "ms-resource:loc.messages.Warning_UpdatingNuGetVersion", "Error_NugetFailedWithCodeAndErr": "ms-resource:loc.messages.Error_NugetFailedWithCodeAndErr" } -} \ No newline at end of file +}