Re apply PR 936 - Fix Build Problems (#1166)

* - cherry-pick for PR 936

* - fixed build problem with npm update

Author: Ozan AYDIN

Extensions/ExternalTfs/Src/Tasks/DownloadArtifactsTfsGit/downloadTfGit.js

@@ -1,7 +1,6 @@
 var tl = require('vsts-task-lib/task');
 var path = require('path');
-var webApim = require('vso-node-api/WebApi');
-var gitInterfaces = require('vso-node-api/interfaces/GitInterfaces');
+var webApim = require('azure-devops-node-api/WebApi');
 var Q = require('q');
 var url = require('url');
 var shell = require("shelljs");
@@ -111,10 +110,12 @@ Q.resolve(gitRepositoryPromise).then( function (gitRepository) {
 
 function getRepositoryDetails(tfsEndpoint, repositoryId, projectId){
     var handler = webApim.getBasicHandler(tfsEndpoint.Username, tfsEndpoint.Password);
-    var gitClient = new webApim.WebApi(tfsEndpoint.Url, handler).getGitApi();
-    var promise = gitClient.getRepository(repositoryId, projectId);
-
-    return promise;
+    var webApi = new webApim.WebApi(tfsEndpoint.Url, handler);
+    var gitClientPromise = webApi.getGitApi();
+    Q.resolve(gitClientPromise).then( function (gitClient) {
+        var promise = gitClient.getRepository(repositoryId, projectId);
+        return promise;
+    });
 }
 
 function getEndpointDetails(inputFieldName) {

Extensions/ExternalTfs/Src/Tasks/DownloadArtifactsTfsGit/gitwrapper.js

@@ -70,7 +70,7 @@ var GitWrapper = (function (_super) {
         git.on('debug', function (message) {
             if (options.debugOutput) {
                 var repl = message.replace(creds, '...');
-                repl = message.replace(escapedCreds, '...');
+                repl = repl.replace(escapedCreds, '...');
                 _this.emit('stdout', '[debug]' + repl);
             }
         });

Extensions/ExternalTfs/Src/Tasks/DownloadArtifactsTfsGit/package-lock.json

@@ -2,7 +2,7 @@
   "name": "DownloadArtifactsTfsGit",
   "main": "download.js",
   "dependencies": {
-    "vso-node-api": "6.0.1-preview",
+    "azure-devops-node-api": "10.2.1",
     "vsts-task-lib": "2.0.5"
   }
 }

Extensions/ExternalTfs/Src/Tasks/DownloadArtifactsTfsGit/package.json

@@ -13,8 +13,8 @@
   "demands": [],
   "version": {
     "Major": 15,
-    "Minor": 223,
-    "Patch": 2
+    "Minor": 225,
+    "Patch": 0
   },
   "minimumAgentVersion": "1.99.0",
   "instanceNameFormat": "Download Artifacts - External TFS Git",

Extensions/ExternalTfs/Src/Tasks/DownloadArtifactsTfsGit/task.json

@@ -1,8 +1,6 @@
 var shell = require('shelljs');
 var path = require('path');
 var tl = require('vsts-task-lib/task');
-var webApim = require('vso-node-api/WebApi');
-var tfvcInterfaces = require('vso-node-api/interfaces/TfvcInterfaces');
 var Q = require('q');
 var url = require('url');
 var tfvcwm = require('./tfvcwrapper');
@@ -17,7 +15,7 @@ console.log("project: " + projectId.toString());
 console.log("definition: " + repositoryId.toString());
 console.log("version: " + (!!changesetId ? changesetId.toString() : "Latest"));
 console.log("downloadPath: " + downloadPath.toString());
-console.log("tfsEndpoint:" + JSON.stringify(tfsEndpoint));
+console.log("tfsEndpoint:" + JSON.stringify(tfsEndpoint.Url));
 
 var tfvcw = new tfvcwm.TfvcWrapper();
 tfvcw.on('stdout', function (data) {