Fix test failures

anthony-c-martin · anthony-c-martin · commit 71c83cfd17e5 · 2021-03-03T15:18:41.000-05:00
diff --git a/schemas/2014-04-01-preview/deploymentTemplate.json b/schemas/2014-04-01-preview/deploymentTemplate.json
@@ -2086,6 +2086,9 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/resourceDefinitions/configurations" },
                   { "$ref": "https://schema.management.azure.com/schemas/2020-08-20-preview/Microsoft.Communication.json#/resourceDefinitions/communicationServices" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/components" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/webtests" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/autoscalesettings" },
                   { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.Application.json#/resourceDefinitions/components" },
                   { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.Application.json#/resourceDefinitions/components_analyticsItems" },
                   { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.Application.json#/resourceDefinitions/components_Annotations" },
diff --git a/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json b/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json
diff --git a/schemas/2015-01-01/deploymentTemplate.json b/schemas/2015-01-01/deploymentTemplate.json
@@ -2232,6 +2232,9 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.ResourceGraph.json#/resourceDefinitions/queries" },
                   { "$ref": "https://schema.management.azure.com/schemas/2020-08-20-preview/Microsoft.Communication.json#/resourceDefinitions/communicationServices" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/components" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/webtests" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/autoscalesettings" },
                   { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.Application.json#/resourceDefinitions/components" },
                   { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.Application.json#/resourceDefinitions/components_analyticsItems" },
                   { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.Application.json#/resourceDefinitions/components_Annotations" },
diff --git a/schemas/2019-03-01-hybrid/deploymentTemplate.json b/schemas/2019-03-01-hybrid/deploymentTemplate.json
@@ -3016,6 +3016,9 @@
               "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.BareMetal.json#/resourceDefinitions/crayServers"
             },
             { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" },
+            { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/components" },
+            { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/webtests" },
+            { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/autoscalesettings" },
             { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.Application.json#/resourceDefinitions/components" },
             { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.Application.json#/resourceDefinitions/components_analyticsItems" },
             { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.Application.json#/resourceDefinitions/components_Annotations" },
diff --git a/schemas/2019-04-01/deploymentTemplate.json b/schemas/2019-04-01/deploymentTemplate.json
@@ -1554,7 +1554,9 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.Advisor.json#/resourceDefinitions/configurations" },
                   { "$ref": "https://schema.management.azure.com/schemas/2020-10-01-preview/Microsoft.Compute.json#/resourceDefinitions/cloudServices" },
                   { "$ref": "https://schema.management.azure.com/schemas/2020-10-01-preview/Microsoft.Compute.json#/resourceDefinitions/cloudServices_updateDomains" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/components" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/webtests" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.ManuallyAuthored.json#/resourceDefinitions/autoscalesettings" },
                   { "$ref": "https://schema.management.azure.com/schemas/2020-06-01/Microsoft.Compute.Extensions.json#/resourceDefinitions/virtualMachines_extensions" },
                   { "$ref": "https://schema.management.azure.com/schemas/2020-06-01/Microsoft.Compute.Extensions.json#/resourceDefinitions/virtualMachineScaleSets_extensions" },
                   { "$ref": "https://schema.management.azure.com/schemas/2020-06-01/Microsoft.Compute.json#/resourceDefinitions/availabilitySets" },
diff --git a/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json b/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json
@@ -2065,9 +2065,6 @@
           "oneOf": [
             {
               "type": "object",
-              "additionalProperties": {
-                "$ref": "#/definitions/LabelClass"
-              },
               "properties": {}
             },
             {
diff --git a/tools/DeploymentsSchemaTests/DeploymentsSchemaTests.csproj b/tools/DeploymentsSchemaTests/DeploymentsSchemaTests.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Deployments.Templates" Version="1.0.154" />
+    <PackageReference Include="Azure.Deployments.Templates" Version="1.0.162" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />

Original file line number	Diff line number	Diff line change
`@@ -2065,9 +2065,6 @@`
`2065`	`2065`	`"oneOf": [`
`2066`	`2066`	`{`
`2067`	`2067`	`"type": "object",`
`2068`		`- "additionalProperties": {`
`2069`		`- "$ref": "#/definitions/LabelClass"`
`2070`		`- },`
`2071`	`2068`	`"properties": {}`
`2072`	`2069`	`},`
`2073`	`2070`	`{`