Skip to content

Commit 7497210

Browse files
authored
Changes for regex. Fix for : #11322 (#11355)
* Changes for regex
1 parent f00f4c1 commit 7497210

File tree

13 files changed

+22
-13
lines changed

13 files changed

+22
-13
lines changed

Tasks/AzureMysqlDeploymentV1/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"version": {
1818
"Major": 1,
1919
"Minor": 156,
20-
"Patch": 8
20+
"Patch": 9
2121
},
2222
"demands": [],
2323
"minimumAgentVersion": "1.100.0",

Tasks/AzureMysqlDeploymentV1/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"version": {
1818
"Major": 1,
1919
"Minor": 156,
20-
"Patch": 8
20+
"Patch": 9
2121
},
2222
"demands": [],
2323
"minimumAgentVersion": "1.100.0",

Tasks/AzureRmWebAppDeploymentV4/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 4,
2020
"Minor": 157,
21-
"Patch": 2
21+
"Patch": 3
2222
},
2323
"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.",
2424
"minimumAgentVersion": "2.104.1",

Tasks/AzureRmWebAppDeploymentV4/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 4,
2020
"Minor": 157,
21-
"Patch": 2
21+
"Patch": 3
2222
},
2323
"releaseNotes": "ms-resource:loc.releaseNotes",
2424
"minimumAgentVersion": "2.104.1",

Tasks/Common/webdeployment-common-v2/xdttransformationutility.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,22 @@ export function specialXdtTransformation(rootFolder, transformConfig, sourceConf
8484
var sourceBasename = "", transformXmlFiles = {};
8585

8686
if(sourceConfig.indexOf("*") != -1){
87-
var sourceConfigSuffix = sourceConfig.substr(sourceConfig.lastIndexOf("*")+1);
87+
var sourceConfigSuffix = sourceConfig.substr(sourceConfig.lastIndexOf("*") + 1);
88+
if(sourceConfigSuffix.indexOf("\\") != -1) {
89+
sourceConfigSuffix = sourceConfigSuffix.substr(sourceConfigSuffix.lastIndexOf("\\") + 1);
90+
}
8891
sourceBasename = path.win32.basename(sourceXmlFile.replace(/\.config/ig,'\.config'), sourceConfigSuffix);
92+
if(JSON.stringify(sourceBasename) == JSON.stringify(sourceConfigSuffix)) {
93+
sourceBasename = "";
94+
}
8995
}
9096

9197
if(transformConfig.indexOf("*") != -1){
9298
if(sourceBasename) {
9399
var transformConfigSuffix = transformConfig.substr(transformConfig.lastIndexOf("*") + 1);
100+
if(transformConfigSuffix.indexOf("\\") != -1) {
101+
transformConfigSuffix = transformConfigSuffix.substr(transformConfigSuffix.lastIndexOf("\\") + 1);
102+
}
94103
var transformXmlFile = path.join(path.dirname(sourceXmlFile), sourceBasename + transformConfigSuffix);
95104
transformXmlFiles[transformXmlFile.toLowerCase()] = transformXmlFile;
96105
}

Tasks/FileTransformV1/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 1,
2020
"Minor": 156,
21-
"Patch": 2
21+
"Patch": 3
2222
},
2323
"instanceNameFormat": "File Transform: $(Package)",
2424
"groups": [

Tasks/FileTransformV1/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 1,
2020
"Minor": 156,
21-
"Patch": 2
21+
"Patch": 3
2222
},
2323
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
2424
"groups": [

Tasks/FileTransformV2/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 2,
2020
"Minor": 0,
21-
"Patch": 0
21+
"Patch": 1
2222
},
2323
"preview": "true",
2424
"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.",

Tasks/FileTransformV2/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 2,
2020
"Minor": 0,
21-
"Patch": 0
21+
"Patch": 1
2222
},
2323
"preview": "true",
2424
"releaseNotes": "ms-resource:loc.releaseNotes",

Tasks/IISWebAppDeploymentOnMachineGroupV0/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"version": {
1818
"Major": 0,
1919
"Minor": 156,
20-
"Patch": 2
20+
"Patch": 3
2121
},
2222
"demands": [],
2323
"minimumAgentVersion": "2.104.1",

0 commit comments

Comments
 (0)