diff --git a/Tasks/AzureMysqlDeploymentV1/task.json b/Tasks/AzureMysqlDeploymentV1/task.json index 81b03e3eac9b..a925ea167d10 100644 --- a/Tasks/AzureMysqlDeploymentV1/task.json +++ b/Tasks/AzureMysqlDeploymentV1/task.json @@ -17,7 +17,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 17 + "Patch": 18 }, "demands": [], "minimumAgentVersion": "1.100.0", diff --git a/Tasks/AzureMysqlDeploymentV1/task.loc.json b/Tasks/AzureMysqlDeploymentV1/task.loc.json index 49592a268d2d..7882f83a2b7e 100644 --- a/Tasks/AzureMysqlDeploymentV1/task.loc.json +++ b/Tasks/AzureMysqlDeploymentV1/task.loc.json @@ -17,7 +17,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 16 + "Patch": 18 }, "demands": [], "minimumAgentVersion": "1.100.0", diff --git a/Tasks/AzureRmWebAppDeploymentV3/task.json b/Tasks/AzureRmWebAppDeploymentV3/task.json index 786270fb056a..bcfd7446bcef 100644 --- a/Tasks/AzureRmWebAppDeploymentV3/task.json +++ b/Tasks/AzureRmWebAppDeploymentV3/task.json @@ -18,7 +18,7 @@ "version": { "Major": 3, "Minor": 4, - "Patch": 23 + "Patch": 24 }, "releaseNotes": "What's new in Version 3.0:
  Supports File Transformations (XDT)
  Supports Variable Substitutions(XML, JSON)
