azure-pipelines-tasks-webdeployment-common 4.230.0 → 4.230.2

package/Tests/L1XmlVarSub.js

@@ -1,19 +1,38 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runL1XmlVarSubTests = void 0;
+const path = require("path");
+const assert = require("assert");
+const ltx = require("ltx");
+const fs = require("fs");
+const tl = require("azure-pipelines-task-lib");
+const xmlvariablesubstitutionutility_1 = require("../xmlvariablesubstitutionutility");
+const fileencoding_1 = require("../fileencoding");
+function runL1XmlVarSubTests() {
+    this.timeout(60000);
+    beforeEach(function (done) {
+        tl.cp(getAbsolutePath('Web.config'), getAbsolutePath('Web_test.config'), '-f', false);
+        tl.cp(getAbsolutePath('Web.Debug.config'), getAbsolutePath('Web_test.Debug.config'), '-f', false);
+        tl.cp(getAbsolutePath('parameters.xml'), getAbsolutePath('parameters_test.xml'), '-f', false);
+        done();
     });
-};
-var xmlSubstitutionUtility = require('azure-pipelines-tasks-webdeployment-common/xmlvariablesubstitutionutility.js');
-var path = require('path');
-function xmlVarSub() {
-    return __awaiter(this, void 0, void 0, function* () {
-        var tags = ["applicationSettings", "appSettings", "connectionStrings", "configSections"];
-        var configFiles = [path.join(__dirname, 'L1XmlVarSub/Web_test.config'), path.join(__dirname, 'L1XmlVarSub/Web_test.Debug.config')];
-        var variableMap = {
+    afterEach(done => {
+        try {
+            tl.rmRF(getAbsolutePath('parameters_test.xml'));
+            tl.rmRF(getAbsolutePath('Web_test.Debug.config'));
+            tl.rmRF(getAbsolutePath('Web_test.config'));
+        }
+        catch (error) {
+            tl.debug(error);
+        }
+        finally {
+            done();
+        }
+    });
+    it("Runs successfully with XML variable substitution", done => {
+        const parameterFilePath = getAbsolutePath('parameters_test.xml');
+        const tags = ["applicationSettings", "appSettings", "connectionStrings", "configSections"];
+        const variableMap = {
             'conntype': 'new_connType',
             "MyDB": "TestDB",
             'webpages:Version': '1.1.7.3',
@@ -28,10 +47,27 @@ function xmlVarSub() {
             'log_level': 'error,warning',
             'Email:ToOverride': ''
         };
-        var parameterFilePath = path.join(__dirname, 'L1XmlVarSub/parameters_test.xml');
-        for (var configFile of configFiles) {
-            yield xmlSubstitutionUtility.substituteXmlVariables(configFile, tags, variableMap, parameterFilePath);
-        }
+        xmlvariablesubstitutionutility_1.substituteXmlVariables(getAbsolutePath('Web_test.config'), tags, variableMap, parameterFilePath);
+        xmlvariablesubstitutionutility_1.substituteXmlVariables(getAbsolutePath('Web_test.Debug.config'), tags, variableMap, parameterFilePath);
+        assert(compareXmlFiles('Web_test.config', 'Web_Expected.config'), 'Should have substituted variables in Web.config file');
+        assert(compareXmlFiles('Web_test.Debug.config', 'Web_Expected.Debug.config'), 'Should have substituted variables in Web.Debug.config file');
+        assert(compareXmlFiles('parameters_test.xml', 'parameters_Expected.xml'), 'Should have substituted variables in parameters.xml file');
+        done();
     });
+    function getAbsolutePath(file) {
+        return path.join(__dirname, 'L1XmlVarSub', file);
+    }
+    function compareXmlFiles(actualFile, expectedFile) {
+        const actualFilePath = getAbsolutePath(actualFile);
+        const expectedFilePath = getAbsolutePath(expectedFile);
+        var actualXml = ltx.parse(readFile(actualFilePath));
+        var expectedXml = ltx.parse(readFile(expectedFilePath));
+        return ltx.equal(actualXml, expectedXml);
+    }
+    function readFile(path) {
+        const buffer = fs.readFileSync(path);
+        const encoding = fileencoding_1.detectFileEncoding(path, buffer)[0].toString();
+        return buffer.toString(encoding).replace(/(?<!\r)[\n]+/gm, "\r\n");
+    }
 }
-xmlVarSub();
+exports.runL1XmlVarSubTests = runL1XmlVarSubTests;

package/Tests/L1XmlVarSub.ts

@@ -1,29 +1,86 @@
-var xmlSubstitutionUtility = require('azure-pipelines-tasks-webdeployment-common/xmlvariablesubstitutionutility.js');
-var path = require('path');
-
-async function xmlVarSub() {
-    var tags = ["applicationSettings", "appSettings", "connectionStrings", "configSections"];
-    var configFiles = [path.join(__dirname, 'L1XmlVarSub/Web_test.config'), path.join(__dirname, 'L1XmlVarSub/Web_test.Debug.config')];
-    var variableMap = {
-        'conntype' : 'new_connType',
-        "MyDB": "TestDB",
-        'webpages:Version' : '1.1.7.3',
-        'xdt:Transform' : 'DelAttributes',
-        'xdt:Locator' : 'Match(tag)',
-        'DefaultConnection': "Url=https://primary;Database=db1;ApiKey=11111111-1111-1111-1111-111111111111;Failover = {Url:'https://secondary', ApiKey:'11111111-1111-1111-1111-111111111111'}",
-        'OtherDefaultConnection': 'connectionStringValue2',
-        'ParameterConnection': 'New_Connection_String From xml var subs',
-        'connectionString': 'replaced_value',
-        'invariantName': 'System.Data.SqlServer',
-        'blatvar': 'ApplicationSettingReplacedValue',
-        'log_level': 'error,warning',
-        'Email:ToOverride': ''
+import * as path from 'path';
+import * as assert from 'assert';
+import * as ltx from 'ltx';
+import * as fs from 'fs';
+
+import * as tl from 'azure-pipelines-task-lib';
+
+import { substituteXmlVariables } from '../xmlvariablesubstitutionutility';
+import { detectFileEncoding } from "../fileencoding";
+
+export function runL1XmlVarSubTests(this: Mocha.Suite): void {
+
+    this.timeout(60000);
+
+    beforeEach(function (done: Mocha.Done) {
+        tl.cp(getAbsolutePath('Web.config'), getAbsolutePath('Web_test.config'), '-f', false);
+        tl.cp(getAbsolutePath('Web.Debug.config'), getAbsolutePath('Web_test.Debug.config'), '-f', false);
+        tl.cp(getAbsolutePath('parameters.xml'), getAbsolutePath('parameters_test.xml'), '-f', false);
+
+        done();
+    });
+
+    afterEach(done => {
+        try {
+            tl.rmRF(getAbsolutePath('parameters_test.xml'));
+            tl.rmRF(getAbsolutePath('Web_test.Debug.config'));
+            tl.rmRF(getAbsolutePath('Web_test.config'));
+        }
+        catch (error) {
+            tl.debug(error);
+        }
+        finally {
+            done();
+        }
+    });
+
+    it("Runs successfully with XML variable substitution", done => {
+        const parameterFilePath = getAbsolutePath('parameters_test.xml');
+        const tags = ["applicationSettings", "appSettings", "connectionStrings", "configSections"];
+        const variableMap = {
+            'conntype': 'new_connType',
+            "MyDB": "TestDB",
+            'webpages:Version': '1.1.7.3',
+            'xdt:Transform': 'DelAttributes',
+            'xdt:Locator': 'Match(tag)',
+            'DefaultConnection': "Url=https://primary;Database=db1;ApiKey=11111111-1111-1111-1111-111111111111;Failover = {Url:'https://secondary', ApiKey:'11111111-1111-1111-1111-111111111111'}",
+            'OtherDefaultConnection': 'connectionStringValue2',
+            'ParameterConnection': 'New_Connection_String From xml var subs',
+            'connectionString': 'replaced_value',
+            'invariantName': 'System.Data.SqlServer',
+            'blatvar': 'ApplicationSettingReplacedValue',
+            'log_level': 'error,warning',
+            'Email:ToOverride': ''
+        };
+
+        substituteXmlVariables(getAbsolutePath('Web_test.config'), tags, variableMap, parameterFilePath);
+        substituteXmlVariables(getAbsolutePath('Web_test.Debug.config'), tags, variableMap, parameterFilePath);
+
+        assert(compareXmlFiles('Web_test.config', 'Web_Expected.config'), 'Should have substituted variables in Web.config file');
+        assert(compareXmlFiles('Web_test.Debug.config', 'Web_Expected.Debug.config'), 'Should have substituted variables in Web.Debug.config file');
+        assert(compareXmlFiles('parameters_test.xml', 'parameters_Expected.xml'), 'Should have substituted variables in parameters.xml file');
+
+        done();
+    });
+
+    function getAbsolutePath(file: string): string {
+        return path.join(__dirname, 'L1XmlVarSub', file);
+    }
+
+    function compareXmlFiles(actualFile: string, expectedFile: string): boolean {
+        const actualFilePath = getAbsolutePath(actualFile);
+        const expectedFilePath = getAbsolutePath(expectedFile);
+
+        var actualXml = ltx.parse(readFile(actualFilePath));
+        var expectedXml = ltx.parse(readFile(expectedFilePath));
+
+        return ltx.equal(actualXml, expectedXml);
     }
 
-    var parameterFilePath = path.join(__dirname, 'L1XmlVarSub/parameters_test.xml');
-    for(var configFile of configFiles) {
-        await xmlSubstitutionUtility.substituteXmlVariables(configFile, tags, variableMap, parameterFilePath);
+    function readFile(path: string): string {
+        const buffer = fs.readFileSync(path);
+        const encoding = detectFileEncoding(path, buffer)[0].toString();
+        return buffer.toString(encoding).replace(/(?<!\r)[\n]+/gm, "\r\n");
     }
 }
 
-xmlVarSub();

package/deployusingmsdeploy.d.ts

@@ -13,5 +13,5 @@ import { WebDeployArguments, WebDeployResult } from './msdeployutility';
  * @param   additionalArguments             Arguments provided by user
  *
  */
-export declare function DeployUsingMSDeploy(webDeployPkg: any, webAppName: any, publishingProfile: any, removeAdditionalFilesFlag: any, excludeFilesFromAppDataFlag: any, takeAppOfflineFlag: any, virtualApplication: any, setParametersFile: any, additionalArguments: any, isFolderBasedDeployment: any, useWebDeploy: any): Promise<void>;
-export declare function executeWebDeploy(WebDeployArguments: WebDeployArguments, publishingProfile: any): Promise<WebDeployResult>;
+export declare function DeployUsingMSDeploy(webDeployPkg: any, webAppName: any, publishingProfile: any, removeAdditionalFilesFlag: any, excludeFilesFromAppDataFlag: any, takeAppOfflineFlag: any, virtualApplication: any, setParametersFile: any, additionalArguments: any, isFolderBasedDeployment: any, useWebDeploy: any, authType?: string): Promise<void>;
+export declare function executeWebDeploy(webDeployArguments: WebDeployArguments): Promise<WebDeployResult>;

package/deployusingmsdeploy.js

@@ -14,6 +14,7 @@ const tl = require("azure-pipelines-task-lib/task");
 const fs = require("fs");
 const path = require("path");
 const Q = require("q");
+const msdeployutility_1 = require("./msdeployutility");
 var msDeployUtility = require('./msdeployutility.js');
 var utility = require('./utility.js');
 const DEFAULT_RETRY_COUNT = 3;
@@ -31,7 +32,7 @@ const DEFAULT_RETRY_COUNT = 3;
  * @param   additionalArguments             Arguments provided by user
  *
  */
-function DeployUsingMSDeploy(webDeployPkg, webAppName, publishingProfile, removeAdditionalFilesFlag, excludeFilesFromAppDataFlag, takeAppOfflineFlag, virtualApplication, setParametersFile, additionalArguments, isFolderBasedDeployment, useWebDeploy) {
+function DeployUsingMSDeploy(webDeployPkg, webAppName, publishingProfile, removeAdditionalFilesFlag, excludeFilesFromAppDataFlag, takeAppOfflineFlag, virtualApplication, setParametersFile, additionalArguments, isFolderBasedDeployment, useWebDeploy, authType) {
     return __awaiter(this, void 0, void 0, function* () {
         var msDeployPath = yield msDeployUtility.getMSDeployFullPath();
         var msDeployDirectory = msDeployPath.slice(0, msDeployPath.lastIndexOf('\\') + 1);
@@ -43,7 +44,7 @@ function DeployUsingMSDeploy(webDeployPkg, webAppName, publishingProfile, remove
             setParametersFileName = setParametersFile.slice(setParametersFile.lastIndexOf('\\') + 1, setParametersFile.length);
         }
         var isParamFilePresentInPackage = isFolderBasedDeployment ? false : yield utility.isMSDeployPackage(webDeployPkg);
-        var msDeployCmdArgs = msDeployUtility.getMSDeployCmdArgs(webDeployPkg, webAppName, publishingProfile, removeAdditionalFilesFlag, excludeFilesFromAppDataFlag, takeAppOfflineFlag, virtualApplication, setParametersFileName, additionalArguments, isParamFilePresentInPackage, isFolderBasedDeployment, useWebDeploy);
+        var msDeployCmdArgs = msDeployUtility.getMSDeployCmdArgs(webDeployPkg, webAppName, publishingProfile, removeAdditionalFilesFlag, excludeFilesFromAppDataFlag, takeAppOfflineFlag, virtualApplication, setParametersFileName, additionalArguments, isParamFilePresentInPackage, isFolderBasedDeployment, useWebDeploy, authType);
         var retryCountParam = tl.getVariable("appservice.msdeployretrycount");
         var retryCount = (retryCountParam && !(isNaN(Number(retryCountParam)))) ? Number(retryCountParam) : DEFAULT_RETRY_COUNT;
         try {
@@ -80,26 +81,31 @@ function DeployUsingMSDeploy(webDeployPkg, webAppName, publishingProfile, remove
     });
 }
 exports.DeployUsingMSDeploy = DeployUsingMSDeploy;
-function executeWebDeploy(WebDeployArguments, publishingProfile) {
+function executeWebDeploy(webDeployArguments) {
     return __awaiter(this, void 0, void 0, function* () {
-        var webDeployArguments = yield msDeployUtility.getWebDeployArgumentsString(WebDeployArguments, publishingProfile);
+        const args = yield msdeployutility_1.getWebDeployArgumentsString(webDeployArguments);
+        const originalPathVar = process.env.PATH;
         try {
-            var msDeployPath = yield msDeployUtility.getMSDeployFullPath();
-            var msDeployDirectory = msDeployPath.slice(0, msDeployPath.lastIndexOf('\\') + 1);
-            var pathVar = process.env.PATH;
+            const msDeployPath = yield msdeployutility_1.getMSDeployFullPath();
+            const msDeployDirectory = msDeployPath.slice(0, msDeployPath.lastIndexOf('\\') + 1);
             process.env.PATH = msDeployDirectory + ";" + process.env.PATH;
-            yield executeMSDeploy(webDeployArguments);
+            yield executeMSDeploy(args);
+            return {
+                isSuccess: true
+            };
         }
         catch (exception) {
-            var msDeployErrorFilePath = tl.getVariable('System.DefaultWorkingDirectory') + '\\' + 'error.txt';
-            var errorFileContent = tl.exist(msDeployErrorFilePath) ? fs.readFileSync(msDeployErrorFilePath, 'utf-8') : "";
+            const msDeployErrorFilePath = tl.getVariable('System.DefaultWorkingDirectory') + '\\' + 'error.txt';
+            const errorFileContent = tl.exist(msDeployErrorFilePath) ? fs.readFileSync(msDeployErrorFilePath, 'utf-8') : "";
             return {
                 isSuccess: false,
                 error: errorFileContent,
-                errorCode: msDeployUtility.getWebDeployErrorCode(errorFileContent)
+                errorCode: msdeployutility_1.getWebDeployErrorCode(errorFileContent)
             };
         }
-        return { isSuccess: true };
+        finally {
+            process.env.PATH = originalPathVar;
+        }
     });
 }
 exports.executeWebDeploy = executeWebDeploy;

package/module.json

@@ -30,6 +30,10 @@
         "VariableSubstitutionInitiated" : "Initiated variable substitution in config file : %s",
         "ConfigFileUpdated" : "Config file : %s updated.",
         "SkippedUpdatingFile" : "Skipped Updating file: %s",
-        "PwshNotAvailable": "##WARNING##:PowerShell Core (pwsh.exe) is not available on agent machine. Falling back to using Windows PowerShell (powershell.exe). This can cause reduced performance. Please install the newer version of PowerShell for improved performance."
+        "PwshNotAvailable": "##WARNING##:PowerShell Core (pwsh.exe) is not available on agent machine. Falling back to using Windows PowerShell (powershell.exe). This can cause reduced performance. Please install the newer version of PowerShell for improved performance.",
+        "UnabletofindthelocationofMSDeployfromregistryonmachineError": "Unable to find the location of MSDeploy from registry. Error: %s",
+        "MissingMSDeployVersionRegistryKey": "Missing MSDeploy Version registry key.",
+        "UnsupportedMSDeployVersion": "MSDeploy %s does not support token base authentication. Please upgrade to MSDeploy 9.0.7225.0 or higher.",
+        "MissingMSDeployInstallPathRegistryKey": "Missing MSDeploy InstallPath registry key."
     }
 }

package/msdeployutility.d.ts

@@ -4,7 +4,7 @@ import { Package } from './packageUtility';
  *
  * @param   webAppPackage                   Web deploy package
  * @param   webAppName                      web App Name
- * @param   publishingProfile               Azure RM Connection Details
+ * @param   profile                         Azure RM Connection Details
  * @param   removeAdditionalFilesFlag       Flag to set DoNotDeleteRule rule
  * @param   excludeFilesFromAppDataFlag     Flag to prevent App Data from publishing
  * @param   takeAppOfflineFlag              Flag to enable AppOffline rule
@@ -13,17 +13,19 @@ import { Package } from './packageUtility';
  * @param   additionalArguments             Arguments provided by user
  * @param   isParamFilePresentInPacakge     Flag to check Paramter.xml file
  * @param   isFolderBasedDeployment         Flag to check if given web package path is a folder
+ * @param   authType                        Type of authentication to use
  *
  * @returns string
  */
-export declare function getMSDeployCmdArgs(webAppPackage: string, webAppName: string, publishingProfile: any, removeAdditionalFilesFlag: boolean, excludeFilesFromAppDataFlag: boolean, takeAppOfflineFlag: boolean, virtualApplication: string, setParametersFile: string, additionalArguments: string, isParamFilePresentInPacakge: boolean, isFolderBasedDeployment: boolean, useWebDeploy: boolean): string;
-export declare function getWebDeployArgumentsString(webDeployArguments: WebDeployArguments, publishingProfile: any): Promise<string>;
+export declare function getMSDeployCmdArgs(webAppPackage: string, webAppName: string, profile: any, removeAdditionalFilesFlag: boolean, excludeFilesFromAppDataFlag: boolean, takeAppOfflineFlag: boolean, virtualApplication: string, setParametersFile: string, additionalArguments: string, isParamFilePresentInPacakge: boolean, isFolderBasedDeployment: boolean, useWebDeploy: boolean, authType?: string): string;
+export declare function getWebDeployArgumentsString(args: WebDeployArguments): Promise<string>;
+export declare function shouldUseMSDeployTokenAuth(): boolean;
 /**
  * Gets the full path of MSDeploy.exe
  *
  * @returns    string
  */
-export declare function getMSDeployFullPath(): Promise<any>;
+export declare function getMSDeployFullPath(): Promise<string>;
 /**
  * 1. Checks if msdeploy during execution redirected any error to
  * error stream ( saved in error.txt) , display error to console
@@ -44,6 +46,7 @@ export interface WebDeployArguments {
     setParametersFile?: string;
     additionalArguments?: string;
     useWebDeploy?: boolean;
+    authType?: string;
 }
 export interface WebDeployResult {
     isSuccess: boolean;

package/msdeployutility.js

@@ -9,8 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWebDeployErrorCode = exports.redirectMSDeployErrorToConsole = exports.getMSDeployFullPath = exports.getWebDeployArgumentsString = exports.getMSDeployCmdArgs = void 0;
-const Q = require("q");
+exports.getWebDeployErrorCode = exports.redirectMSDeployErrorToConsole = exports.getMSDeployFullPath = exports.shouldUseMSDeployTokenAuth = exports.getWebDeployArgumentsString = exports.getMSDeployCmdArgs = void 0;
 const tl = require("azure-pipelines-task-lib/task");
 const fs = require("fs");
 const path = require("path");
@@ -22,7 +21,7 @@ const ERROR_FILE_NAME = "error.txt";
  *
  * @param   webAppPackage                   Web deploy package
  * @param   webAppName                      web App Name
- * @param   publishingProfile               Azure RM Connection Details
+ * @param   profile                         Azure RM Connection Details
  * @param   removeAdditionalFilesFlag       Flag to set DoNotDeleteRule rule
  * @param   excludeFilesFromAppDataFlag     Flag to prevent App Data from publishing
  * @param   takeAppOfflineFlag              Flag to enable AppOffline rule
@@ -31,10 +30,11 @@ const ERROR_FILE_NAME = "error.txt";
  * @param   additionalArguments             Arguments provided by user
  * @param   isParamFilePresentInPacakge     Flag to check Paramter.xml file
  * @param   isFolderBasedDeployment         Flag to check if given web package path is a folder
+ * @param   authType                        Type of authentication to use
  *
  * @returns string
  */
-function getMSDeployCmdArgs(webAppPackage, webAppName, publishingProfile, removeAdditionalFilesFlag, excludeFilesFromAppDataFlag, takeAppOfflineFlag, virtualApplication, setParametersFile, additionalArguments, isParamFilePresentInPacakge, isFolderBasedDeployment, useWebDeploy) {
+function getMSDeployCmdArgs(webAppPackage, webAppName, profile, removeAdditionalFilesFlag, excludeFilesFromAppDataFlag, takeAppOfflineFlag, virtualApplication, setParametersFile, additionalArguments, isParamFilePresentInPacakge, isFolderBasedDeployment, useWebDeploy, authType) {
     var msDeployCmdArgs = " -verb:sync";
     var webApplicationDeploymentPath = (virtualApplication) ? webAppName + "/" + virtualApplication : webAppName;
     if (isFolderBasedDeployment) {
@@ -64,9 +64,9 @@ function getMSDeployCmdArgs(webAppPackage, webAppName, publishingProfile, remove
             }
         }
     }
-    if (publishingProfile != null) {
-        msDeployCmdArgs += ",ComputerName=\"'https://" + publishingProfile.publishUrl + "/msdeploy.axd?site=" + webAppName + "'\",";
-        msDeployCmdArgs += "UserName=\"'" + publishingProfile.userName + "'\",Password=\"'" + publishingProfile.userPWD + "'\",AuthType=\"'Basic'\"";
+    if (profile != null) {
+        msDeployCmdArgs += `,ComputerName=\"'https://${profile.publishUrl}/msdeploy.axd?site=${webAppName}'\",`;
+        msDeployCmdArgs += `UserName=\"'${profile.userName}'\",Password=\"'${profile.userPWD}'\",AuthType=\"'${authType || "Basic"}'\"`;
     }
     if (isParamFilePresentInPacakge) {
         msDeployCmdArgs += " -setParam:name=\"'IIS Web Application Name'\",value=\"'" + webApplicationDeploymentPath + "'\"";
@@ -87,7 +87,7 @@ function getMSDeployCmdArgs(webAppPackage, webAppName, publishingProfile, remove
     if (!(removeAdditionalFilesFlag && useWebDeploy)) {
         msDeployCmdArgs += " -enableRule:DoNotDeleteRule";
     }
-    if (publishingProfile != null) {
+    if (profile != null) {
         var userAgent = tl.getVariable("AZURE_HTTP_USER_AGENT");
         if (userAgent) {
             msDeployCmdArgs += ' -userAgent:' + userAgent;
@@ -190,12 +190,21 @@ function parseAdditionalArguments(additionalArguments) {
     }
     return parsedArgs;
 }
-function getWebDeployArgumentsString(webDeployArguments, publishingProfile) {
+function getWebDeployArgumentsString(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        return getMSDeployCmdArgs(webDeployArguments.package.getPath(), webDeployArguments.appName, publishingProfile, webDeployArguments.removeAdditionalFilesFlag, webDeployArguments.excludeFilesFromAppDataFlag, webDeployArguments.takeAppOfflineFlag, webDeployArguments.virtualApplication, webDeployArguments.setParametersFile, webDeployArguments.additionalArguments, yield webDeployArguments.package.isMSBuildPackage(), webDeployArguments.package.isFolder(), webDeployArguments.useWebDeploy);
+        const profile = {
+            userPWD: args.password,
+            userName: args.userName,
+            publishUrl: args.publishUrl
+        };
+        return getMSDeployCmdArgs(args.package.getPath(), args.appName, profile, args.removeAdditionalFilesFlag, args.excludeFilesFromAppDataFlag, args.takeAppOfflineFlag, args.virtualApplication, args.setParametersFile, args.additionalArguments, yield args.package.isMSBuildPackage(), args.package.isFolder(), args.useWebDeploy, args.authType);
     });
 }
 exports.getWebDeployArgumentsString = getWebDeployArgumentsString;
+function shouldUseMSDeployTokenAuth() {
+    return (tl.getVariable("USE_MSDEPLOY_TOKEN_AUTH") || "").toLowerCase() === "true";
+}
+exports.shouldUseMSDeployTokenAuth = shouldUseMSDeployTokenAuth;
 /**
  * Gets the full path of MSDeploy.exe
  *
@@ -204,65 +213,104 @@ exports.getWebDeployArgumentsString = getWebDeployArgumentsString;
 function getMSDeployFullPath() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            var msDeployInstallPathRegKey = "\\SOFTWARE\\Microsoft\\IIS Extensions\\MSDeploy";
-            var msDeployLatestPathRegKey = yield getMSDeployLatestRegKey(msDeployInstallPathRegKey);
-            var msDeployFullPath = yield getMSDeployInstallPath(msDeployLatestPathRegKey);
-            msDeployFullPath = msDeployFullPath + "msdeploy.exe";
-            return msDeployFullPath;
+            const msDeployInstallPathRegKey = "\\SOFTWARE\\Microsoft\\IIS Extensions\\MSDeploy";
+            const msDeployLatestPathRegKey = yield getMSDeployLatestRegKey(msDeployInstallPathRegKey);
+            return (yield getMSDeployInstallPath(msDeployLatestPathRegKey)) + "msdeploy.exe";
         }
         catch (error) {
             tl.debug(error);
-            return path.join(__dirname, "MSDeploy3.6/MSDeploy3.6", "msdeploy.exe");
+            const subfolder = shouldUseMSDeployTokenAuth() ? "M229" : "M142";
+            return path.join(__dirname, "MSDeploy", subfolder, "MSDeploy3.6", "msdeploy.exe");
         }
     });
 }
 exports.getMSDeployFullPath = getMSDeployFullPath;
 function getMSDeployLatestRegKey(registryKey) {
-    var defer = Q.defer();
-    var regKey = new winreg({
-        hive: winreg.HKLM,
-        key: registryKey
-    });
-    regKey.keys(function (err, subRegKeys) {
-        if (err) {
-            defer.reject(tl.loc("UnabletofindthelocationofMSDeployfromregistryonmachineError", err));
-            return;
-        }
-        var latestKeyVersion = 0;
-        var latestSubKey;
-        for (var index in subRegKeys) {
-            var subRegKey = subRegKeys[index].key;
-            var subKeyVersion = subRegKey.substr(subRegKey.lastIndexOf('\\') + 1, subRegKey.length - 1);
-            if (!isNaN(subKeyVersion)) {
-                var subKeyVersionNumber = parseFloat(subKeyVersion);
-                if (subKeyVersionNumber > latestKeyVersion) {
-                    latestKeyVersion = subKeyVersionNumber;
-                    latestSubKey = subRegKey;
+    return new Promise((resolve, reject) => {
+        var regKey = new winreg({
+            hive: winreg.HKLM,
+            key: registryKey
+        });
+        regKey.keys(function (err, subRegKeys) {
+            if (err) {
+                reject(tl.loc("UnabletofindthelocationofMSDeployfromregistryonmachineError", err));
+                return;
+            }
+            var latestKeyVersion = 0;
+            var latestSubKey;
+            for (var index in subRegKeys) {
+                var subRegKey = subRegKeys[index].key;
+                var subKeyVersion = subRegKey.substr(subRegKey.lastIndexOf('\\') + 1, subRegKey.length - 1);
+                if (!isNaN(subKeyVersion)) {
+                    var subKeyVersionNumber = parseFloat(subKeyVersion);
+                    if (subKeyVersionNumber > latestKeyVersion) {
+                        latestKeyVersion = subKeyVersionNumber;
+                        latestSubKey = subRegKey;
+                    }
                 }
             }
-        }
-        if (latestKeyVersion < 3) {
-            defer.reject(tl.loc("UnsupportedinstalledversionfoundforMSDeployversionshouldbeatleast3orabove", latestKeyVersion));
-            return;
-        }
-        defer.resolve(latestSubKey);
+            if (latestKeyVersion < 3) {
+                reject(tl.loc("UnsupportedinstalledversionfoundforMSDeployversionshouldbeatleast3orabove", latestKeyVersion));
+                return;
+            }
+            resolve(latestSubKey);
+        });
     });
-    return defer.promise;
 }
 function getMSDeployInstallPath(registryKey) {
-    var defer = Q.defer();
-    var regKey = new winreg({
-        hive: winreg.HKLM,
-        key: registryKey
+    return new Promise((resolve, reject) => {
+        var regKey = new winreg({
+            hive: winreg.HKLM,
+            key: registryKey
+        });
+        regKey.values(function (err, items) {
+            if (err) {
+                reject(tl.loc("UnabletofindthelocationofMSDeployfromregistryonmachineError", err));
+            }
+            if (shouldUseMSDeployTokenAuth()) {
+                const versionItem = items.find(item => item.name === "Version");
+                if (!versionItem) {
+                    reject(tl.loc("MissingMSDeployVersionRegistryKey"));
+                }
+                const minimalSupportedVersion = "9.0.7225.0";
+                const version = versionItem.value;
+                tl.debug(`Installed MSDeploy Version: ${version}`);
+                // MSDeploy 9.0.7225.0 is the first version to support token auth
+                if (compareVersions(version, minimalSupportedVersion) < 0) {
+                    reject(tl.loc("UnsupportedMSDeployVersion", version));
+                }
+            }
+            const installPathItem = items.find(item => item.name === "InstallPath");
+            if (!installPathItem) {
+                reject(tl.loc("MissingMSDeployInstallPathRegistryKey"));
+            }
+            resolve(installPathItem.value);
+        });
     });
-    regKey.get("InstallPath", function (err, item) {
-        if (err) {
-            defer.reject(tl.loc("UnabletofindthelocationofMSDeployfromregistryonmachineError", err));
-            return;
+}
+function compareVersions(version1, version2) {
+    if (version1 === version2) {
+        return 0;
+    }
+    const separator = ".";
+    const parts1 = version1.split(separator).map(Number);
+    const parts2 = version2.split(separator).map(Number);
+    const length = Math.min(parts1.length, parts2.length);
+    for (let i = 0; i < length; i++) {
+        if (parts1[i] > parts2[i]) {
+            return 1;
         }
-        defer.resolve(item.value);
-    });
-    return defer.promise;
+        if (parts1[i] < parts2[i]) {
+            return -1;
+        }
+    }
+    if (parts1.length > parts2.length) {
+        return 1;
+    }
+    if (parts1.length < parts2.length) {
+        return -1;
+    }
+    return 0;
 }
 /**
  * 1. Checks if msdeploy during execution redirected any error to

package/package.json

@@ -1,13 +1,14 @@
 {
     "name": "azure-pipelines-tasks-webdeployment-common",
-    "version": "4.230.0",
+    "version": "4.230.2",
     "description": "Common Lib for MSDeploy Utility",
     "repository": {
         "type": "git",
         "url": "git+ssh://git@github.com/Microsoft/azure-pipelines-tasks.git"
     },
     "scripts": {
-        "build": "node ../build-scripts/downloadArchive.js https://vstsagenttools.blob.core.windows.net/tools/7zip/1/7zip.zip ./7zip &&  node ../build-scripts/downloadArchive.js https://vstsagenttools.blob.core.windows.net/tools/MSDeploy/3.6/M142/MSDeploy.zip ./MSDeploy3.6 &&  node make.js"
+        "build": "pwsh build.ps1",
+        "test": "nyc --all --src ./_build mocha ./_build/Tests/L0.js"
     },
     "author": "Microsoft Corporation",
     "license": "MIT",
@@ -19,6 +20,7 @@
         "@types/mocha": "^5.2.7",
         "@types/node": "^10.17.0",
         "@xmldom/xmldom": "git+https://github.com/xmldom/xmldom.git#0.8.6",
+        "@types/ltx": "3.0.6",
         "archiver": "1.2.0",
         "azure-pipelines-task-lib": "^4.2.0",
         "decompress-zip": "^0.3.3",
@@ -29,6 +31,8 @@
         "xml2js": "0.6.2"
     },
     "devDependencies": {
-        "typescript": "4.0.2"
+        "typescript": "4.0.2",
+        "mocha": "^6.2.3",
+        "nyc": "^15.1.0"
     }
 }

package/packageUtility.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Package = exports.PackageUtility = exports.PackageType = void 0;
 const tl = require("azure-pipelines-task-lib/task");
 const utility = require("./utility");
-var zipUtility = require('azure-pipelines-tasks-webdeployment-common/ziputility.js');
+const ziputility_1 = require("./ziputility");
 const path = require("path");
 var PackageType;
 (function (PackageType) {
@@ -73,10 +73,11 @@ class Package {
     }
     isMSBuildPackage() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._isMSBuildPackage == undefined) {
-                this._isMSBuildPackage = this.getPackageType() != PackageType.folder && (yield zipUtility.checkIfFilesExistsInZip(this._path, ["parameters.xml", "systeminfo.xml"]));
-                tl.debug("Is the package an msdeploy package : " + this._isMSBuildPackage);
-            }
+            if (this._isMSBuildPackage !== undefined)
+                return this._isMSBuildPackage;
+            const shouldCheckFiles = this.getPackageType() !== PackageType.folder;
+            this._isMSBuildPackage = shouldCheckFiles && (yield ziputility_1.checkIfFilesExistsInZip(this._path, ["parameters.xml", "systeminfo.xml"]));
+            tl.debug(`Is the package an msdeploy package : ${this._isMSBuildPackage}`);
             return this._isMSBuildPackage;
         });
     }

package/utility.js

@@ -14,7 +14,7 @@ const path = require("path");
 const os = require("os");
 const tl = require("azure-pipelines-task-lib/task");
 const packageUtility_1 = require("./packageUtility");
-var zipUtility = require('azure-pipelines-tasks-webdeployment-common/ziputility.js');
+const zipUtility = require("./ziputility");
 /**
  * Validates the input package and finds out input type
  *