Skip to content

Commit 07d6b25

Browse files
FinVamp1mmrazikv-mohithgc
authored
Function App Changes to support new App Stacks and improve error messages (#19613)
* Updates for Sprint 236 * Updating Loc.json files to fix pipeline runs. * Updating Task versopns * Update task version to 237 * This updates the Version Map information --------- Co-authored-by: Martin Mrazik <[email protected]> Co-authored-by: Mohith <[email protected]>
1 parent f8e7855 commit 07d6b25

File tree

83 files changed

+16501
-445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+16501
-445
lines changed

‎Tasks/AzureFunctionAppV1/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts

+8-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,13 @@ const linuxFunctionRuntimeSettingValue = new Map([
1717
[ 'DOTNET|2.2', 'dotnet ' ],
1818
[ 'DOTNET|3.1', 'dotnet ' ],
1919
[ 'DOTNET|6.0', 'dotnet ' ],
20+
[ 'DOTNET-ISOLATED|6.0', 'dotnet-isolated '],
21+
[ 'DOTNET-ISOLATED|7.0', 'dotnet-isolated '],
22+
[ 'DOTNET-ISOLATED|8.0', 'dotnet-isolated '],
2023
[ 'JAVA|8', 'java ' ],
2124
[ 'JAVA|11', 'java ' ],
25+
[ 'JAVA|17', 'java ' ],
26+
[ 'JAVA|21', 'java ' ],
2227
[ 'NODE|8', 'node ' ],
2328
[ 'NODE|10', 'node ' ],
2429
[ 'NODE|12', 'node ' ],
@@ -27,7 +32,9 @@ const linuxFunctionRuntimeSettingValue = new Map([
2732
[ 'PYTHON|3.6', 'python '],
2833
[ 'PYTHON|3.7', 'python '],
2934
[ 'PYTHON|3.8', 'python '],
30-
[ 'PYTHON|3.9', 'python ']
35+
[ 'PYTHON|3.9', 'python '],
36+
[ 'PYTHON|3.10', 'python '],
37+
[ 'PYTHON|3.11', 'python ']
3138
]);
3239

3340
export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymentProvider {

‎Tasks/AzureFunctionAppV1/package-lock.json

+74-149
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tasks/AzureFunctionAppV1/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
"agent-base": "6.0.2",
2424
"azure-devops-node-api": "11.2.0",
2525
"azure-pipelines-task-lib": "^4.4.0",
26-
"azure-pipelines-tasks-azure-arm-rest": "^3.226.0",
27-
"azure-pipelines-tasks-webdeployment-common": "^4.222.2",
26+
"azure-pipelines-tasks-azure-arm-rest": "^3.236.0",
27+
"azure-pipelines-tasks-webdeployment-common": "^4.233.2",
2828
"azure-storage": "2.10.7",
2929
"moment": "^2.29.3",
3030
"q": "1.4.1",
3131
"uuid": "3.1.0",
32-
"xml2js": "^0.6.0"
32+
"xml2js": "^0.6.2"
3333
},
3434
"devDependencies": {
3535
"typescript": "4.0.2"

‎Tasks/AzureFunctionAppV1/task.json

+17-15
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 1,
20-
"Minor": 231,
20+
"Minor": 237,
2121
"Patch": 0
2222
},
2323
"minimumAgentVersion": "2.104.1",
@@ -116,20 +116,22 @@
116116
"EditableOptions": "True"
117117
},
118118
"options": {
119-
"DOTNET|2.2": "DOTNET|2.2 (functionapp v2)",
120-
"DOTNET|3.1": "DOTNET|3.1 (functionapp v3)",
121-
"DOTNET|6.0": "DOTNET|6.0 (functionapp v4)",
122-
"JAVA|8": "JAVA|8 (functionapp v2/v3/v4)",
123-
"JAVA|11": "JAVA|11 (functionapp v3/v4)",
124-
"NODE|8": "NODE|8 (functionapp v2)",
125-
"NODE|10": "NODE|10 (functionapp v2/v3)",
126-
"NODE|12": "NODE|12 (functionapp v3)",
127-
"NODE|14": "NODE|14 (functionapp v3/v4)",
128-
"NODE|16": "NODE|16 (functionapp v4)",
129-
"PYTHON|3.6": "PYTHON|3.6 (functionapp v2/v3)",
130-
"PYTHON|3.7": "PYTHON|3.7 (functionapp v2/v3/v4)",
131-
"PYTHON|3.8": "PYTHON|3.8 (functionapp v3/v4)",
132-
"PYTHON|3.9": "PYTHON|3.9 (functionapp v3/v4)"
119+
"DOTNET|6.0": "DOTNET|6.0",
120+
"DOTNET-ISOLATED|6.0": "DOTNET-ISOLATED|6.0",
121+
"DOTNET-ISOLATED|7.0": "DOTNET-ISOLATED|7.0",
122+
"DOTNET-ISOLATED|8.0": "DOTNET-ISOLATED|8.0",
123+
"JAVA|8": "JAVA|8",
124+
"JAVA|11": "JAVA|11",
125+
"JAVA|17": "JAVA|17",
126+
"JAVA|21": "JAVA|21",
127+
"NODE|14": "NODE|14",
128+
"NODE|16": "NODE|16",
129+
"NODE|18": "NODE|18",
130+
"NODE|20": "NODE|20",
131+
"PYTHON|3.8": "PYTHON|3.8",
132+
"PYTHON|3.9": "PYTHON|3.9",
133+
"PYTHON|3.10": "PYTHON|3.10",
134+
"PYTHON|3.11": "PYTHON|3.11"
133135
},
134136
"visibleRule": "appType = functionAppLinux",
135137
"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."

‎Tasks/AzureFunctionAppV1/task.loc.json

+17-15
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"author": "Microsoft Corporation",
1818
"version": {
1919
"Major": 1,
20-
"Minor": 231,
20+
"Minor": 237,
2121
"Patch": 0
2222
},
2323
"minimumAgentVersion": "2.104.1",
@@ -116,20 +116,22 @@
116116
"EditableOptions": "True"
117117
},
118118
"options": {
119-
"DOTNET|2.2": "DOTNET|2.2 (functionapp v2)",
120-
"DOTNET|3.1": "DOTNET|3.1 (functionapp v3)",
121-
"DOTNET|6.0": "DOTNET|6.0 (functionapp v4)",
122-
"JAVA|8": "JAVA|8 (functionapp v2/v3/v4)",
123-
"JAVA|11": "JAVA|11 (functionapp v3/v4)",
124-
"NODE|8": "NODE|8 (functionapp v2)",
125-
"NODE|10": "NODE|10 (functionapp v2/v3)",
126-
"NODE|12": "NODE|12 (functionapp v3)",
127-
"NODE|14": "NODE|14 (functionapp v3/v4)",
128-
"NODE|16": "NODE|16 (functionapp v4)",
129-
"PYTHON|3.6": "PYTHON|3.6 (functionapp v2/v3)",
130-
"PYTHON|3.7": "PYTHON|3.7 (functionapp v2/v3/v4)",
131-
"PYTHON|3.8": "PYTHON|3.8 (functionapp v3/v4)",
132-
"PYTHON|3.9": "PYTHON|3.9 (functionapp v3/v4)"
119+
"DOTNET|6.0": "DOTNET|6.0",
120+
"DOTNET-ISOLATED|6.0": "DOTNET-ISOLATED|6.0",
121+
"DOTNET-ISOLATED|7.0": "DOTNET-ISOLATED|7.0",
122+
"DOTNET-ISOLATED|8.0": "DOTNET-ISOLATED|8.0",
123+
"JAVA|8": "JAVA|8",
124+
"JAVA|11": "JAVA|11",
125+
"JAVA|17": "JAVA|17",
126+
"JAVA|21": "JAVA|21",
127+
"NODE|14": "NODE|14",
128+
"NODE|16": "NODE|16",
129+
"NODE|18": "NODE|18",
130+
"NODE|20": "NODE|20",
131+
"PYTHON|3.8": "PYTHON|3.8",
132+
"PYTHON|3.9": "PYTHON|3.9",
133+
"PYTHON|3.10": "PYTHON|3.10",
134+
"PYTHON|3.11": "PYTHON|3.11"
133135
},
134136
"visibleRule": "appType = functionAppLinux",
135137
"helpMarkDown": "ms-resource:loc.input.help.runtimeStack"

‎Tasks/AzureFunctionAppV2/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,24 @@ const linuxFunctionRuntimeSettingValue = new Map([
1919
[ 'DOTNET|2.2', 'dotnet ' ],
2020
[ 'DOTNET|3.1', 'dotnet ' ],
2121
[ 'DOTNET|6.0', 'dotnet ' ],
22+
[ 'DOTNET-ISOLATED|6.0', 'dotnet-isolated '],
2223
[ 'DOTNET-ISOLATED|7.0', 'dotnet-isolated '],
24+
[ 'DOTNET-ISOLATED|8.0', 'dotnet-isolated '],
2325
[ 'JAVA|8', 'java ' ],
2426
[ 'JAVA|11', 'java ' ],
27+
[ 'JAVA|17', 'java ' ],
28+
[ 'JAVA|21', 'java ' ],
2529
[ 'NODE|8', 'node ' ],
2630
[ 'NODE|10', 'node ' ],
2731
[ 'NODE|12', 'node ' ],
2832
[ 'NODE|14', 'node ' ],
2933
[ 'NODE|16', 'node ' ],
30-
[ 'NODE|18', 'node ' ],
3134
[ 'PYTHON|3.6', 'python '],
3235
[ 'PYTHON|3.7', 'python '],
3336
[ 'PYTHON|3.8', 'python '],
3437
[ 'PYTHON|3.9', 'python '],
35-
[ 'PYTHON|3.10', 'python ']
38+
[ 'PYTHON|3.10', 'python '],
39+
[ 'PYTHON|3.11', 'python ']
3640
]);
3741

3842
export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymentProvider {

0 commit comments

Comments
 (0)