From b4692e1fbdf2f6ae7cf922156fcba312e2beab24 Mon Sep 17 00:00:00 2001
From: Eavanshi Arora <52486630+eaarora-ms@users.noreply.github.com>
Date: Fri, 11 Oct 2019 13:30:04 +0530
Subject: [PATCH] FT Variable Substitution - Parser changed from ltx to xmldom
 (#11401)

Parser changed from ltx to xmldom
---
 Tasks/AzureMysqlDeploymentV1/task.json        |   2 +-
 Tasks/AzureMysqlDeploymentV1/task.loc.json    |   2 +-
 Tasks/AzureRmWebAppDeploymentV4/task.json     |   2 +-
 Tasks/AzureRmWebAppDeploymentV4/task.loc.json |   2 +-
 .../webdeployment-common-v2/npmdomutility.ts  |  81 +++++++
 .../variableutility.ts                        |   2 +-
 .../xmlvariablesubstitutionutility.ts         | 219 ++++++++++--------
 Tasks/FileTransformV1/task.json               |   2 +-
 Tasks/FileTransformV1/task.loc.json           |   2 +-
 Tasks/FileTransformV2/task.json               |   2 +-
 Tasks/FileTransformV2/task.loc.json           |   2 +-
 .../task.json                                 |   2 +-
 .../task.loc.json                             |   2 +-
 .../MysqlDeploymentOnMachineGroupV1/task.json |   2 +-
 .../task.loc.json                             |   2 +-
 package-lock.json                             |   5 +
 package.json                                  |   3 +
 17 files changed, 227 insertions(+), 107 deletions(-)
 create mode 100644 Tasks/Common/webdeployment-common-v2/npmdomutility.ts

diff --git a/Tasks/AzureMysqlDeploymentV1/task.json b/Tasks/AzureMysqlDeploymentV1/task.json
index d1d705f189d8..6c96ad3f4aa9 100644
--- a/Tasks/AzureMysqlDeploymentV1/task.json
+++ b/Tasks/AzureMysqlDeploymentV1/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 1,
         "Minor": 156,
-        "Patch": 10
+        "Patch": 11
     },
     "demands": [],
     "minimumAgentVersion": "1.100.0",
diff --git a/Tasks/AzureMysqlDeploymentV1/task.loc.json b/Tasks/AzureMysqlDeploymentV1/task.loc.json
index 9cfe02563b65..903d4be60174 100644
--- a/Tasks/AzureMysqlDeploymentV1/task.loc.json
+++ b/Tasks/AzureMysqlDeploymentV1/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 1,
     "Minor": 156,
-    "Patch": 10
+    "Patch": 11
   },
   "demands": [],
   "minimumAgentVersion": "1.100.0",
diff --git a/Tasks/AzureRmWebAppDeploymentV4/task.json b/Tasks/AzureRmWebAppDeploymentV4/task.json
index 2b3b757e9327..aa9ca41e5d91 100644
--- a/Tasks/AzureRmWebAppDeploymentV4/task.json
+++ b/Tasks/AzureRmWebAppDeploymentV4/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 4,
         "Minor": 157,
-        "Patch": 4
+        "Patch": 5
     },
     "releaseNotes": "What's new in version 4.*<br />Supports Zip Deploy, Run From Package, War Deploy [Details here](https://aka.ms/appServiceDeploymentMethods)<br />Supports App Service Environments<br />Improved UI for discovering different App service types supported by the task<br/>Run From Package is the preferred deployment method, which makes files in wwwroot folder read-only<br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more information.",
     "minimumAgentVersion": "2.104.1",
diff --git a/Tasks/AzureRmWebAppDeploymentV4/task.loc.json b/Tasks/AzureRmWebAppDeploymentV4/task.loc.json
index 5d621b033767..ca8481553bb5 100644
--- a/Tasks/AzureRmWebAppDeploymentV4/task.loc.json
+++ b/Tasks/AzureRmWebAppDeploymentV4/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 4,
     "Minor": 157,
