Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Node6hotfixes/azure app service settings #14161

Merged
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
409f46b
Set up CI with Azure Pipelines
agrataru Dec 2, 2020
631fa44
adding the exact copy of the webdeployment-common-v2 in common-npm-pa…
agrataru Dec 23, 2020
7056479
adding changes for making exposing it as npm package
agrataru Dec 23, 2020
8d758b3
Revert "Set up CI with Azure Pipelines"
agrataru Dec 23, 2020
87d8b27
Revert "adding changes for making exposing it as npm package"
agrataru Dec 24, 2020
752c434
Revert "adding the exact copy of the webdeployment-common-v2 in commo…
agrataru Dec 24, 2020
f8a7365
Merge remote-tracking branch 'upstream/master'
agrataru Dec 24, 2020
73914db
[AzureAppServiceSettingsV1] adding changes for node10 changes
agrataru Jan 4, 2021
6faabcb
adding the execution to node10 in task.json
agrataru Jan 4, 2021
9abfe99
Merge remote-tracking branch 'upstream/master'
Jan 6, 2021
d74f1a7
Merge remote-tracking branch 'upstream/master'
Jan 6, 2021
87e2310
Merge branch 'master' of https://github.com/agrataru/azure-pipelines-…
Jan 6, 2021
32417f8
[AzureAppServiceSettingsV1] updating the azure-pipelines-tasks-azurer…
Jan 7, 2021
a1f0502
Merge remote-tracking branch 'upstream/master'
agrataru Jan 8, 2021
ae75718
Merge remote-tracking branch 'upstream/master' into node6hotfixes/azu…
agrataru Feb 17, 2021
8723453
adding AzureAppServiceSettingsV1 new minor version
agrataru Feb 17, 2021
ce13c2c
addine new version of azurermdeploycommon
agrataru Feb 19, 2021
cfd83bf
Merge remote-tracking branch 'upstream/master'
agrataru Feb 23, 2021
c144bc5
Merge remote-tracking branch 'upstream/master'
agrataru Mar 1, 2021
93ef843
Merge remote-tracking branch 'upstream/master'
agrataru Mar 3, 2021
4a308dc
Merge remote-tracking branch 'upstream/master'
agrataru Mar 8, 2021
377b28e
Merge remote-tracking branch 'upstream/master' into master
AmrutaKawade Mar 10, 2021
0d9316e
Merge remote-tracking branch 'upstream/master' into master
AmrutaKawade Mar 11, 2021
1e4060d
Merge remote-tracking branch 'upstream/master' into master
AmrutaKawade Mar 12, 2021
ced4b69
Merge branch 'master' into node6hotfixes/azureAppServiceSettings
AmrutaKawade Mar 15, 2021
dfad788
Updating package version
AmrutaKawade Mar 15, 2021
14bf506
Merge remote-tracking branch 'upstream/master' into master
AmrutaKawade Mar 19, 2021
7383e02
Merge remote-tracking branch 'upstream/master' into master
AmrutaKawade Mar 19, 2021
3fb64ed
Merge remote-tracking branch 'upstream/master' into master
AmrutaKawade Mar 19, 2021
16aa813
Merge branch 'master' into node6hotfixes/azureAppServiceSettings
AmrutaKawade Mar 19, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Tasks/AzureAppServiceSettingsV1/azurewebappsettings.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import tl = require('azure-pipelines-task-lib/task');
import path = require('path');
import { AzureEndpoint } from 'azurermdeploycommon/azure-arm-rest/azureModels';
import { AzureRMEndpoint, dispose } from 'azurermdeploycommon/azure-arm-rest/azure-arm-endpoint';
import { AzureAppService } from 'azurermdeploycommon/azure-arm-rest/azure-arm-app-service';
import { AzureAppServiceUtility } from 'azurermdeploycommon/operations/AzureAppServiceUtility';
import { Resources } from 'azurermdeploycommon/azure-arm-rest/azure-arm-resource';
import { AzureEndpoint } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azureModels';
import { AzureRMEndpoint, dispose } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-endpoint';
import { AzureAppService } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-app-service';
import { AzureAppServiceUtility } from 'azure-pipelines-tasks-azurermdeploycommon/operations/AzureAppServiceUtility';
import { Resources } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-resource';

export class AzureResourceFilterUtils {
public static async getResourceGroupName(endpoint: AzureEndpoint, resourceType: string, resourceName: string): Promise<string> {
Expand All @@ -30,7 +30,7 @@ async function main() {

try {
tl.setResourcePath(path.join( __dirname, 'task.json'));
tl.setResourcePath(path.join( __dirname, 'node_modules/azurermdeploycommon/module.json'));
tl.setResourcePath(path.join( __dirname, 'node_modules/azure-pipelines-tasks-azurermdeploycommon/module.json'));
var connectedServiceName = tl.getInput('ConnectedServiceName', true);
var webAppName: string = tl.getInput('appName', true);
var resourceGroupName: string = tl.getInput('resourceGroupName', false);
Expand Down
12 changes: 0 additions & 12 deletions Tasks/AzureAppServiceSettingsV1/make.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,2 @@
{
"common": [
{
"module": "../Common/AzureRmDeploy-common",
"type": "node",
"dest": "./",
"compile" : true
}
],
"externals": {
"archivePackages": [
]
}
}
Loading