Merge from Azure master

cSpell.json

@@ -2285,4 +2285,4 @@
             ]
         }
     ]
-}
+}

specification/advisor/resource-manager/Microsoft.Advisor/stable/2017-04-19/advisor.json

@@ -707,6 +707,20 @@
             "type": "string"
           }
         },
+        "applicableScenarios": {
+          "description": "The list of scenarios applicable to this metadata entity.",
+          "type": "array",
+          "items": {
+            "enum": [
+              "Alerts"
+            ],
+            "type": "string",
+            "x-ms-enum": {
+              "name": "Scenario",
+              "modelAsString": true
+            }
+          }
+        },
         "supportedValues": {
           "description": "The list of supported values.",
           "type": "array",

specification/advisor/resource-manager/Microsoft.Advisor/stable/2017-04-19/examples/GetRecommendationMetadataEntity.json

@@ -15,6 +15,9 @@
             "category",
             "impact"
           ],
+          "applicableScenarios": [
+            "Alerts"
+          ],
           "supportedValues": [
             {
               "id": "6a2b1e70-bd4c-4163-86de-5243d7ac05ee",

specification/advisor/resource-manager/Microsoft.Advisor/stable/2017-04-19/examples/ListRecommendationMetadata.json

@@ -17,6 +17,9 @@
                 "category",
                 "impact"
               ],
+              "applicableScenarios": [
+                "Alerts"
+              ],
               "supportedValues": [
                 {
                   "id": "6a2b1e70-bd4c-4163-86de-5243d7ac05ee",
@@ -36,6 +39,9 @@
             "properties": {
               "displayName": "Category",
               "dependsOn": null,
+              "applicableScenarios": [
+                "Alerts"
+              ],
               "supportedValues": [
                 {
                   "id": "Cost",
@@ -55,6 +61,7 @@
             "properties": {
               "displayName": "Impact",
               "dependsOn": null,
+              "applicableScenarios": null,
               "supportedValues": [
                 {
                   "id": "High",

specification/batch/data-plane/readme.md

@@ -254,7 +254,7 @@ csharp:
   license-header: MICROSOFT_MIT_NO_VERSION
   payload-flattening-threshold: 1
   namespace: Microsoft.Azure.Batch.Protocol
-  output-folder: $(csharp-sdks-folder)/Batch/DataPlane/Azure.Batch/GeneratedProtocol
+  output-folder: $(csharp-sdks-folder)/batch/Microsoft.Azure.Batch/src/Generated
   clear-output-folder: true
   client-side-validation: false
 ```

specification/cognitiveservices/data-plane/AnomalyDetector/preview/v1.0/AnomalyDetector.json

@@ -345,4 +345,4 @@
       "x-ms-skip-url-encoding": true
     }
   }
-}
+}

specification/cognitiveservices/data-plane/AnomalyDetector/preview/v1.0/examples/EntireDetect.json

@@ -4,148 +4,196 @@
     "Content-Type": "application/json",
     "Ocp-Apim-Subscription-Key": "{API key}",
     "body": {
-      "series": [ {
+      "series": [
+        {
           "timestamp": "1972-01-01T00:00:00Z",
           "value": 826
-        }, {
+        },
+        {
           "timestamp": "1972-02-01T00:00:00Z",
           "value": 799
-        }, {
+        },
+        {
           "timestamp": "1972-03-01T00:00:00Z",
           "value": 890
-        }, {
+        },
+        {
           "timestamp": "1972-04-01T00:00:00Z",
           "value": 900
-        }, {
+        },
+        {
           "timestamp": "1972-05-01T00:00:00Z",
           "value": 961
-        }, {
+        },
+        {
           "timestamp": "1972-06-01T00:00:00Z",
           "value": 935
-        }, {
+        },
+        {
           "timestamp": "1972-07-01T00:00:00Z",
           "value": 894
-        }, {
+        },
+        {
           "timestamp": "1972-08-01T00:00:00Z",
           "value": 855
-        }, {
+        },
+        {
           "timestamp": "1972-09-01T00:00:00Z",
           "value": 809
-        }, {
+        },
+        {
           "timestamp": "1972-10-01T00:00:00Z",
           "value": 810
-        }, {
+        },
+        {
           "timestamp": "1972-11-01T00:00:00Z",
           "value": 766
-        }, {
+        },
+        {
           "timestamp": "1972-12-01T00:00:00Z",
           "value": 805
-        }, {
+        },
+        {
           "timestamp": "1973-01-01T00:00:00Z",
           "value": 821
-        }, {
+        },
+        {
           "timestamp": "1973-02-01T00:00:00Z",
           "value": 773
-        }, {
+        },
+        {
           "timestamp": "1973-03-01T00:00:00Z",
           "value": 883
-        }, {
+        },
+        {
           "timestamp": "1973-04-01T00:00:00Z",
           "value": 898
-        }, {
+        },
+        {
           "timestamp": "1973-05-01T00:00:00Z",
           "value": 957
-        }, {
+        },
+        {
           "timestamp": "1973-06-01T00:00:00Z",
           "value": 924
-        }, {
+        },
+        {
           "timestamp": "1973-07-01T00:00:00Z",
           "value": 881
-        }, {
+        },
+        {
           "timestamp": "1973-08-01T00:00:00Z",
           "value": 837
-        }, {
+        },
+        {
           "timestamp": "1973-09-01T00:00:00Z",
           "value": 784
-        }, {
+        },
+        {
           "timestamp": "1973-10-01T00:00:00Z",
           "value": 791
-        }, {
+        },
+        {
           "timestamp": "1973-11-01T00:00:00Z",
           "value": 760
-        }, {
+        },
+        {
           "timestamp": "1973-12-01T00:00:00Z",
           "value": 802
-        }, {
+        },
+        {
           "timestamp": "1974-01-01T00:00:00Z",
           "value": 828
-        }, {
+        },
+        {
           "timestamp": "1974-02-01T00:00:00Z",
           "value": 1030
-        }, {
+        },
+        {
           "timestamp": "1974-03-01T00:00:00Z",
           "value": 889
-        }, {
+        },
+        {
           "timestamp": "1974-04-01T00:00:00Z",
           "value": 902
-        }, {
+        },
+        {
           "timestamp": "1974-05-01T00:00:00Z",
           "value": 969
-        }, {
+        },
+        {
           "timestamp": "1974-06-01T00:00:00Z",
           "value": 947
-        }, {
+        },
+        {
           "timestamp": "1974-07-01T00:00:00Z",
           "value": 908
-        }, {
+        },
+        {
           "timestamp": "1974-08-01T00:00:00Z",
           "value": 867
-        }, {
+        },
+        {
           "timestamp": "1974-09-01T00:00:00Z",
           "value": 815
-        }, {
+        },
+        {
           "timestamp": "1974-10-01T00:00:00Z",
           "value": 812
-        }, {
+        },
+        {
           "timestamp": "1974-11-01T00:00:00Z",
           "value": 773
-        }, {
+        },
+        {
           "timestamp": "1974-12-01T00:00:00Z",
           "value": 813
-        }, {
+        },
+        {
           "timestamp": "1975-01-01T00:00:00Z",
           "value": 834
-        }, {
+        },
+        {
           "timestamp": "1975-02-01T00:00:00Z",
           "value": 782
-        }, {
+        },
+        {
           "timestamp": "1975-03-01T00:00:00Z",
           "value": 892
-        }, {
+        },
+        {
           "timestamp": "1975-04-01T00:00:00Z",
           "value": 903
-        }, {
+        },
+        {
           "timestamp": "1975-05-01T00:00:00Z",
           "value": 966
-        }, {
+        },
+        {
           "timestamp": "1975-06-01T00:00:00Z",
           "value": 937
-        }, {
+        },
+        {
           "timestamp": "1975-07-01T00:00:00Z",
           "value": 896
-        }, {
+        },
+        {
           "timestamp": "1975-08-01T00:00:00Z",
           "value": 858
-        }, {
+        },
+        {
           "timestamp": "1975-09-01T00:00:00Z",
           "value": 817
-        }, {
+        },
+        {
           "timestamp": "1975-10-01T00:00:00Z",
           "value": 827
-        }, {
+        },
+        {
           "timestamp": "1975-11-01T00:00:00Z",
           "value": 797
-        }, {
+        },
+        {
           "timestamp": "1975-12-01T00:00:00Z",
           "value": 843
         }
@@ -462,4 +510,4 @@
       }
     }
   }
-}
+}