Migrate NuGetCommandV2 to NodeJS10 (#16826)

* Migrate NuGetCommandV2 to NodeJS10

* task versino bump

* fixing errors

* fix cloud build

* update

* test cases fix!

* fix

* replace deprecated method

* try to fix test cases timeout

* removing first test case to see the behavior

* try to fix

* changed the timeout from 10000 back to 1000

* removing commons in make.json

Author: tintse-thxsky-MSFT

Tasks/NuGetCommandV2/Common/VstsNuGetPushToolRunner.ts

@@ -1,6 +1,6 @@
 import * as tl from "azure-pipelines-task-lib/task";
 import {IExecOptions, IExecSyncResult, ToolRunner} from "azure-pipelines-task-lib/toolrunner";
-import * as auth from "packaging-common/nuget/Authentication";
+import * as auth from "azure-pipelines-tasks-packaging-common-v3/nuget/Authentication";
 
 export interface VstsNuGetPushSettings {
     continueOnConflict: boolean;

Tasks/NuGetCommandV2/Common/VstsNuGetPushToolUtilities.ts

@@ -1,6 +1,6 @@
 // Placed as a separate file for the purpose of unit testing
 import * as path from "path";
-import * as commandHelper from "packaging-common/nuget/CommandHelper";
+import * as commandHelper from "azure-pipelines-tasks-packaging-common-v3/nuget/CommandHelper";
 
 export function getBundledVstsNuGetPushLocation(): string {
     const vstsNuGetPushPaths: string[] = ["VstsNuGetPush/0.19.0/tools"];

Tasks/NuGetCommandV2/Tests/L0.ts

@@ -9,7 +9,7 @@ describe('NuGetCommand Suite', function () {
     after(() => {
     });
 
-    it('restore single solution', (done: MochaDone) => {
+    it('restore single solution', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/singlesln.js')
@@ -23,9 +23,9 @@ describe('NuGetCommand Suite', function () {
         assert(tr.succeeded, 'should have succeeded');
         assert.equal(tr.errorIssues.length, 0, "should have no errors");
         done();
-    });
+    }).timeout(20000);
 
-    it('restore single solution with CredentialProvider', (done: MochaDone) => {
+    it('restore single solution with CredentialProvider', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/singleslnCredentialProvider.js')
@@ -43,7 +43,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('restore packages.config', (done: MochaDone) => {
+    it('restore packages.config', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/pkgconfig.js')
@@ -59,7 +59,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('restore single solution with noCache', (done: MochaDone) => {
+    it('restore single solution with noCache', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/singleslnNoCache.js')
@@ -75,7 +75,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('restore single solution with disableParallelProcessing', (done: MochaDone) => {
+    it('restore single solution with disableParallelProcessing', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/singleslnDisableParallelProcessing.js')
@@ -91,7 +91,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('restore single solution with nuget config', (done: MochaDone) => {
+    it('restore single solution with nuget config', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/singleslnConfigFile.js')
@@ -107,7 +107,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('restore multiple solutions', (done: MochaDone) => {
+    it('restore multiple solutions', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/multiplesln.js')
@@ -124,7 +124,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('restore multiple solutions and parses pattern appropriately', (done: MochaDone) => {
+    it('restore multiple solutions and parses pattern appropriately', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/multipleslnmultiplepattern.js')
@@ -141,7 +141,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('restore single solution mono', (done: MochaDone) => {
+    it('restore single solution mono', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/singleslnMono.js')
@@ -156,7 +156,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('restore select vsts source', (done: MochaDone) => {
+    it('restore select vsts source', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/selectSourceVsts.js')
@@ -171,7 +171,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-        it('restore select nuget.org source', (done: MochaDone) => {
+        it('restore select nuget.org source', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/selectSourceNuGetOrg.js')
@@ -186,7 +186,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('restore select multiple sources', (done: MochaDone) => {
+    it('restore select multiple sources', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/selectSourceMultiple.js')
@@ -201,7 +201,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('pushes successfully to internal feed using NuGet.exe', (done: MochaDone) => {
+    it('pushes successfully to internal feed using NuGet.exe', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PublishTests/internalFeedNuGet.js')
@@ -217,7 +217,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('pushes successfully to internal feed using VstsNuGetPush.exe', (done: MochaDone) => {
+    it('pushes successfully to internal feed using VstsNuGetPush.exe', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PublishTests/internalFeedVstsNuGetPush.js')
@@ -233,7 +233,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('pushes successfully to internal project scoped feed using VstsNuGetPush.exe', (done: MochaDone) => {
+    it('pushes successfully to internal project scoped feed using VstsNuGetPush.exe', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PublishTests/internalFeedVstsNuGetPushProjectScoped.js')
@@ -249,7 +249,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('succeeds when conflict occurs using VstsNuGetPush.exe (allow conflict)', (done: MochaDone) => {
+    it('succeeds when conflict occurs using VstsNuGetPush.exe (allow conflict)', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PublishTests/internalFeedVstsNuGetPushAllowConflict.js')
@@ -265,7 +265,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('succeeds when conflict occurs using NuGet.exe on Linux (allow conflict)', (done: MochaDone) => {
+    it('succeeds when conflict occurs using NuGet.exe on Linux (allow conflict)', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PublishTests/failWithContinueOnConflictOnLinux.js')
@@ -279,7 +279,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('fails when conflict occurs using VstsNuGetPush.exe (disallow conflict)', (done: MochaDone) => {
+    it('fails when conflict occurs using VstsNuGetPush.exe (disallow conflict)', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PublishTests/internalFeedVstsNuGetPushDisallowConflict.js')
@@ -294,7 +294,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('packs with prerelease', (done: MochaDone) => {
+    it('packs with prerelease', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PackTests/packPrerelease.js')
@@ -310,7 +310,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('packs with env var', (done: MochaDone) => {
+    it('packs with env var', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PackTests/packEnvVar.js')
@@ -326,7 +326,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('packs with build number', (done: MochaDone) => {
+    it('packs with build number', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PackTests/packBuildNumber.js')
@@ -342,7 +342,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('packs with base path', (done: MochaDone) => {
+    it('packs with base path', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PackTests/packBasePath.js')
@@ -358,7 +358,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('packs tool', (done: MochaDone) => {
+    it('packs tool', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PackTests/packTool.js')
@@ -374,7 +374,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('works with custom command happy path', (done: MochaDone) => {
+    it('works with custom command happy path', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './CustomCommandTests/customHappyPath.js')
@@ -390,7 +390,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('restore single solution with nuget config and multiple service connections', (done: MochaDone) => {
+    it('restore single solution with nuget config and multiple service connections', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/multipleServiceConnections.js')
@@ -409,7 +409,7 @@ describe('NuGetCommand Suite', function () {
     });
 
 
-    it('custom command fails when exit code !=0', (done: MochaDone) => {
+    it('custom command fails when exit code !=0', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './CustomCommandTests/customFailPath.js')
@@ -421,7 +421,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('pack fails when exit code !=0', (done: MochaDone) => {
+    it('pack fails when exit code !=0', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PackTests/packFails.js')
@@ -433,7 +433,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('publish fails when duplicates are skipped and exit code!=[0|2] on Windows_NT', (done: MochaDone) => {
+    it('publish fails when duplicates are skipped and exit code!=[0|2] on Windows_NT', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PublishTests/failWithContinueOnConflict.js')
@@ -445,7 +445,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('publish fails when duplicates are NOT skipped and exit code!=0', (done: MochaDone) => {
+    it('publish fails when duplicates are NOT skipped and exit code!=0', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './PublishTests/failWithoutContinueOnConflict.js')
@@ -457,7 +457,7 @@ describe('NuGetCommand Suite', function () {
         done();
     });
 
-    it('restore fails when exit code!=0', (done: MochaDone) => {
+    it('restore fails when exit code!=0', (done: Mocha.Done) => {
         this.timeout(1000);
 
         let tp = path.join(__dirname, './RestoreTests/failRestore.js')

Tasks/NuGetCommandV2/Tests/NugetMockHelper.ts

@@ -1,10 +1,10 @@
 import tmrm = require('azure-pipelines-task-lib/mock-run');
-import VersionInfoVersion from 'packaging-common/pe-parser/VersionInfoVersion'
-import {VersionInfo} from 'packaging-common/pe-parser/VersionResource'
-import * as nugetPackUtils from "packaging-common/PackUtilities"
+import VersionInfoVersion from "azure-pipelines-tasks-packaging-common-v3/pe-parser/VersionInfoVersion"
+import {VersionInfo} from 'azure-pipelines-tasks-packaging-common-v3/pe-parser/VersionResource'
+import * as nugetPackUtils from "azure-pipelines-tasks-packaging-common-v3/PackUtilities"
 
-import * as pkgMock from 'packaging-common/Tests/MockHelper';
-import nMockHelper = require('packaging-common/Tests/NuGetMockHelper');
+import * as pkgMock from 'azure-pipelines-tasks-packaging-common-v3/Tests/MockHelper';
+import nMockHelper = require('azure-pipelines-tasks-packaging-common-v3/Tests/NuGetMockHelper');
 
 export class NugetMockHelper {
     private defaultNugetVersion = '4.0.0';
@@ -32,7 +32,7 @@ export class NugetMockHelper {
 
     public registerNugetVersionMock(productVersion: string, versionInfoVersion: number[]) {
         this.registerNugetVersionMockInternal(productVersion, versionInfoVersion);
-        this.registerMockWithMultiplePaths(['packaging-common/pe-parser', '../pe-parser'], {
+        this.registerMockWithMultiplePaths(['azure-pipelines-tasks-packaging-common-v3/pe-parser', '../pe-parser'], {
             getFileVersionInfoAsync: function(nuGetExePath) {
                 let result: VersionInfo = { strings: {} };
                 result.fileVersion = new VersionInfoVersion(versionInfoVersion[0], versionInfoVersion[1], versionInfoVersion[2], versionInfoVersion[3]);
@@ -43,7 +43,7 @@ export class NugetMockHelper {
     }
 
     private registerNugetVersionMockInternal(productVersion: string, versionInfoVersion: number[]) {
-        this.registerMockWithMultiplePaths(['packaging-common/pe-parser/index', '../pe-parser/index'], {
+        this.registerMockWithMultiplePaths(['azure-pipelines-tasks-packaging-common-v3/pe-parser/index', '../pe-parser/index'], {
             getFileVersionInfoAsync: function(nuGetExePath) {
                 let result: VersionInfo = { strings: {} };
                 result.fileVersion = new VersionInfoVersion(versionInfoVersion[0], versionInfoVersion[1], versionInfoVersion[2], versionInfoVersion[3]);
@@ -71,7 +71,7 @@ export class NugetMockHelper {
     }
 
     public registerNuGetPackUtilsMock(date: Date) {
-        this.tmr.registerMock("packaging-common/PackUtilities", {
+        this.tmr.registerMock("azure-pipelines-tasks-packaging-common-v3/PackUtilities", {
             getNowDateString: function(timezone: string) {
                 return nugetPackUtils.getUtcDateString(date);
             }
@@ -80,7 +80,7 @@ export class NugetMockHelper {
 
     public registerNugetConfigMock() {
         var nchm = require('./NuGetConfigHelper-mock');
-        this.tmr.registerMock('packaging-common/nuget/NuGetConfigHelper2', nchm);
+        this.tmr.registerMock('azure-pipelines-tasks-packaging-common-v3/nuget/NuGetConfigHelper2', nchm);
     }
 
     public registerToolRunnerMock() {

Tasks/NuGetCommandV2/make.json

@@ -1,16 +1,4 @@
 {
-    "common": [
-        {
-            "module": "../Common/utility-common",
-            "type": "node",
-            "compile": true
-        },
-        {
-            "module": "../Common/packaging-common",
-            "type": "node",
-            "compile": true
-        }
-    ],
     "rm": [       
         {
             "items": [

Tasks/NuGetCommandV2/nugetcommandmain.ts

@@ -1,10 +1,10 @@
 import * as path from "path";
 import * as tl from "azure-pipelines-task-lib/task";
 
-import * as nuGetGetter from "packaging-common/nuget/NuGetToolGetter";
-import * as peParser from "packaging-common/pe-parser";
-import {VersionInfo} from "packaging-common/pe-parser/VersionResource";
-import * as telemetry from "utility-common/telemetry";
+import * as nuGetGetter from "azure-pipelines-tasks-packaging-common-v3/nuget/NuGetToolGetter";
+import * as peParser from "azure-pipelines-tasks-packaging-common-v3/pe-parser";
+import {VersionInfo} from "azure-pipelines-tasks-packaging-common-v3/pe-parser/VersionResource";
+import * as telemetry from "azure-pipelines-tasks-utility-common/telemetry";
 import * as nugetCustom from "./nugetcustom";
 import * as nugetPack from "./nugetpack";
 import * as nugetPublish from "./nugetpublisher";

Tasks/NuGetCommandV2/nugetcustom.ts

@@ -1,12 +1,12 @@
-import * as auth from "packaging-common/nuget/Authentication";
-import * as ngToolRunner from "packaging-common/nuget/NuGetToolRunner2";
-import * as nutil from "packaging-common/nuget/Utility";
+import * as auth from "azure-pipelines-tasks-packaging-common-v3/nuget/Authentication";
+import * as ngToolRunner from "azure-pipelines-tasks-packaging-common-v3/nuget/NuGetToolRunner2";
+import * as nutil from "azure-pipelines-tasks-packaging-common-v3/nuget/Utility";
 import * as tl from "azure-pipelines-task-lib/task";
-import { logError } from 'packaging-common/util';
+import { logError } from 'azure-pipelines-tasks-packaging-common-v3/util';
 
-import peParser = require("packaging-common/pe-parser/index");
-import * as pkgLocationUtils from "packaging-common/locationUtilities";
-import * as telemetry from "utility-common/telemetry";
+import peParser = require("azure-pipelines-tasks-packaging-common-v3/pe-parser/index");
+import * as pkgLocationUtils from "azure-pipelines-tasks-packaging-common-v3/locationUtilities";
+import * as telemetry from "azure-pipelines-tasks-utility-common/telemetry";
 import {IExecSyncResult} from "azure-pipelines-task-lib/toolrunner";
 
 class NuGetExecutionOptions {