Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Commit 8856407

Browse files
fangyangcifangyangci
committed
fix java
1 parent e58db1f commit 8856407

File tree

15 files changed

+69
-78
lines changed

15 files changed

+69
-78
lines changed

‎generators/generators/app/templates/core/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
},
2020
"newAppServicePlanSku": {
2121
"value": {
22-
"name": "S1",
23-
"tier": "Standard",
24-
"size": "S1",
25-
"family": "S",
22+
"name": "P1v2",
23+
"tier": "PremiumV2",
24+
"size": "P1v2",
25+
"family": "Pv2",
2626
"capacity": 1
2727
}
2828
},
@@ -33,4 +33,4 @@
3333
"value": ""
3434
}
3535
}
36-
}
36+
}

‎generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"groupName": {

‎generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"groupName": {
@@ -19,10 +19,10 @@
1919
},
2020
"appServicePlanSku": {
2121
"value": {
22-
"name": "S1",
23-
"tier": "Standard",
24-
"size": "S1",
25-
"family": "S",
22+
"name": "P1v2",
23+
"tier": "PremiumV2",
24+
"size": "P1v2",
25+
"family": "Pv2",
2626
"capacity": 1
2727
}
2828
},

‎generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"groupName": {
@@ -67,7 +67,7 @@
6767
"properties": {
6868
"mode": "Incremental",
6969
"template": {
70-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
70+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
7171
"contentVersion": "1.0.0.0",
7272
"parameters": {},
7373
"variables": {},

‎generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"groupName": {
@@ -59,9 +59,7 @@
5959
}
6060
},
6161
"variables": {
62-
"appServicePlanName": "[parameters('appServicePlanName')]",
6362
"resourcesLocation": "[if(empty(parameters('appServicePlanLocation')), parameters('groupLocation'), parameters('appServicePlanLocation'))]",
64-
"appServiceName": "[parameters('appServiceName')]",
6563
"resourceGroupId": "[concat(subscription().id, '/resourceGroups/', parameters('groupName'))]"
6664
},
6765
"resources": [
@@ -83,15 +81,15 @@
8381
"properties": {
8482
"mode": "Incremental",
8583
"template": {
86-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
84+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
8785
"contentVersion": "1.0.0.0",
8886
"parameters": {},
8987
"variables": {},
9088
"resources": [
9189
{
9290
"comments": "Create a new App Service Plan",
9391
"type": "Microsoft.Web/serverfarms",
94-
"name": "[variables('appServicePlanName')]",
92+
"name": "[parameters('appServicePlanName')]",
9593
"apiVersion": "2018-02-01",
9694
"location": "[variables('resourcesLocation')]",
9795
"sku": "[parameters('appServicePlanSku')]",
@@ -110,15 +108,15 @@
110108
{
111109
"comments": "Create a Web App using the new App Service Plan",
112110
"type": "Microsoft.Web/sites",
113-
"apiVersion": "2015-08-01",
111+
"apiVersion": "2018-11-01",
114112
"location": "[variables('resourcesLocation')]",
115113
"kind": "app,linux",
116114
"dependsOn": [
117-
"[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', variables('appServicePlanName'))]"
115+
"[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', parameters('appServicePlanName'))]"
118116
],
119-
"name": "[variables('appServiceName')]",
117+
"name": "[parameters('appServiceName')]",
120118
"properties": {
121-
"name": "[variables('appServiceName')]",
119+
"name": "[parameters('appServiceName')]",
122120
"hostNameSslStates": [
123121
{
124122
"name": "[concat(parameters('appServiceName'), '.azurewebsites.net')]",
@@ -131,7 +129,7 @@
131129
"hostType": "Repository"
132130
}
133131
],
134-
"serverFarmId": "[variables('appServicePlanName')]",
132+
"serverFarmId": "[parameters('appServicePlanName')]",
135133
"reserved": true,
136134
"isXenon": false,
137135
"hyperV": false,
@@ -163,14 +161,13 @@
163161
"https://botservice.hosting.portal.azure.net",
164162
"https://hosting.onecloud.azure-test.net/"
165163
]
166-
},
167-
"webSocketsEnabled": true
164+
}
168165
}
169166
}
170167
},
171168
{
172169
"type": "Microsoft.Web/sites/config",
173-
"apiVersion": "2016-08-01",
170+
"apiVersion": "2018-11-01",
174171
"name": "[concat(parameters('appServiceName'), '/web')]",
175172
"location": "[variables('resourcesLocation')]",
176173
"dependsOn": [

‎generators/generators/app/templates/echo/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
},
2020
"newAppServicePlanSku": {
2121
"value": {
22-
"name": "S1",
23-
"tier": "Standard",
24-
"size": "S1",
25-
"family": "S",
22+
"name": "P1v2",
23+
"tier": "PremiumV2",
24+
"size": "P1v2",
25+
"family": "Pv2",
2626
"capacity": 1
2727
}
2828
},
@@ -33,4 +33,4 @@
3333
"value": ""
3434
}
3535
}
36-
}
36+
}

‎generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"groupName": {

‎generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"groupName": {
@@ -19,10 +19,10 @@
1919
},
2020
"appServicePlanSku": {
2121
"value": {
22-
"name": "S1",
23-
"tier": "Standard",
24-
"size": "S1",
25-
"family": "S",
22+
"name": "P1v2",
23+
"tier": "PremiumV2",
24+
"size": "P1v2",
25+
"family": "Pv2",
2626
"capacity": 1
2727
}
2828
},

‎generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"groupName": {
@@ -67,7 +67,7 @@
6767
"properties": {
6868
"mode": "Incremental",
6969
"template": {
70-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
70+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
7171
"contentVersion": "1.0.0.0",
7272
"parameters": {},
7373
"variables": {},

‎generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"groupName": {
@@ -59,9 +59,7 @@
5959
}
6060
},
6161
"variables": {
62-
"appServicePlanName": "[parameters('appServicePlanName')]",
6362
"resourcesLocation": "[if(empty(parameters('appServicePlanLocation')), parameters('groupLocation'), parameters('appServicePlanLocation'))]",
64-
"appServiceName": "[parameters('appServiceName')]",
6563
"resourceGroupId": "[concat(subscription().id, '/resourceGroups/', parameters('groupName'))]"
6664
},
6765
"resources": [
@@ -83,15 +81,15 @@
8381
"properties": {
8482
"mode": "Incremental",
8583
"template": {
86-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
84+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
8785
"contentVersion": "1.0.0.0",
8886
"parameters": {},
8987
"variables": {},
9088
"resources": [
9189
{
9290
"comments": "Create a new App Service Plan",
9391
"type": "Microsoft.Web/serverfarms",
94-
"name": "[variables('appServicePlanName')]",
92+
"name": "[parameters('appServicePlanName')]",
9593
"apiVersion": "2018-02-01",
9694
"location": "[variables('resourcesLocation')]",
9795
"sku": "[parameters('appServicePlanSku')]",
@@ -110,15 +108,15 @@
110108
{
111109
"comments": "Create a Web App using the new App Service Plan",
112110
"type": "Microsoft.Web/sites",
113-
"apiVersion": "2015-08-01",
111+
"apiVersion": "2018-11-01",
114112
"location": "[variables('resourcesLocation')]",
115113
"kind": "app,linux",
116114
"dependsOn": [
117-
"[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', variables('appServicePlanName'))]"
115+
"[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', parameters('appServicePlanName'))]"
118116
],
119-
"name": "[variables('appServiceName')]",
117+
"name": "[parameters('appServiceName')]",
120118
"properties": {
121-
"name": "[variables('appServiceName')]",
119+
"name": "[parameters('appServiceName')]",
122120
"hostNameSslStates": [
123121
{
124122
"name": "[concat(parameters('appServiceName'), '.azurewebsites.net')]",
@@ -131,7 +129,7 @@
131129
"hostType": "Repository"
132130
}
133131
],
134-
"serverFarmId": "[variables('appServicePlanName')]",
132+
"serverFarmId": "[parameters('appServicePlanName')]",
135133
"reserved": true,
136134
"isXenon": false,
137135
"hyperV": false,
@@ -163,14 +161,13 @@
163161
"https://botservice.hosting.portal.azure.net",
164162
"https://hosting.onecloud.azure-test.net/"
165163
]
166-
},
167-
"webSocketsEnabled": true
164+
}
168165
}
169166
}
170167
},
171168
{
172169
"type": "Microsoft.Web/sites/config",
173-
"apiVersion": "2016-08-01",
170+
"apiVersion": "2018-11-01",
174171
"name": "[concat(parameters('appServiceName'), '/web')]",
175172
"location": "[variables('resourcesLocation')]",
176173
"dependsOn": [

‎generators/generators/app/templates/empty/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
},
2020
"newAppServicePlanSku": {
2121
"value": {
22-
"name": "S1",
23-
"tier": "Standard",
24-
"size": "S1",
25-
"family": "S",
22+
"name": "P1v2",
23+
"tier": "PremiumV2",
24+
"size": "P1v2",
25+
"family": "Pv2",
2626
"capacity": 1
2727
}
2828
},
@@ -33,4 +33,4 @@
3333
"value": ""
3434
}
3535
}
36-
}
36+
}

‎generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"groupName": {

‎generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"groupName": {
@@ -19,10 +19,10 @@
1919
},
2020
"appServicePlanSku": {
2121
"value": {
22-
"name": "S1",
23-
"tier": "Standard",
24-
"size": "S1",
25-
"family": "S",
22+
"name": "P1v2",
23+
"tier": "PremiumV2",
24+
"size": "P1v2",
25+
"family": "Pv2",
2626
"capacity": 1
2727
}
2828
},

‎generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"groupName": {
@@ -67,7 +67,7 @@
6767
"properties": {
6868
"mode": "Incremental",
6969
"template": {
70-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
70+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
7171
"contentVersion": "1.0.0.0",
7272
"parameters": {},
7373
"variables": {},

0 commit comments

Comments
 (0)