From 13c0cc49e69c80a80b0ed64eb9f475777705d41f Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Thu, 27 Aug 2020 09:40:52 +0000 Subject: [PATCH 1/2] Update from master --- schemas/2015-01-01/deploymentTemplate.json | 1 - schemas/2019-05-01-preview/Microsoft.AppPlatform.json | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/schemas/2015-01-01/deploymentTemplate.json b/schemas/2015-01-01/deploymentTemplate.json index 8a18d0e65a..85b558a680 100644 --- a/schemas/2015-01-01/deploymentTemplate.json +++ b/schemas/2015-01-01/deploymentTemplate.json @@ -890,7 +890,6 @@ { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_firewallRules" }, { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_virtualNetworkRules" }, { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_securityAlertPolicies" }, - { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_Administrators" }, { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers" }, { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_configurations" }, { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_databases" }, diff --git a/schemas/2019-05-01-preview/Microsoft.AppPlatform.json b/schemas/2019-05-01-preview/Microsoft.AppPlatform.json index 944eaf5118..7d55877ade 100644 --- a/schemas/2019-05-01-preview/Microsoft.AppPlatform.json +++ b/schemas/2019-05-01-preview/Microsoft.AppPlatform.json @@ -684,13 +684,18 @@ ], "description": "Required Memory size in GB, basic tier should be in range (1, 2), standard tier should be in range (1, 8)" }, + "netCoreMainEntryPath": { + "type": "string", + "description": "The path to the .NET executable relative to zip root" + }, "runtimeVersion": { "oneOf": [ { "type": "string", "enum": [ "Java_8", - "Java_11" + "Java_11", + "NetCore_31" ] }, { @@ -1181,6 +1186,7 @@ "type": "string", "enum": [ "Jar", + "NetCoreZip", "Source" ] }, From 5225420f9f0755132abe960d079774ba2cdc60bf Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Thu, 27 Aug 2020 09:40:56 +0000 Subject: [PATCH 2/2] Generated from b992797823b5e7b088079ec7a3704a1e755719dd update examples --- schemas/2015-01-01/deploymentTemplate.json | 1 + .../Microsoft.AppPlatform.json | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/schemas/2015-01-01/deploymentTemplate.json b/schemas/2015-01-01/deploymentTemplate.json index 85b558a680..8a18d0e65a 100644 --- a/schemas/2015-01-01/deploymentTemplate.json +++ b/schemas/2015-01-01/deploymentTemplate.json @@ -890,6 +890,7 @@ { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_firewallRules" }, { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_virtualNetworkRules" }, { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_securityAlertPolicies" }, + { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_Administrators" }, { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers" }, { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_configurations" }, { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_databases" }, diff --git a/schemas/2019-05-01-preview/Microsoft.AppPlatform.json b/schemas/2019-05-01-preview/Microsoft.AppPlatform.json index 7d55877ade..a736963e1a 100644 --- a/schemas/2019-05-01-preview/Microsoft.AppPlatform.json +++ b/schemas/2019-05-01-preview/Microsoft.AppPlatform.json @@ -219,6 +219,17 @@ ], "description": "Deployment resource properties payload" }, + "sku": { + "oneOf": [ + { + "$ref": "#/definitions/Sku" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sku of Azure Spring Cloud" + }, "type": { "type": "string", "enum": [ @@ -1021,6 +1032,17 @@ ], "description": "Deployment resource properties payload" }, + "sku": { + "oneOf": [ + { + "$ref": "#/definitions/Sku" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sku of Azure Spring Cloud" + }, "type": { "type": "string", "enum": [