From aa7bd1abd91f8f44c8e796eabf23eec7f033dc77 Mon Sep 17 00:00:00 2001
From: Krisztian Bocso <118486711+krisztb@users.noreply.github.com>
Date: Mon, 23 Mar 2026 14:42:37 -0700
Subject: [PATCH 1/4] Add parentArtifactLogicalId to schema.json

parentArtifactLogicalId is mandatory to connect audience artifacts with org app parents in Git.
---
 .../orgAppAudienceDefinition/1.0.0/schema.json  | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/fabric/item/orgappaudience/definition/orgAppAudienceDefinition/1.0.0/schema.json b/fabric/item/orgappaudience/definition/orgAppAudienceDefinition/1.0.0/schema.json
index df84d230..b4a49f17 100644
--- a/fabric/item/orgappaudience/definition/orgAppAudienceDefinition/1.0.0/schema.json
+++ b/fabric/item/orgappaudience/definition/orgAppAudienceDefinition/1.0.0/schema.json
@@ -17,6 +17,10 @@
             "description": "The parent organizational app id.",
             "$ref": "#/definitions/Guid"
         },
+        "parentArtifactLogicalId": {
+            "description": "Defines the parent organizational app's logical unique identifier in Git repository.",
+            "$ref": "#/definitions/Guid"
+        },
         "elementReferences": {
             "description": "Defines the list of element references for the audience.",
             "type": [
@@ -35,9 +39,20 @@
             "maxItems": 1000
         }
     },
+    "oneOf": [
+        {
+            "required": [
+                "parentAppId"
+            ]
+        },
+        {
+            "required": [
+                "parentArtifactLogicalId"
+            ]
+        }
+    ],
     "required": [
         "$schema",
-        "parentAppId",
         "elementReferences"
     ],
     "additionalProperties": false,

From d502db2adc566db6fd8150ea4e45044335638966 Mon Sep 17 00:00:00 2001
From: Krisztian Bocso <118486711+krisztb@users.noreply.github.com>
Date: Fri, 14 Aug 2026 14:15:13 -0700
Subject: [PATCH 2/4] Remove 'settings' from required fields in schema

Org app definition 1.0.0
---
 fabric/item/orgapp/definition/orgAppDefinition/1.0.0/schema.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fabric/item/orgapp/definition/orgAppDefinition/1.0.0/schema.json b/fabric/item/orgapp/definition/orgAppDefinition/1.0.0/schema.json
index 552d1095..85f884d6 100644
--- a/fabric/item/orgapp/definition/orgAppDefinition/1.0.0/schema.json
+++ b/fabric/item/orgapp/definition/orgAppDefinition/1.0.0/schema.json
@@ -38,7 +38,6 @@
   },
   "required": [
     "$schema",
-    "settings",
     "elements"
   ],
   "additionalProperties": false,

From e1ebccbbe4c148e0393a7b7b4a051fcf8fce8474 Mon Sep 17 00:00:00 2001
From: Krisztian Bocso <118486711+krisztb@users.noreply.github.com>
Date: Fri, 14 Aug 2026 14:15:53 -0700
Subject: [PATCH 3/4] Update schema.json

Org app definition 2.0.0
---
 fabric/item/orgapp/definition/orgAppDefinition/2.0.0/schema.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fabric/item/orgapp/definition/orgAppDefinition/2.0.0/schema.json b/fabric/item/orgapp/definition/orgAppDefinition/2.0.0/schema.json
index e5fd0ba7..1f483df6 100644
--- a/fabric/item/orgapp/definition/orgAppDefinition/2.0.0/schema.json
+++ b/fabric/item/orgapp/definition/orgAppDefinition/2.0.0/schema.json
@@ -38,7 +38,6 @@
   },
   "required": [
     "$schema",
-    "settings",
     "elements"
   ],
   "additionalProperties": false,

From 0edcf755662e6b2e084683cfe2494b5efcf97444 Mon Sep 17 00:00:00 2001
From: Krisztian Bocso <118486711+krisztb@users.noreply.github.com>
Date: Fri, 14 Aug 2026 21:24:46 +0000
Subject: [PATCH 4/4] Revert "Add parentArtifactLogicalId to schema.json"

This reverts commit aa7bd1abd91f8f44c8e796eabf23eec7f033dc77.
---
 .../orgAppAudienceDefinition/1.0.0/schema.json  | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/fabric/item/orgappaudience/definition/orgAppAudienceDefinition/1.0.0/schema.json b/fabric/item/orgappaudience/definition/orgAppAudienceDefinition/1.0.0/schema.json
index b4a49f17..df84d230 100644
--- a/fabric/item/orgappaudience/definition/orgAppAudienceDefinition/1.0.0/schema.json
+++ b/fabric/item/orgappaudience/definition/orgAppAudienceDefinition/1.0.0/schema.json
@@ -17,10 +17,6 @@
             "description": "The parent organizational app id.",
             "$ref": "#/definitions/Guid"
         },
-        "parentArtifactLogicalId": {
-            "description": "Defines the parent organizational app's logical unique identifier in Git repository.",
-            "$ref": "#/definitions/Guid"
-        },
         "elementReferences": {
             "description": "Defines the list of element references for the audience.",
             "type": [
@@ -39,20 +35,9 @@
             "maxItems": 1000
         }
     },
-    "oneOf": [
-        {
-            "required": [
-                "parentAppId"
-            ]
-        },
-        {
-            "required": [
-                "parentArtifactLogicalId"
-            ]
-        }
-    ],
     "required": [
         "$schema",
+        "parentAppId",
         "elementReferences"
     ],
     "additionalProperties": false,