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.

Sign up for GitHub

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

Jump to bottom

Function App Changes to support new App Stacks and improve error messages #19613

Merged
merged 10 commits into from
Mar 8, 2024
Merged

Function App Changes to support new App Stacks and improve error messages #19613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
72595d4
Updates for Sprint 236
FinVamp1 Mar 6, 2024
c9465e7
Merge branch 'master' into users/FinVamp1/FunctionsSprint234
FinVamp1 Mar 6, 2024
ddfcd43
Updating Loc.json files to fix pipeline runs.
FinVamp1 Mar 6, 2024
1fbdee4
Merge branch 'master' into users/FinVamp1/FunctionsSprint234
mmrazik Mar 8, 2024
fc8ef82
Updating Task versopns
FinVamp1 Mar 8, 2024
e7153cf
Merge branch 'users/FinVamp1/FunctionsSprint234' of https://github.co…
FinVamp1 Mar 8, 2024
fb42502
Update task version to 237
FinVamp1 Mar 8, 2024
6ea904c
Merge branch 'master' into users/FinVamp1/FunctionsSprint234
v-mohithgc Mar 8, 2024
41c9bcb
This updates the Version Map information
FinVamp1 Mar 8, 2024
9be4f7b
Merge branch 'master' into users/FinVamp1/FunctionsSprint234
FinVamp1 Mar 8, 2024
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
9 changes: 8 additions & 1 deletion Tasks/AzureFunctionAppV1/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,13 @@ const linuxFunctionRuntimeSettingValue = new Map([
[ 'DOTNET|2.2', 'dotnet ' ],
[ 'DOTNET|3.1', 'dotnet ' ],
[ 'DOTNET|6.0', 'dotnet ' ],
[ 'DOTNET-ISOLATED|6.0', 'dotnet-isolated '],
[ 'DOTNET-ISOLATED|7.0', 'dotnet-isolated '],
[ 'DOTNET-ISOLATED|8.0', 'dotnet-isolated '],
[ 'JAVA|8', 'java ' ],
[ 'JAVA|11', 'java ' ],
[ 'JAVA|17', 'java ' ],
[ 'JAVA|21', 'java ' ],
[ 'NODE|8', 'node ' ],
[ 'NODE|10', 'node ' ],
[ 'NODE|12', 'node ' ],
Expand All @@ -27,7 +32,9 @@ const linuxFunctionRuntimeSettingValue = new Map([
[ 'PYTHON|3.6', 'python '],
[ 'PYTHON|3.7', 'python '],
[ 'PYTHON|3.8', 'python '],
[ 'PYTHON|3.9', 'python ']
[ 'PYTHON|3.9', 'python '],
[ 'PYTHON|3.10', 'python '],
[ 'PYTHON|3.11', 'python ']
]);

export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymentProvider {
Expand Down
223 changes: 74 additions & 149 deletions Tasks/AzureFunctionAppV1/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Tasks/AzureFunctionAppV1/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"agent-base": "6.0.2",
"azure-devops-node-api": "11.2.0",
"azure-pipelines-task-lib": "^4.4.0",
"azure-pipelines-tasks-azure-arm-rest": "^3.226.0",
"azure-pipelines-tasks-webdeployment-common": "^4.222.2",
"azure-pipelines-tasks-azure-arm-rest": "^3.236.0",
"azure-pipelines-tasks-webdeployment-common": "^4.233.2",
"azure-storage": "2.10.7",
"moment": "^2.29.3",
"q": "1.4.1",
"uuid": "3.1.0",
"xml2js": "^0.6.0"
"xml2js": "^0.6.2"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
32 changes: 17 additions & 15 deletions Tasks/AzureFunctionAppV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 231,
"Minor": 237,
"Patch": 0
},
"minimumAgentVersion": "2.104.1",
Expand Down Expand Up @@ -116,20 +116,22 @@
"EditableOptions": "True"
},
"options": {
"DOTNET|2.2": "DOTNET|2.2 (functionapp v2)",
"DOTNET|3.1": "DOTNET|3.1 (functionapp v3)",
"DOTNET|6.0": "DOTNET|6.0 (functionapp v4)",
"JAVA|8": "JAVA|8 (functionapp v2/v3/v4)",
"JAVA|11": "JAVA|11 (functionapp v3/v4)",
"NODE|8": "NODE|8 (functionapp v2)",
"NODE|10": "NODE|10 (functionapp v2/v3)",
"NODE|12": "NODE|12 (functionapp v3)",
"NODE|14": "NODE|14 (functionapp v3/v4)",
"NODE|16": "NODE|16 (functionapp v4)",
"PYTHON|3.6": "PYTHON|3.6 (functionapp v2/v3)",
"PYTHON|3.7": "PYTHON|3.7 (functionapp v2/v3/v4)",
"PYTHON|3.8": "PYTHON|3.8 (functionapp v3/v4)",
"PYTHON|3.9": "PYTHON|3.9 (functionapp v3/v4)"
"DOTNET|6.0": "DOTNET|6.0",
"DOTNET-ISOLATED|6.0": "DOTNET-ISOLATED|6.0",
"DOTNET-ISOLATED|7.0": "DOTNET-ISOLATED|7.0",
"DOTNET-ISOLATED|8.0": "DOTNET-ISOLATED|8.0",
"JAVA|8": "JAVA|8",
"JAVA|11": "JAVA|11",
"JAVA|17": "JAVA|17",
"JAVA|21": "JAVA|21",
"NODE|14": "NODE|14",
"NODE|16": "NODE|16",
"NODE|18": "NODE|18",
"NODE|20": "NODE|20",
"PYTHON|3.8": "PYTHON|3.8",
"PYTHON|3.9": "PYTHON|3.9",
"PYTHON|3.10": "PYTHON|3.10",
"PYTHON|3.11": "PYTHON|3.11"
},
"visibleRule": "appType = functionAppLinux",
"helpMarkDown": "Refer [this doc](https://docs.microsoft.com/azure/azure-functions/functions-versions#languages) for supported runtime versions. Old values like `DOCKER|microsoft/azure-functions-*` are deprecated, please use the new values from dropdown."
Expand Down
32 changes: 17 additions & 15 deletions Tasks/AzureFunctionAppV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 231,
"Minor": 237,
"Patch": 0
},
"minimumAgentVersion": "2.104.1",
Expand Down Expand Up @@ -116,20 +116,22 @@
"EditableOptions": "True"
},
"options": {
"DOTNET|2.2": "DOTNET|2.2 (functionapp v2)",
"DOTNET|3.1": "DOTNET|3.1 (functionapp v3)",
"DOTNET|6.0": "DOTNET|6.0 (functionapp v4)",
"JAVA|8": "JAVA|8 (functionapp v2/v3/v4)",
"JAVA|11": "JAVA|11 (functionapp v3/v4)",
"NODE|8": "NODE|8 (functionapp v2)",
"NODE|10": "NODE|10 (functionapp v2/v3)",
"NODE|12": "NODE|12 (functionapp v3)",
"NODE|14": "NODE|14 (functionapp v3/v4)",
"NODE|16": "NODE|16 (functionapp v4)",
"PYTHON|3.6": "PYTHON|3.6 (functionapp v2/v3)",
"PYTHON|3.7": "PYTHON|3.7 (functionapp v2/v3/v4)",
"PYTHON|3.8": "PYTHON|3.8 (functionapp v3/v4)",
"PYTHON|3.9": "PYTHON|3.9 (functionapp v3/v4)"
"DOTNET|6.0": "DOTNET|6.0",
"DOTNET-ISOLATED|6.0": "DOTNET-ISOLATED|6.0",
"DOTNET-ISOLATED|7.0": "DOTNET-ISOLATED|7.0",
"DOTNET-ISOLATED|8.0": "DOTNET-ISOLATED|8.0",
"JAVA|8": "JAVA|8",
"JAVA|11": "JAVA|11",
"JAVA|17": "JAVA|17",
"JAVA|21": "JAVA|21",
"NODE|14": "NODE|14",
"NODE|16": "NODE|16",
"NODE|18": "NODE|18",
"NODE|20": "NODE|20",
"PYTHON|3.8": "PYTHON|3.8",
"PYTHON|3.9": "PYTHON|3.9",
"PYTHON|3.10": "PYTHON|3.10",
"PYTHON|3.11": "PYTHON|3.11"
},
"visibleRule": "appType = functionAppLinux",
"helpMarkDown": "ms-resource:loc.input.help.runtimeStack"
Expand Down
8 changes: 6 additions & 2 deletions Tasks/AzureFunctionAppV2/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,24 @@ const linuxFunctionRuntimeSettingValue = new Map([
[ 'DOTNET|2.2', 'dotnet ' ],
[ 'DOTNET|3.1', 'dotnet ' ],
[ 'DOTNET|6.0', 'dotnet ' ],
[ 'DOTNET-ISOLATED|6.0', 'dotnet-isolated '],
[ 'DOTNET-ISOLATED|7.0', 'dotnet-isolated '],
[ 'DOTNET-ISOLATED|8.0', 'dotnet-isolated '],
[ 'JAVA|8', 'java ' ],
[ 'JAVA|11', 'java ' ],
[ 'JAVA|17', 'java ' ],
[ 'JAVA|21', 'java ' ],
[ 'NODE|8', 'node ' ],
[ 'NODE|10', 'node ' ],
[ 'NODE|12', 'node ' ],
[ 'NODE|14', 'node ' ],
[ 'NODE|16', 'node ' ],
[ 'NODE|18', 'node ' ],
[ 'PYTHON|3.6', 'python '],
[ 'PYTHON|3.7', 'python '],
[ 'PYTHON|3.8', 'python '],
[ 'PYTHON|3.9', 'python '],
[ 'PYTHON|3.10', 'python ']
[ 'PYTHON|3.10', 'python '],
[ 'PYTHON|3.11', 'python ']
]);

export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymentProvider {
Expand Down
Loading