Fixing cyclic dependencies

Author: Shrisha Kumar

schemas/2021-09-09/uiFormDefinition.schema.json

@@ -379,6 +379,16 @@
       ]
     },
     "formControls": {
+      "oneOf": [
+        {
+          "$ref": "#/definitions/formControlsWithoutSection"
+        },
+        {
+          "$ref": "#/definitions/Microsoft.Common.Section"
+        }
+      ]
+    },
+    "formControlsWithoutSection": {
       "oneOf": [
         {
           "$ref": "#/definitions/Microsoft.Common.CheckBox"
@@ -407,9 +417,6 @@
         {
           "$ref": "#/definitions/Microsoft.Common.ResourceScope"
         },
-        {
-          "$ref": "#/definitions/Microsoft.Common.Section"
-        },
         {
           "$ref": "#/definitions/Microsoft.Common.Selector"
         },
@@ -1898,52 +1905,6 @@
       },
       "additionalProperties": false
     },
-    "Microsoft.Common.Section": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Common.Section"
-          ]
-        },
-        "label": {
-          "$ref": "#/definitions/stringResource"
-        },
-        "elements": {
-          "type": "array",
-          "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/formControls"
-              },
-              {
-                "not": {
-                  "$ref": "#/definitions/Microsoft.Common.Section"
-                }
-              }
-            ]
-          },
-          "minItems": 1
-        },
-        "visible": {
-          "type": [
-            "boolean",
-            "string"
-          ]
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "name",
-        "type",
-        "label",
-        "elements"
-      ]
-    },
     "Microsoft.Common.Selector": {
       "type": "object",
       "properties": {
@@ -3879,6 +3840,52 @@
         }
       ]
     },
+    "Microsoft.Common.Section": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Common.Section"
+          ]
+        },
+        "label": {
+          "$ref": "#/definitions/stringResource"
+        },
+        "elements": {
+          "type": "array",
+          "items": {
+            "allOf": [
+              {
+                "$ref": "#/definitions/formControlsWithoutSection"
+              },
+              {
+                "not": {
+                  "$ref": "#/definitions/Microsoft.Common.Section"
+                }
+              }
+            ]
+          },
+          "minItems": 1
+        },
+        "visible": {
+          "type": [
+            "boolean",
+            "string"
+          ]
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "name",
+        "type",
+        "label",
+        "elements"
+      ]
+    },
     "formControlsWithoutResourceScope": {
       "allOf": [
         {