-    "Patch": 4
+    "Patch": 5
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",
diff --git a/Tasks/Common/webdeployment-common-v2/npmdomutility.ts b/Tasks/Common/webdeployment-common-v2/npmdomutility.ts
new file mode 100644
index 000000000000..4fbe86e1951a
--- /dev/null
+++ b/Tasks/Common/webdeployment-common-v2/npmdomutility.ts
@@ -0,0 +1,81 @@
+var varUtility = require("./variableutility.js");
+var DOMParser = require('xmldom').DOMParser;
+
+export class NpmDomUtility  {
+
+    private xmlDomLookUpTable = {};
+    private xmlDom;
+
+    public constructor(xmlContent) {
+        this.xmlDomLookUpTable = {};
+        this.xmlDom = new DOMParser().parseFromString(xmlContent,"text/xml");
+        this.buildLookUpTable(this.xmlDom);
+    }
+
+    public getXmlDom() {
+        return this.xmlDom;
+    }
+
+    public getContentWithHeader(xmlDom) {
+        return xmlDom ? xmlDom.toString() : "";
+    }
+
+    /**
+     * Define method to create a lookup for DOM 
+     */
+    private buildLookUpTable(node) {
+        if(node){
+            let nodeName = node.nodeName;
+            if(nodeName){
+                nodeName = nodeName.toLowerCase();
+                let listOfNodes = this.xmlDomLookUpTable[nodeName];
+                if(listOfNodes == null || !(Array.isArray(listOfNodes))) {
+                    this.xmlDomLookUpTable[nodeName] = [];
+                }
+                (this.xmlDomLookUpTable[nodeName]).push(node);
+                if(node.hasChildNodes()) {
+                    let children = node.childNodes;
+                    for(let i=0 ; i < children.length; i++) {
+                        this.buildLookUpTable(children[i]);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     *  Returns array of nodes which match with the tag name.
+     */
+    public getElementsByTagName(nodeName) {
+        if(varUtility.isEmpty(nodeName))
+            return [];
+        let selectedElements = this.xmlDomLookUpTable[nodeName.toLowerCase()];
+        if(!selectedElements){
+            selectedElements = [];
+        }
+        return selectedElements;
+    }
+
+    /**
+     *  Search in subtree with provided node name
+     */
+    public getChildElementsByTagName(node, tagName) {
+        if(!varUtility.isObject(node) )
+            return [];
+        var liveNodes = [];
+        if(node.hasChildNodes()){
+            var children = node.childNodes;
+            for(let i=0; i < children.length; i++ ){
+                let childName = children[i].nodeName;
+                if( !varUtility.isEmpty(childName) && tagName == childName){
+                    liveNodes.push(children[i]);
+                }
+                let liveChildNodes = this.getChildElementsByTagName(children[i], tagName);
+                if(liveChildNodes && liveChildNodes.length > 0){
+                    liveNodes = liveNodes.concat(liveChildNodes);
+                }
+            }
+        }
+        return liveNodes;
+    }
+}
diff --git a/Tasks/Common/webdeployment-common-v2/variableutility.ts b/Tasks/Common/webdeployment-common-v2/variableutility.ts
index cfbf989df143..2cd878c06a26 100644
--- a/Tasks/Common/webdeployment-common-v2/variableutility.ts
+++ b/Tasks/Common/webdeployment-common-v2/variableutility.ts
@@ -11,7 +11,7 @@ export function isPredefinedVariable(variable: string): boolean {
 }
 
 export function isEmpty(object){
-    if(object == null || object == "")
+    if(object == null || object == "" || (object.toString()).trim() == null || (object.toString()).trim() == "")
         return true;
     return false;
 }
diff --git a/Tasks/Common/webdeployment-common-v2/xmlvariablesubstitutionutility.ts b/Tasks/Common/webdeployment-common-v2/xmlvariablesubstitutionutility.ts
index 78a93c9da99b..ccca8b9f4e33 100644
--- a/Tasks/Common/webdeployment-common-v2/xmlvariablesubstitutionutility.ts
+++ b/Tasks/Common/webdeployment-common-v2/xmlvariablesubstitutionutility.ts
@@ -1,28 +1,37 @@
-import Q = require('q');
 import tl = require('azure-pipelines-task-lib/task');
 import fs = require('fs');
 import path = require('path');
 
-var ltx = require("ltx");
 var varUtility = require ('./variableutility.js');
 var ltxdomutility = require("./ltxdomutility.js");
+var npmdomutility = require("./npmdomutility.js");
 var fileEncoding = require('./fileencoding.js');
 
 function getReplacableTokenFromTags(xmlNode, variableMap) {
     var parameterSubValue = {};
-    for (var childNode of xmlNode.children) {
-        if(!varUtility.isObject(childNode)) {
-            continue;
-        }
-        for(var nodeAttribute in childNode.attrs) {
-            if (childNode.attrs[nodeAttribute].startsWith('$(ReplacableToken_') && variableMap[childNode.attrs['name']]) {
-                var indexOfReplaceToken = '$(ReplacableToken_'.length;
-                var lastIndexOf_ = childNode.attrs[nodeAttribute].lastIndexOf('_');
-                if(lastIndexOf_ <= indexOfReplaceToken) {
-                    tl.debug('Attribute value is in incorrect format ! ' + childNode.attrs[nodeAttribute]);
-                    continue;
+    if(xmlNode.hasChildNodes()) {
+        var children = xmlNode.childNodes;
+        for (let childs = 0; childs < children.length; childs ++) {
+            let childNode = children[childs];
+            if ((varUtility.isObject(childNode)) && (!varUtility.isEmpty(childNode))) {
+                if(childNode.attributes) {
+                    let childNodeAttributes = childNode.attributes;
+                    let childNodeAttributeName;
+                    for (let nodeAttribute=0 ; nodeAttribute<childNodeAttributes.length; nodeAttribute++) {
+                        if(childNodeAttributes[nodeAttribute].nodeName == 'name') {
+                            childNodeAttributeName = childNodeAttributes[nodeAttribute].nodeValue;
+                        }
+                        if (((childNodeAttributes[nodeAttribute]).nodeValue).startsWith('$(ReplacableToken_') && variableMap[childNodeAttributeName]) {
+                            let indexOfReplaceToken = '$(ReplacableToken_'.length;
+                            let lastIndexOf_ = ((childNode.attributes[nodeAttribute]).nodeValue).lastIndexOf('_');
+                            if(lastIndexOf_ <= indexOfReplaceToken) {
+                                tl.debug('Attribute value is in incorrect format ! ' + childNode.attributes[nodeAttribute]);
+                                continue;
+                            }
+                            parameterSubValue[((childNode.attributes[nodeAttribute]).nodeValue).substring(indexOfReplaceToken, lastIndexOf_)] = variableMap[childNodeAttributeName].replace(/"/g, "'");
+                        }
+                    }
                 }
-                parameterSubValue[childNode.attrs[nodeAttribute].substring(indexOfReplaceToken, lastIndexOf_)] = variableMap[childNode.attrs['name']].replace(/"/g, "'");
             }
         }
     }
@@ -73,17 +82,17 @@ function substituteValueinParameterFile(parameterFilePath, parameterSubValue) {
 }
 
 export function substituteAppSettingsVariables(folderPath, isFolderBasedDeployment, fileName?: string) {
-    var configFiles = tl.findMatch(folderPath, fileName ? fileName : "**/*.config");
+    let configFiles = tl.findMatch(folderPath, fileName ? fileName : "**/*.config");
     // parameters.xml is considered when fileName is not provided or filename explicitly mentions parameters.xml
-    var parameterFilePath = !fileName || fileName.toLocaleLowerCase().indexOf("parameters.xml") != -1 ? path.join(folderPath, 'parameters.xml') : null;
+    let parameterFilePath = !fileName || fileName.toLocaleLowerCase().indexOf("parameters.xml") != -1 ? path.join(folderPath, 'parameters.xml') : null;
     if(!isFolderBasedDeployment && tl.exist(parameterFilePath)) {
         tl.debug('Detected parameters.xml file - XML variable substitution');
     }
     else {
         parameterFilePath = null;
     }
-    var variableMap = varUtility.getVariableMap();
-    var tags = ["applicationSettings", "appSettings", "connectionStrings", "configSections"];
+    let variableMap = varUtility.getVariableMap();
+    let tags = ["applicationSettings", "appSettings", "connectionStrings", "configSections"];
     for(var configFile of configFiles) {
         substituteXmlVariables(configFile, tags, variableMap, parameterFilePath);
     }
@@ -105,8 +114,8 @@ export function substituteXmlVariables(configFile, tags, variableMap, parameterF
     }
     var xmlDocument;
     try{
-        var ltxDomUtiltiyInstance = new ltxdomutility.LtxDomUtility(webConfigContent);
-        xmlDocument = ltxDomUtiltiyInstance.getXmlDom();
+        var npmDomUtiltiyInstance = new npmdomutility.NpmDomUtility(webConfigContent);
+        xmlDocument = npmDomUtiltiyInstance.getXmlDom();
     } 
     catch(error) {
         tl.debug("Unable to parse file : " + configFile);
@@ -117,22 +126,22 @@ export function substituteXmlVariables(configFile, tags, variableMap, parameterF
         "APOS_CHARACTER_TOKEN": "'"
     };
     var isSubstitutionApplied: boolean = false;
-    for(var tag of tags) {
-        var nodes = ltxDomUtiltiyInstance.getElementsByTagName(tag); 
+    for(let tag of tags) {
+        var nodes = npmDomUtiltiyInstance.getElementsByTagName(tag); 
         if(nodes.length == 0) {
             tl.debug("Unable to find node with tag '" + tag + "' in provided xml file.");
             continue;
         }
-        for(var xmlNode of nodes) {
+        for(let xmlNode of nodes) {
             if(varUtility.isObject(xmlNode)){
-                console.log(tl.loc('SubstitutionForXmlNode' , xmlNode.name));
+                console.log(tl.loc('SubstitutionForXmlNode' , xmlNode.nodeName));
                 try {
-                    if(xmlNode.name == "configSections") {
-                        isSubstitutionApplied = updateXmlConfigNodeAttribute(xmlDocument, xmlNode, variableMap, replacableTokenValues, ltxDomUtiltiyInstance) || isSubstitutionApplied;
+                    if(xmlNode.nodeName == "configSections") {
+                        isSubstitutionApplied = updateXmlConfigNodeAttribute(xmlNode, variableMap, replacableTokenValues, npmDomUtiltiyInstance) || isSubstitutionApplied;
                     }
-                    else if(xmlNode.name == "connectionStrings") {
+                    else if(xmlNode.nodeName == "connectionStrings") {
                         if(parameterFilePath) {
-                            var parameterSubValue = getReplacableTokenFromTags(xmlNode, variableMap);
+                            let parameterSubValue = getReplacableTokenFromTags(xmlNode, variableMap);
                             substituteValueinParameterFile(parameterFilePath, parameterSubValue);
                         }
                         isSubstitutionApplied = updateXmlConnectionStringsNodeAttribute(xmlNode, variableMap, replacableTokenValues) || isSubstitutionApplied;
@@ -141,7 +150,7 @@ export function substituteXmlVariables(configFile, tags, variableMap, parameterF
                         isSubstitutionApplied = updateXmlNodeAttribute(xmlNode, variableMap, replacableTokenValues) || isSubstitutionApplied;
                     }
                 } catch (error){
-                    tl.debug("Error occurred while processing xml node : " + xmlNode.name);
+                    tl.debug("Error occurred while processing xml node : " + xmlNode.nodeName);
                     tl.debug(error);
                 }
             }  
@@ -150,8 +159,8 @@ export function substituteXmlVariables(configFile, tags, variableMap, parameterF
 
     if(isSubstitutionApplied) {
         replaceEscapeXMLCharacters(xmlDocument);
-        var domContent = ( fileEncodeType[1]? '\uFEFF' : '' ) + ltxDomUtiltiyInstance.getContentWithHeader(xmlDocument);
-        for(var replacableTokenValue in replacableTokenValues) {
+        var domContent = ( fileEncodeType[1]? '\uFEFF' : '' ) + npmDomUtiltiyInstance.getContentWithHeader(xmlDocument);
+        for(let replacableTokenValue in replacableTokenValues) {
             tl.debug('Substituting original value in place of temp_name: ' + replacableTokenValue);
             domContent = domContent.split(replacableTokenValue).join(replacableTokenValues[replacableTokenValue]);
         }
@@ -165,16 +174,16 @@ export function substituteXmlVariables(configFile, tags, variableMap, parameterF
     return isSubstitutionApplied;
 }
 
-function updateXmlConfigNodeAttribute(xmlDocument, xmlNode, variableMap, replacableTokenValues, ltxDomUtiltiyInstance): boolean {
-    var isSubstitutionApplied: boolean = false;
-    var sections = ltxDomUtiltiyInstance.getChildElementsByTagName(xmlNode, "section");
-    for(var section of sections) {
+function updateXmlConfigNodeAttribute(xmlNode, variableMap, replacableTokenValues, npmDomUtiltiyInstance): boolean {
+    let isSubstitutionApplied: boolean = false;
+    let sections = npmDomUtiltiyInstance.getChildElementsByTagName(xmlNode, "section");
+    for(let section of sections) {
         if(varUtility.isObject(section)) {
-            var sectionName = section.attr('name');
+            let sectionName = section.getAttribute('name');
             if(!varUtility.isEmpty(sectionName)) {
-                var customSectionNodes = ltxDomUtiltiyInstance.getElementsByTagName(sectionName);
+                let customSectionNodes = npmDomUtiltiyInstance.getElementsByTagName(sectionName);
                 if( customSectionNodes.length != 0) {
-                    var customNode = customSectionNodes[0];
+                    let customNode = customSectionNodes[0];
                     isSubstitutionApplied = updateXmlNodeAttribute(customNode, variableMap, replacableTokenValues) || isSubstitutionApplied;
                 }
             }
@@ -185,49 +194,57 @@ function updateXmlConfigNodeAttribute(xmlDocument, xmlNode, variableMap, replaca
 
 function updateXmlNodeAttribute(xmlDomNode, variableMap, replacableTokenValues): boolean {
 
-    var isSubstitutionApplied: boolean = false;
-    if (varUtility.isEmpty(xmlDomNode) || !varUtility.isObject(xmlDomNode) || xmlDomNode.name == "#comment") {
+    let isSubstitutionApplied: boolean = false;
+    if (varUtility.isEmpty(xmlDomNode) || !varUtility.isObject(xmlDomNode) || xmlDomNode.nodeName == "#comment") {
         tl.debug("Provided node is empty or a comment.");
         return isSubstitutionApplied;
     }
 
-    var xmlDomNodeAttributes = xmlDomNode.attrs;
     const ConfigFileAppSettingsToken = 'CONFIG_FILE_SETTINGS_TOKEN';
+    if(xmlDomNode.attributes) {
+        let xmlDomNodeAttributes = xmlDomNode.attributes;
+        for (let i = 0; i < xmlDomNodeAttributes.length; i ++) {
+            let attribute = xmlDomNodeAttributes[i];
+            let attributeNameValue = (attribute.nodeName === "key" || attribute.nodeName == "name") ? attribute.nodeValue : attribute.nodeName;
+            let attributeName = (attribute.nodeName === "key" || attribute.nodeName == "name") ? "value" : attribute.nodeName;
 
-    for(var attributeName in xmlDomNodeAttributes) {
-        var attributeNameValue = (attributeName === "key" || attributeName == "name") ? xmlDomNodeAttributes[attributeName] : attributeName;
-        var attributeName = (attributeName === "key" || attributeName == "name") ? "value" : attributeName;
-
-        if(variableMap[attributeNameValue] != undefined) {
-            var ConfigFileAppSettingsTokenName = ConfigFileAppSettingsToken + '(' + attributeNameValue + ')';
-            let isValueReplaced: boolean = false;
-            if(xmlDomNode.getAttr(attributeName) != undefined) {
-                console.log(tl.loc('UpdatingKeyWithTokenValue' , attributeNameValue , ConfigFileAppSettingsTokenName));
-                xmlDomNode.attr(attributeName, ConfigFileAppSettingsTokenName);
-                isValueReplaced = true;
-            } else {
-                var children = xmlDomNode.children;
-                for(var childNode of children) {
-                    if(varUtility.isObject(childNode) && childNode.name == attributeName) {
-                        if (childNode.children.length === 1) {
-                            console.log(tl.loc('UpdatingKeyWithTokenValue' , attributeNameValue , ConfigFileAppSettingsTokenName));
-                            childNode.children[0] = ConfigFileAppSettingsTokenName;
-                            isValueReplaced = true;
+            if(variableMap[attributeNameValue] != undefined) {
+                let ConfigFileAppSettingsTokenName = ConfigFileAppSettingsToken + '(' + attributeNameValue + ')';
+                let isValueReplaced: boolean = false;
+                if (xmlDomNode.hasAttribute(attributeName)) {
+                    console.log(tl.loc('UpdatingKeyWithTokenValue' , attributeNameValue , ConfigFileAppSettingsTokenName));
+                    xmlDomNode.setAttribute(attributeName, ConfigFileAppSettingsTokenName);
+                    isValueReplaced = true;
+                }
+                else if(xmlDomNode.hasChildNodes()) {
+                    let children = xmlDomNode.childNodes;
+                    for (let childs = 0; childs < children.length; childs ++) {
+                        let childNode = children[childs];
+                        if(varUtility.isObject(childNode) && childNode.nodeName == attributeName) {
+                            if (childNode.childNodes.length === 1) {
+                                console.log(tl.loc('UpdatingKeyWithTokenValue' , attributeNameValue , ConfigFileAppSettingsTokenName));
+                                childNode.childNodes[0].nodeValue = ConfigFileAppSettingsTokenName;
+                                childNode.childNodes[0].data = ConfigFileAppSettingsTokenName;
+                                isValueReplaced = true;
+                            }
                         }
                     }
                 }
-            }
 
-            if(isValueReplaced) {
-                replacableTokenValues[ConfigFileAppSettingsTokenName] =  variableMap[attributeNameValue].replace(/"/g, "'");
-                isSubstitutionApplied = true;
+                if(isValueReplaced) {
+                    replacableTokenValues[ConfigFileAppSettingsTokenName] =  variableMap[attributeNameValue].replace(/"/g, "'");
+                    isSubstitutionApplied = true;
+                }
             }
         }
     }
-    var children = xmlDomNode.children;
-    for(var childNode of children) {
-        if(varUtility.isObject(childNode)) {
-            isSubstitutionApplied = updateXmlNodeAttribute(childNode, variableMap, replacableTokenValues) || isSubstitutionApplied;
+    if(xmlDomNode.hasChildNodes()) {
+        let children = xmlDomNode.childNodes;
+        for (let childs = 0; childs < children.length; childs ++) {
+            let childNode = children[childs];
+            if(varUtility.isObject(childNode)) {
+                isSubstitutionApplied = updateXmlNodeAttribute(childNode, variableMap, replacableTokenValues) || isSubstitutionApplied;
+            }
         }
     }
     return isSubstitutionApplied;
@@ -235,38 +252,42 @@ function updateXmlNodeAttribute(xmlDomNode, variableMap, replacableTokenValues):
 
 function updateXmlConnectionStringsNodeAttribute(xmlDomNode, variableMap, replacableTokenValues): boolean {
 
-    var isSubstitutionApplied: boolean = false;
+    let isSubstitutionApplied: boolean = false;
     const ConfigFileConnStringToken = 'CONFIG_FILE_CONN_STRING_TOKEN';
-    if (varUtility.isEmpty(xmlDomNode) || !varUtility.isObject(xmlDomNode) || xmlDomNode.name == "#comment") {
+    if (varUtility.isEmpty(xmlDomNode) || !varUtility.isObject(xmlDomNode) || xmlDomNode.nodeName == "#comment") {
         tl.debug("Provided node is empty or a comment.");
         return isSubstitutionApplied;
     }
-    var xmlDomNodeAttributes = xmlDomNode.attrs;
 
-    if(xmlDomNodeAttributes.hasOwnProperty("connectionString")) {
-        if(xmlDomNodeAttributes.hasOwnProperty("name") && variableMap[xmlDomNodeAttributes.name]) {
-            var ConfigFileConnStringTokenName = ConfigFileConnStringToken + '(' + xmlDomNodeAttributes.name + ')';
-            tl.debug(tl.loc('SubstitutingConnectionStringValue' , xmlDomNodeAttributes.name , ConfigFileConnStringTokenName));
-            xmlDomNode.attr("connectionString", ConfigFileConnStringTokenName);
-            replacableTokenValues[ConfigFileConnStringTokenName] = variableMap[xmlDomNodeAttributes.name].replace(/"/g, "'");
-            isSubstitutionApplied = true;
-        }
-        else if(variableMap["connectionString"] != undefined) {
-            var ConfigFileConnStringTokenName = ConfigFileConnStringToken + '(connectionString)';
-            tl.debug(tl.loc('SubstitutingConnectionStringValue' , xmlDomNodeAttributes.name , ConfigFileConnStringTokenName));
-            xmlDomNode.attr("connectionString", ConfigFileConnStringTokenName);
-            replacableTokenValues[ConfigFileConnStringTokenName] = variableMap["connectionString"].replace(/"/g, "'");
-            isSubstitutionApplied = true
+    if(xmlDomNode.hasAttributes()) {
+        if(xmlDomNode.hasAttribute("connectionString")) {
+            var connectionStringName = xmlDomNode.getAttribute("name");
+            if (connectionStringName && variableMap[xmlDomNode.getAttribute("name")]) {
+                let ConfigFileConnStringTokenName = ConfigFileConnStringToken + '(' + connectionStringName + ')';
+                tl.debug(tl.loc('SubstitutingConnectionStringValue' , connectionStringName , ConfigFileConnStringTokenName));
+                xmlDomNode.setAttribute("connectionString", ConfigFileConnStringTokenName);
+                replacableTokenValues[ConfigFileConnStringTokenName] = variableMap[connectionStringName].replace(/"/g, "'");
+                isSubstitutionApplied = true;
+            }
+            else if(variableMap["connectionString"] != undefined) {
+                let ConfigFileConnStringTokenName = ConfigFileConnStringToken + '(connectionString)';
+                tl.debug(tl.loc('SubstitutingConnectionStringValue' , connectionStringName , ConfigFileConnStringTokenName));
+                xmlDomNode.setAttribute("connectionString", ConfigFileConnStringTokenName);
+                replacableTokenValues[ConfigFileConnStringTokenName] = variableMap["connectionString"].replace(/"/g, "'");
+                isSubstitutionApplied = true
+            }
         }
     }
 
-    var children = xmlDomNode.children;
-    for(var childNode of children) {
-        if(varUtility.isObject(childNode)) {
-            isSubstitutionApplied =  updateXmlConnectionStringsNodeAttribute(childNode, variableMap, replacableTokenValues) || isSubstitutionApplied;
+    if(xmlDomNode.hasChildNodes()) {
+        let children = xmlDomNode.childNodes;
+        for (let childs = 0; childs < children.length; childs ++) {
+            let childNode = children[childs];
+            if(varUtility.isObject(childNode)) {
+                isSubstitutionApplied =  updateXmlConnectionStringsNodeAttribute(childNode, variableMap, replacableTokenValues) || isSubstitutionApplied;
+            }
         }
     }
-
     return isSubstitutionApplied;
 }
 
@@ -275,11 +296,21 @@ function replaceEscapeXMLCharacters(xmlDOMNode) {
         return;
     }
 
-    for(var xmlAttribute in xmlDOMNode.attrs) {
-        xmlDOMNode.attrs[xmlAttribute] = xmlDOMNode.attrs[xmlAttribute].replace(/'/g, "APOS_CHARACTER_TOKEN");
+    if(xmlDOMNode.attributes) {
+        let xmlDomNodeAttributes = xmlDOMNode.attributes;
+        for(let xmlAttribute = 0 ; xmlAttribute < xmlDomNodeAttributes.length; xmlAttribute ++) {
+            if(xmlDomNodeAttributes[xmlAttribute]) {
+                (xmlDomNodeAttributes[xmlAttribute]).nodeValue = ((xmlDomNodeAttributes[xmlAttribute]).nodeValue).replace(/'/g, "APOS_CHARACTER_TOKEN");
+            }
+        }
     }
 
-    for(var xmlChild of xmlDOMNode.children) {
-        replaceEscapeXMLCharacters(xmlChild);
+    if(xmlDOMNode.hasChildNodes())
+    {
+        let xmlDOMchildNodes = xmlDOMNode.childNodes;
+        for (let i = 0; i <xmlDOMchildNodes.length; i++) {
+            let xmlChild = xmlDOMchildNodes[i];
+            replaceEscapeXMLCharacters(xmlChild);
+        }
     }
 }
\ No newline at end of file
diff --git a/Tasks/FileTransformV1/task.json b/Tasks/FileTransformV1/task.json
index 04968601b8b4..11ee0fd599d3 100644
--- a/Tasks/FileTransformV1/task.json
+++ b/Tasks/FileTransformV1/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 1,
         "Minor": 156,
-        "Patch": 3
+        "Patch": 4
     },
     "instanceNameFormat": "File Transform: $(Package)",
     "groups": [
diff --git a/Tasks/FileTransformV1/task.loc.json b/Tasks/FileTransformV1/task.loc.json
index e72c9afcaf08..ac0a1cbcf8be 100644
--- a/Tasks/FileTransformV1/task.loc.json
+++ b/Tasks/FileTransformV1/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 1,
     "Minor": 156,
-    "Patch": 3
+    "Patch": 4
   },
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
   "groups": [
diff --git a/Tasks/FileTransformV2/task.json b/Tasks/FileTransformV2/task.json
index b9cf11b7f069..cbf1896944a3 100644
--- a/Tasks/FileTransformV2/task.json
+++ b/Tasks/FileTransformV2/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 2,
         "Minor": 0,
-        "Patch": 1
+        "Patch": 2
     },
     "preview": "true",
     "releaseNotes": "More optimized task fields that allow users to enable any/all of the transformation (XML), variable substitution (JSON and XML) features in a single task instance.</br>Task fails when any of the configured transformation/substitution is NOT applied or when the task is no-op.",
diff --git a/Tasks/FileTransformV2/task.loc.json b/Tasks/FileTransformV2/task.loc.json
index fb2ee5f843d9..80e9680327d6 100644
--- a/Tasks/FileTransformV2/task.loc.json
+++ b/Tasks/FileTransformV2/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 2,
     "Minor": 0,
-    "Patch": 1
+    "Patch": 2
   },
   "preview": "true",
   "releaseNotes": "ms-resource:loc.releaseNotes",
diff --git a/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.json b/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.json
index d50c7546f5ce..5de085fb4c41 100644
--- a/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.json
+++ b/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 0,
         "Minor": 156,
-        "Patch": 3
+        "Patch": 4
     },
     "demands": [],
     "minimumAgentVersion": "2.104.1",
diff --git a/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.loc.json b/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.loc.json
index ce55cf27ee25..6766666e444c 100644
--- a/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.loc.json
+++ b/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 0,
     "Minor": 156,
-    "Patch": 3
+    "Patch": 4
   },
   "demands": [],
   "minimumAgentVersion": "2.104.1",
diff --git a/Tasks/MysqlDeploymentOnMachineGroupV1/task.json b/Tasks/MysqlDeploymentOnMachineGroupV1/task.json
index b81650459086..a226bd1b05ea 100644
--- a/Tasks/MysqlDeploymentOnMachineGroupV1/task.json
+++ b/Tasks/MysqlDeploymentOnMachineGroupV1/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 1,
         "Minor": 156,
-        "Patch": 4
+        "Patch": 5
     },
     "demands": [],
     "minimumAgentVersion": "1.100.0",
diff --git a/Tasks/MysqlDeploymentOnMachineGroupV1/task.loc.json b/Tasks/MysqlDeploymentOnMachineGroupV1/task.loc.json
index 24728f53c10a..4b59dfa49e31 100644
--- a/Tasks/MysqlDeploymentOnMachineGroupV1/task.loc.json
+++ b/Tasks/MysqlDeploymentOnMachineGroupV1/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 1,
     "Minor": 156,
-    "Patch": 4
+    "Patch": 5
   },
   "demands": [],
   "minimumAgentVersion": "1.100.0",
diff --git a/package-lock.json b/package-lock.json
index 040e9ad55c70..38be5acfca30 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -896,6 +896,11 @@
       "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
       "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=",
       "dev": true
+	  },
+    "xmldom": {
+      "version": "0.1.27",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
     }
   }
 }
diff --git a/package.json b/package.json
index 3c7ac1701f84..990749eb9823 100644
--- a/package.json
+++ b/package.json
@@ -45,5 +45,8 @@
     "typed-rest-client": "1.0.9",
     "typescript": "2.3.4",
     "validator": "3.33.0"
+  },
+  "dependencies": {
+    "xmldom": "^0.1.27"
   }
 }