diff --git a/generators/generators/app/templates/core/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json b/generators/generators/app/templates/core/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json index eea65b7c3..d199d5bba 100644 --- a/generators/generators/app/templates/core/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json +++ b/generators/generators/app/templates/core/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json @@ -19,10 +19,10 @@ }, "newAppServicePlanSku": { "value": { - "name": "S1", - "tier": "Standard", - "size": "S1", - "family": "S", + "name": "P1v2", + "tier": "PremiumV2", + "size": "P1v2", + "family": "Pv2", "capacity": 1 } }, @@ -33,4 +33,4 @@ "value": "" } } -} \ No newline at end of file +} diff --git a/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json b/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json index f18061813..d459c8c53 100644 --- a/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json +++ b/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json @@ -1,5 +1,5 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "groupName": { diff --git a/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json b/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json index f3f07b497..765f70d79 100644 --- a/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json +++ b/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json @@ -1,5 +1,5 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "groupName": { @@ -19,10 +19,10 @@ }, "appServicePlanSku": { "value": { - "name": "S1", - "tier": "Standard", - "size": "S1", - "family": "S", + "name": "P1v2", + "tier": "PremiumV2", + "size": "P1v2", + "family": "Pv2", "capacity": 1 } }, diff --git a/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json b/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json index f79264452..3fd275b61 100644 --- a/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json +++ b/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json @@ -1,5 +1,5 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "groupName": { @@ -67,7 +67,7 @@ "properties": { "mode": "Incremental", "template": { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": {}, "variables": {}, diff --git a/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json b/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json index 200b5c2d0..724792e17 100644 --- a/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json +++ b/generators/generators/app/templates/core/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json @@ -1,5 +1,5 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "groupName": { @@ -59,9 +59,7 @@ } }, "variables": { - "appServicePlanName": "[parameters('appServicePlanName')]", "resourcesLocation": "[if(empty(parameters('appServicePlanLocation')), parameters('groupLocation'), parameters('appServicePlanLocation'))]", - "appServiceName": "[parameters('appServiceName')]", "resourceGroupId": "[concat(subscription().id, '/resourceGroups/', parameters('groupName'))]" }, "resources": [ @@ -83,7 +81,7 @@ "properties": { "mode": "Incremental", "template": { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": {}, "variables": {}, @@ -91,7 +89,7 @@ { "comments": "Create a new App Service Plan", "type": "Microsoft.Web/serverfarms", - "name": "[variables('appServicePlanName')]", + "name": "[parameters('appServicePlanName')]", "apiVersion": "2018-02-01", "location": "[variables('resourcesLocation')]", "sku": "[parameters('appServicePlanSku')]", @@ -110,15 +108,15 @@ { "comments": "Create a Web App using the new App Service Plan", "type": "Microsoft.Web/sites", - "apiVersion": "2015-08-01", + "apiVersion": "2018-11-01", "location": "[variables('resourcesLocation')]", "kind": "app,linux", "dependsOn": [ - "[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', variables('appServicePlanName'))]" + "[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', parameters('appServicePlanName'))]" ], - "name": "[variables('appServiceName')]", + "name": "[parameters('appServiceName')]", "properties": { - "name": "[variables('appServiceName')]", + "name": "[parameters('appServiceName')]", "hostNameSslStates": [ { "name": "[concat(parameters('appServiceName'), '.azurewebsites.net')]", @@ -131,7 +129,7 @@ "hostType": "Repository" } ], - "serverFarmId": "[variables('appServicePlanName')]", + "serverFarmId": "[parameters('appServicePlanName')]", "reserved": true, "isXenon": false, "hyperV": false, @@ -163,14 +161,13 @@ "https://botservice.hosting.portal.azure.net", "https://hosting.onecloud.azure-test.net/" ] - }, - "webSocketsEnabled": true + } } } }, { "type": "Microsoft.Web/sites/config", - "apiVersion": "2016-08-01", + "apiVersion": "2018-11-01", "name": "[concat(parameters('appServiceName'), '/web')]", "location": "[variables('resourcesLocation')]", "dependsOn": [ diff --git a/generators/generators/app/templates/echo/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json b/generators/generators/app/templates/echo/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json index eea65b7c3..d199d5bba 100644 --- a/generators/generators/app/templates/echo/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json +++ b/generators/generators/app/templates/echo/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json @@ -19,10 +19,10 @@ }, "newAppServicePlanSku": { "value": { - "name": "S1", - "tier": "Standard", - "size": "S1", - "family": "S", + "name": "P1v2", + "tier": "PremiumV2", + "size": "P1v2", + "family": "Pv2", "capacity": 1 } }, @@ -33,4 +33,4 @@ "value": "" } } -} \ No newline at end of file +} diff --git a/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json b/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json index f18061813..d459c8c53 100644 --- a/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json +++ b/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json @@ -1,5 +1,5 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "groupName": { diff --git a/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json b/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json index f3f07b497..765f70d79 100644 --- a/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json +++ b/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json @@ -1,5 +1,5 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "groupName": { @@ -19,10 +19,10 @@ }, "appServicePlanSku": { "value": { - "name": "S1", - "tier": "Standard", - "size": "S1", - "family": "S", + "name": "P1v2", + "tier": "PremiumV2", + "size": "P1v2", + "family": "Pv2", "capacity": 1 } }, diff --git a/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json b/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json index f79264452..3fd275b61 100644 --- a/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json +++ b/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json @@ -1,5 +1,5 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "groupName": { @@ -67,7 +67,7 @@ "properties": { "mode": "Incremental", "template": { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": {}, "variables": {}, diff --git a/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json b/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json index 200b5c2d0..724792e17 100644 --- a/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json +++ b/generators/generators/app/templates/echo/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json @@ -1,5 +1,5 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "groupName": { @@ -59,9 +59,7 @@ } }, "variables": { - "appServicePlanName": "[parameters('appServicePlanName')]", "resourcesLocation": "[if(empty(parameters('appServicePlanLocation')), parameters('groupLocation'), parameters('appServicePlanLocation'))]", - "appServiceName": "[parameters('appServiceName')]", "resourceGroupId": "[concat(subscription().id, '/resourceGroups/', parameters('groupName'))]" }, "resources": [ @@ -83,7 +81,7 @@ "properties": { "mode": "Incremental", "template": { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": {}, "variables": {}, @@ -91,7 +89,7 @@ { "comments": "Create a new App Service Plan", "type": "Microsoft.Web/serverfarms", - "name": "[variables('appServicePlanName')]", + "name": "[parameters('appServicePlanName')]", "apiVersion": "2018-02-01", "location": "[variables('resourcesLocation')]", "sku": "[parameters('appServicePlanSku')]", @@ -110,15 +108,15 @@ { "comments": "Create a Web App using the new App Service Plan", "type": "Microsoft.Web/sites", - "apiVersion": "2015-08-01", + "apiVersion": "2018-11-01", "location": "[variables('resourcesLocation')]", "kind": "app,linux", "dependsOn": [ - "[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', variables('appServicePlanName'))]" + "[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', parameters('appServicePlanName'))]" ], - "name": "[variables('appServiceName')]", + "name": "[parameters('appServiceName')]", "properties": { - "name": "[variables('appServiceName')]", + "name": "[parameters('appServiceName')]", "hostNameSslStates": [ { "name": "[concat(parameters('appServiceName'), '.azurewebsites.net')]", @@ -131,7 +129,7 @@ "hostType": "Repository" } ], - "serverFarmId": "[variables('appServicePlanName')]", + "serverFarmId": "[parameters('appServicePlanName')]", "reserved": true, "isXenon": false, "hyperV": false, @@ -163,14 +161,13 @@ "https://botservice.hosting.portal.azure.net", "https://hosting.onecloud.azure-test.net/" ] - }, - "webSocketsEnabled": true + } } } }, { "type": "Microsoft.Web/sites/config", - "apiVersion": "2016-08-01", + "apiVersion": "2018-11-01", "name": "[concat(parameters('appServiceName'), '/web')]", "location": "[variables('resourcesLocation')]", "dependsOn": [ diff --git a/generators/generators/app/templates/empty/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json b/generators/generators/app/templates/empty/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json index eea65b7c3..d199d5bba 100644 --- a/generators/generators/app/templates/empty/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json +++ b/generators/generators/app/templates/empty/project/deploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json @@ -19,10 +19,10 @@ }, "newAppServicePlanSku": { "value": { - "name": "S1", - "tier": "Standard", - "size": "S1", - "family": "S", + "name": "P1v2", + "tier": "PremiumV2", + "size": "P1v2", + "family": "Pv2", "capacity": 1 } }, @@ -33,4 +33,4 @@ "value": "" } } -} \ No newline at end of file +} diff --git a/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json b/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json index f18061813..d459c8c53 100644 --- a/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json +++ b/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json @@ -1,5 +1,5 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "groupName": { diff --git a/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json b/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json index f3f07b497..765f70d79 100644 --- a/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json +++ b/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json @@ -1,5 +1,5 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "groupName": { @@ -19,10 +19,10 @@ }, "appServicePlanSku": { "value": { - "name": "S1", - "tier": "Standard", - "size": "S1", - "family": "S", + "name": "P1v2", + "tier": "PremiumV2", + "size": "P1v2", + "family": "Pv2", "capacity": 1 } }, diff --git a/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json b/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json index f79264452..3fd275b61 100644 --- a/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json +++ b/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json @@ -1,5 +1,5 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "groupName": { @@ -67,7 +67,7 @@ "properties": { "mode": "Incremental", "template": { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": {}, "variables": {}, diff --git a/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json b/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json index 200b5c2d0..724792e17 100644 --- a/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json +++ b/generators/generators/app/templates/empty/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json @@ -1,5 +1,5 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { "groupName": { @@ -59,9 +59,7 @@ } }, "variables": { - "appServicePlanName": "[parameters('appServicePlanName')]", "resourcesLocation": "[if(empty(parameters('appServicePlanLocation')), parameters('groupLocation'), parameters('appServicePlanLocation'))]", - "appServiceName": "[parameters('appServiceName')]", "resourceGroupId": "[concat(subscription().id, '/resourceGroups/', parameters('groupName'))]" }, "resources": [ @@ -83,7 +81,7 @@ "properties": { "mode": "Incremental", "template": { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": {}, "variables": {}, @@ -91,7 +89,7 @@ { "comments": "Create a new App Service Plan", "type": "Microsoft.Web/serverfarms", - "name": "[variables('appServicePlanName')]", + "name": "[parameters('appServicePlanName')]", "apiVersion": "2018-02-01", "location": "[variables('resourcesLocation')]", "sku": "[parameters('appServicePlanSku')]", @@ -110,15 +108,15 @@ { "comments": "Create a Web App using the new App Service Plan", "type": "Microsoft.Web/sites", - "apiVersion": "2015-08-01", + "apiVersion": "2018-11-01", "location": "[variables('resourcesLocation')]", "kind": "app,linux", "dependsOn": [ - "[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', variables('appServicePlanName'))]" + "[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', parameters('appServicePlanName'))]" ], - "name": "[variables('appServiceName')]", + "name": "[parameters('appServiceName')]", "properties": { - "name": "[variables('appServiceName')]", + "name": "[parameters('appServiceName')]", "hostNameSslStates": [ { "name": "[concat(parameters('appServiceName'), '.azurewebsites.net')]", @@ -131,7 +129,7 @@ "hostType": "Repository" } ], - "serverFarmId": "[variables('appServicePlanName')]", + "serverFarmId": "[parameters('appServicePlanName')]", "reserved": true, "isXenon": false, "hyperV": false, @@ -163,14 +161,13 @@ "https://botservice.hosting.portal.azure.net", "https://hosting.onecloud.azure-test.net/" ] - }, - "webSocketsEnabled": true + } } } }, { "type": "Microsoft.Web/sites/config", - "apiVersion": "2016-08-01", + "apiVersion": "2018-11-01", "name": "[concat(parameters('appServiceName'), '/web')]", "location": "[variables('resourcesLocation')]", "dependsOn": [