Skip to content

Commit 9fbfffd

Browse files
authored
Azure stack URL populate fix (#7453)
1 parent e99c305 commit 9fbfffd

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
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 0,
2020
"Minor": 2,
21-
"Patch": 32
21+
"Patch": 33
2222
},
2323
"minimumAgentVersion": "1.102.0",
2424
"instanceNameFormat": "$(Action): $(WebAppName)",

Tasks/AzureAppServiceManage/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": 0,
2020
"Minor": 2,
21-
"Patch": 32
21+
"Patch": 33
2222
},
2323
"minimumAgentVersion": "1.102.0",
2424
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",

Tasks/AzureResourceGroupDeploymentV2/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": 134,
17-
"Patch": 0
17+
"Patch": 1
1818
},
1919
"demands": [],
2020
"minimumAgentVersion": "2.119.1",

Tasks/AzureResourceGroupDeploymentV2/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": 134,
17-
"Patch": 0
17+
"Patch": 1
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
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 4,
2020
"Minor": 1,
21-
"Patch": 7
21+
"Patch": 8
2222
},
2323
"releaseNotes": "What's new in version 4.* (preview)<br />Supports Kudu Zip Deploy<br />Supports App Service Environments<br />Improved UI for discovering different App service types supported by the task<br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more Information.",
2424
"minimumAgentVersion": "2.104.1",

Tasks/AzureRmWebAppDeployment/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": 1,
21-
"Patch": 7
21+
"Patch": 8
2222
},
2323
"releaseNotes": "ms-resource:loc.releaseNotes",
2424
"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
@@ -39,8 +39,10 @@ export class AzureRMEndpoint {
3939
activeDirectoryResourceID: tl.getEndpointDataParameter(this._connectedServiceName, 'activeDirectoryServiceEndpointResourceId', true)
4040
} as AzureEndpoint;
4141

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

0 commit comments

Comments
 (0)