Merge remote-tracking branch 'origin/main' into autogenerate

Author: Autogenerator Pipeline

schemas/2022-01-01-preview/Microsoft.App.json

@@ -846,6 +846,17 @@
           ],
           "description": "ActiveRevisionsMode controls how active revisions are handled for the Container app:\n<list><item>Multiple: multiple revisions can be active. If no value if provided, this is the default</item><item>Single: Only one revision can be active at a time. Revision weights can not be used in this mode</item></list>."
         },
+        "dapr": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Dapr"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Container App Dapr configuration."
+        },
         "ingress": {
           "oneOf": [
             {
@@ -2689,17 +2700,6 @@
           ],
           "description": "List of container definitions for the Container App."
         },
-        "dapr": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Dapr"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Container App Dapr configuration."
-        },
         "revisionSuffix": {
           "type": "string",
           "description": "User friendly suffix that is appended to the revision name"