Skip to content

Commit 148afbc

Browse files
authored
Azure Stack populate URL fix M131 (#7451)
* Azure Stack populate URL fix * inc. patch ver
1 parent 7684368 commit 148afbc

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

Tasks/AzureAppServiceManage/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": 2,
20-
"Patch": 24
20+
"Patch": 25
2121
},
2222
"minimumAgentVersion": "1.102.0",
2323
"instanceNameFormat": "$(Action): $(WebAppName)",

Tasks/AzureAppServiceManage/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": 0,
1919
"Minor": 2,
20-
"Patch": 24
20+
"Patch": 25
2121
},
2222
"minimumAgentVersion": "1.102.0",
2323
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",

Tasks/AzureResourceGroupDeployment/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 2,
1616
"Minor": 131,
17-
"Patch": 1
17+
"Patch": 2
1818
},
1919
"demands": [],
2020
"minimumAgentVersion": "2.119.1",

Tasks/AzureResourceGroupDeployment/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 2,
1616
"Minor": 131,
17-
"Patch": 1
17+
"Patch": 2
1818
},
1919
"demands": [],
2020
"minimumAgentVersion": "2.119.1",

Tasks/AzureRmWebAppDeployment/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"version": {
1717
"Major": 3,
1818
"Minor": 3,
19-
"Patch": 47
19+
"Patch": 48
2020
},
2121
"releaseNotes": "What's new in Version 3.0: <br/>&nbsp;&nbsp;Supports File Transformations (XDT) <br/>&nbsp;&nbsp;Supports Variable Substitutions(XML, JSON) <br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more Information.",
2222
"minimumAgentVersion": "2.104.1",

Tasks/AzureRmWebAppDeployment/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"version": {
1717
"Major": 3,
1818
"Minor": 3,
19-
"Patch": 47
19+
"Patch": 48
2020
},
2121
"releaseNotes": "ms-resource:loc.releaseNotes",
2222
"minimumAgentVersion": "2.104.1",

Tasks/Common/azure-arm-rest/azure-arm-endpoint.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ export class AzureRMEndpoint {
3737
activeDirectoryResourceID: tl.getEndpointDataParameter(this._connectedServiceName, 'activeDirectoryServiceEndpointResourceId', true)
3838
} as AzureEndpoint;
3939

40-
if(this.endpoint.environment != null && this.endpoint.environment.toLowerCase() == this._environments.AzureStack && ( !this.endpoint.environmentAuthorityUrl || !this.endpoint.activeDirectoryResourceID)) {
41-
this.endpoint = await this._updateAzureStackData(this.endpoint);
40+
if(!!this.endpoint.environment && this.endpoint.environment.toLowerCase() == this._environments.AzureStack) {
41+
if(!this.endpoint.environmentAuthorityUrl || !this.endpoint.activeDirectoryResourceID) {
42+
this.endpoint = await this._updateAzureStackData(this.endpoint);
43+
}
4244
}
4345
else {
4446
this.endpoint.environmentAuthorityUrl = (!!this.endpoint.environmentAuthorityUrl) ? this.endpoint.environmentAuthorityUrl : "https://login.windows.net/";

0 commit comments

Comments
 (0)