Click [here](https://aka.ms/azurermwebdeployreadme) for more information.", "minimumAgentVersion": "2.104.1", diff --git a/Tasks/AzureRmWebAppDeploymentV3/task.loc.json b/Tasks/AzureRmWebAppDeploymentV3/task.loc.json index 4b55d2b9f433..7763de4cf62a 100644 --- a/Tasks/AzureRmWebAppDeploymentV3/task.loc.json +++ b/Tasks/AzureRmWebAppDeploymentV3/task.loc.json @@ -18,7 +18,7 @@ "version": { "Major": 3, "Minor": 4, - "Patch": 23 + "Patch": 24 }, "releaseNotes": "ms-resource:loc.releaseNotes", "minimumAgentVersion": "2.104.1", diff --git a/Tasks/AzureRmWebAppDeploymentV4/task.json b/Tasks/AzureRmWebAppDeploymentV4/task.json index 1e11f30313d8..1b756ce6b450 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/task.json +++ b/Tasks/AzureRmWebAppDeploymentV4/task.json @@ -18,7 +18,7 @@ "version": { "Major": 4, "Minor": 3, - "Patch": 22 + "Patch": 23 }, "releaseNotes": "What's new in version 4.*
Supports Zip Deploy, Run From Package, War Deploy [Details here](https://aka.ms/appServiceDeploymentMethods)
Supports App Service Environments
Improved UI for discovering different App service types supported by the task
Run From Package is the preferred deployment method, which makes files in wwwroot folder read-only
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 3d2f5fa8191f..a53dc5d2a974 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/task.loc.json +++ b/Tasks/AzureRmWebAppDeploymentV4/task.loc.json @@ -18,7 +18,7 @@ "version": { "Major": 4, "Minor": 3, - "Patch": 22 + "Patch": 23 }, "releaseNotes": "ms-resource:loc.releaseNotes", "minimumAgentVersion": "2.104.1", diff --git a/Tasks/Common/webdeployment-common/fileTransformationsUtility.ts b/Tasks/Common/webdeployment-common/fileTransformationsUtility.ts index a9c72300ceec..756a6c14df3e 100644 --- a/Tasks/Common/webdeployment-common/fileTransformationsUtility.ts +++ b/Tasks/Common/webdeployment-common/fileTransformationsUtility.ts @@ -54,18 +54,18 @@ export function advancedFileTransformations(isFolderBasedDeployment: boolean, ta throw Error(tl.loc("CannotPerformXdtTransformationOnNonWindowsPlatform")); } else { - if(transformationRules.length > 0) { - var isTransformationApplied: boolean = true; + let isTransformationApplied: boolean = true; + if(transformationRules.length > 0) { transformationRules.forEach(function(rule) { var args = ParameterParser.parse(rule); if(Object.keys(args).length < 2 || !args["transform"] || !args["xml"]) { tl.error(tl.loc("MissingArgumentsforXMLTransformation")); } else if(Object.keys(args).length > 2) { - isTransformationApplied = isTransformationApplied && xdtTransformationUtility.specialXdtTransformation(folderPath, args["transform"].value, args["xml"].value, args["result"].value); + isTransformationApplied = xdtTransformationUtility.specialXdtTransformation(folderPath, args["transform"].value, args["xml"].value, args["result"].value) && isTransformationApplied; } else { - isTransformationApplied = isTransformationApplied && xdtTransformationUtility.specialXdtTransformation(folderPath, args["transform"].value, args["xml"].value); + isTransformationApplied = xdtTransformationUtility.specialXdtTransformation(folderPath, args["transform"].value, args["xml"].value) && isTransformationApplied; } }); } @@ -75,7 +75,7 @@ export function advancedFileTransformations(isFolderBasedDeployment: boolean, ta if(environmentName && environmentName.toLowerCase() != 'release') { transformConfigs.push(environmentName + ".config"); } - var isTransformationApplied: boolean = xdtTransformationUtility.basicXdtTransformation(folderPath, transformConfigs); + isTransformationApplied = xdtTransformationUtility.basicXdtTransformation(folderPath, transformConfigs); } if(isTransformationApplied) { diff --git a/Tasks/FileTransformV1/Strings/resources.resjson/en-US/resources.resjson b/Tasks/FileTransformV1/Strings/resources.resjson/en-US/resources.resjson index 88ab2136cb55..048942ebb8ab 100644 --- a/Tasks/FileTransformV1/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/FileTransformV1/Strings/resources.resjson/en-US/resources.resjson @@ -9,7 +9,7 @@ "loc.input.label.enableXmlTransform": "XML transformation", "loc.input.help.enableXmlTransform": "Config transforms will be run prior to the Variable Substitution.
XML transformations are supported only for Windows platform.", "loc.input.label.xmlTransformationRules": "Transformation rules", - "loc.input.help.xmlTransformationRules": "Provide new line separated list of transformation file rules using the syntax:
-transform -xml ", + "loc.input.help.xmlTransformationRules": "Provide new line separated list of transformation file rules using the syntax:
-transform -xml ", "loc.input.label.fileType": "File format", "loc.input.help.fileType": "Provide file format on which substitution has to be perfformed
For XML, Variables defined in the build or release pipelines will be matched against the 'key' or 'name' entries in the appSettings, applicationSettings, and connectionStrings sections of any config file and parameters.xml. Variable Substitution is run after config transforms.
To substitute JSON variables that are nested or hierarchical, specify them using JSONPath expressions.

For example, to replace the value of ‘ConnectionString’ in the sample below, you need to define a variable as ‘Data.DefaultConnection.ConnectionString’ in the build or release pipeline (or release pipeline's environment).
{
  \"Data\": {
    \"DefaultConnection\": {
      \"ConnectionString\": \"Server=(localdb)\\SQLEXPRESS;Database=MyDB;Trusted_Connection=True\"
    }
  }
}
Variable Substitution is run after configuration transforms.

Note: only custom variables defined in build/release pipelines are used in substitution. Default/system defined pipeline variables are excluded.
Note: If same variables are defined in the release pipeline and in the stage, then the stage variables will supersede the release pipeline variables.", "loc.input.label.targetFiles": "Target files", diff --git a/Tasks/FileTransformV1/task.json b/Tasks/FileTransformV1/task.json index cd62466720a8..ec79ab90c40d 100644 --- a/Tasks/FileTransformV1/task.json +++ b/Tasks/FileTransformV1/task.json @@ -52,7 +52,7 @@ "label": "Transformation rules", "defaultValue": "-transform **\\*.Release.config -xml **\\*.config\n-transform **\\*.$(Release.EnvironmentName).config -xml **\\*.config", "required": false, - "helpMarkDown": "Provide new line separated list of transformation file rules using the syntax:
-transform -xml ", + "helpMarkDown": "Provide new line separated list of transformation file rules using the syntax:
-transform -xml ", "visibleRule": "enableXmlTransform == true" }, { diff --git a/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.json b/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.json index 24758b6d9cbe..b51baf904fb0 100644 --- a/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.json +++ b/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.json @@ -16,7 +16,7 @@ "version": { "Major": 0, "Minor": 0, - "Patch": 51 + "Patch": 52 }, "demands": [], "minimumAgentVersion": "2.104.1", diff --git a/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.loc.json b/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.loc.json index fe1bc5791ac1..d4f391207f3c 100644 --- a/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.loc.json +++ b/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.loc.json @@ -16,7 +16,7 @@ "version": { "Major": 0, "Minor": 0, - "Patch": 51 + "Patch": 52 }, "demands": [], "minimumAgentVersion": "2.104.1", diff --git a/Tasks/MysqlDeploymentOnMachineGroupV1/task.json b/Tasks/MysqlDeploymentOnMachineGroupV1/task.json index b196fb9c9855..c299ca5fe3d4 100644 --- a/Tasks/MysqlDeploymentOnMachineGroupV1/task.json +++ b/Tasks/MysqlDeploymentOnMachineGroupV1/task.json @@ -17,7 +17,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 2 + "Patch": 3 }, "demands": [], "minimumAgentVersion": "1.100.0", diff --git a/Tasks/MysqlDeploymentOnMachineGroupV1/task.loc.json b/Tasks/MysqlDeploymentOnMachineGroupV1/task.loc.json index da80646c69c5..78dded23df97 100644 --- a/Tasks/MysqlDeploymentOnMachineGroupV1/task.loc.json +++ b/Tasks/MysqlDeploymentOnMachineGroupV1/task.loc.json @@ -17,7 +17,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 2 + "Patch": 3 }, "demands": [], "minimumAgentVersion": "1.100.0",