Merge from original

Author: mentat9

schemas/2014-04-01-preview/deploymentTemplate.json

@@ -40,19 +40,28 @@
                 },
                 {
                   "enum": [
-                    "Free",
-                    "Bronze",
-                    "Silver",
-                    "Gold",
-                    "Platinum",
-                    "Premier"
+                    "free",
+                    "bronze",
+                    "silver",
+                    "gold",
+                    "platinum",
+                    "premier"
                   ]
                 }
               ],
               "description": "Plan name"
             },
             "publisher": {
-              "type": "string",
+              "oneOf": [
+                {
+                  "$ref": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+                },
+                {
+                  "enum": [
+                    "Sendgrid"
+                  ]
+                }
+              ],
               "description": "Publisher name"
             },
             "product": {
@@ -62,12 +71,7 @@
                 },
                 {
                   "enum": [
-                    "free",
-                    "bronze",
-                    "silver",
-                    "gold",
-                    "platinum",
-                    "2500000"
+                    "sendgrid_azure"
                   ]
                 }
               ],
@@ -78,7 +82,7 @@
               "description": "Promotion code"
             }
           },
-          "required": ["name", "product"],
+          "required": ["name", "publisher", "product"],
           "description": "SendGrid plan"
         },
         "properties": {
@@ -126,4 +130,4 @@
       "description": "SendGrid resources that user purchases"
     }
   }
-}
+}

schemas/2015-01-01/Sendgrid.Email.json

@@ -300,6 +300,18 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2018-06-30/Microsoft.Automation.json#/resourceDefinitions/automationAccounts_python2Packages" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-06-30/Microsoft.Automation.json#/resourceDefinitions/automationAccounts_runbooks" },
                   { "$ref": "https://schema.management.azure.com/schemas/2015-10-01/Microsoft.Media.json#/resourceDefinitions/mediaServices" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-07-01/Microsoft.Media.json#/resourceDefinitions/mediaServices" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-07-01/Microsoft.Media.json#/resourceDefinitions/mediaServices_accountFilters" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-07-01/Microsoft.Media.json#/resourceDefinitions/mediaServices_assets" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-07-01/Microsoft.Media.json#/resourceDefinitions/mediaServices_assets_assetFilters" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-07-01/Microsoft.Media.json#/resourceDefinitions/mediaServices_contentKeyPolicies" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-07-01/Microsoft.Media.json#/resourceDefinitions/mediaServices_liveEvents" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-07-01/Microsoft.Media.json#/resourceDefinitions/mediaServices_liveEvents_liveOutputs" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-07-01/Microsoft.Media.json#/resourceDefinitions/mediaServices_streamingEndpoints" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-07-01/Microsoft.Media.json#/resourceDefinitions/mediaServices_streamingLocators" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-07-01/Microsoft.Media.json#/resourceDefinitions/mediaServices_streamingPolicies" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-07-01/Microsoft.Media.json#/resourceDefinitions/mediaServices_transforms" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-07-01/Microsoft.Media.json#/resourceDefinitions/mediaServices_transforms_jobs" },
                   { "$ref": "https://schema.management.azure.com/schemas/2016-02-03/Microsoft.Devices.json#/resourceDefinitions/IotHubs" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-07-01/Microsoft.Devices.json#/resourceDefinitions/IotHubs" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-01-22/Microsoft.Devices.json#/resourceDefinitions/IotHubs" },