From 2272e99ea1dec90f5134ca29d22bc15e9a22f033 Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Mon, 9 Sep 2024 12:46:57 +0300 Subject: [PATCH 1/9] Sets deletable to false --- transforms/csdl/preprocess_csdl.xsl | 12 +++++++++++- .../csdl/preprocess_csdl_test_input.xml | 7 +++++++ .../csdl/preprocess_csdl_test_output.xml | 19 ++++++++++--------- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl index 2faf602f..15220bd8 100644 --- a/transforms/csdl/preprocess_csdl.xsl +++ b/transforms/csdl/preprocess_csdl.xsl @@ -1871,7 +1871,17 @@ - + + + + + microsoft.graph.identityGovernance.entitlementManagement.acessPackageAssignment + + false + + + + diff --git a/transforms/csdl/preprocess_csdl_test_input.xml b/transforms/csdl/preprocess_csdl_test_input.xml index fcba4993..6e80f3ad 100644 --- a/transforms/csdl/preprocess_csdl_test_input.xml +++ b/transforms/csdl/preprocess_csdl_test_input.xml @@ -245,6 +245,13 @@ + + + + + + + diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml index b08e8e2b..cebf99af 100644 --- a/transforms/csdl/preprocess_csdl_test_output.xml +++ b/transforms/csdl/preprocess_csdl_test_output.xml @@ -1,4 +1,4 @@ - + @@ -562,11 +562,11 @@ - - - - - + + + + + @@ -745,6 +745,7 @@ + @@ -1190,9 +1191,9 @@ - - - + + + From 225017fd5ed9d6d0c86499046ea05226cd19d6fb Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Mon, 9 Sep 2024 12:58:16 +0300 Subject: [PATCH 2/9] Made corrections by removing extra identityGovernance path --- transforms/csdl/preprocess_csdl.xsl | 6 +++--- transforms/csdl/preprocess_csdl_test_input.xml | 2 +- transforms/csdl/preprocess_csdl_test_output.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl index 15220bd8..9073e650 100644 --- a/transforms/csdl/preprocess_csdl.xsl +++ b/transforms/csdl/preprocess_csdl.xsl @@ -1871,11 +1871,11 @@ - + - + - microsoft.graph.identityGovernance.entitlementManagement.acessPackageAssignment + microsoft.graph.entitlementManagement.acessPackageAssignment false diff --git a/transforms/csdl/preprocess_csdl_test_input.xml b/transforms/csdl/preprocess_csdl_test_input.xml index 6e80f3ad..9666401e 100644 --- a/transforms/csdl/preprocess_csdl_test_input.xml +++ b/transforms/csdl/preprocess_csdl_test_input.xml @@ -245,7 +245,7 @@ - + diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml index cebf99af..a7921abc 100644 --- a/transforms/csdl/preprocess_csdl_test_output.xml +++ b/transforms/csdl/preprocess_csdl_test_output.xml @@ -745,7 +745,7 @@ - + From 45d97526039eb1f0fc86e5199d173cc76067637e Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 11 Sep 2024 09:20:06 +0300 Subject: [PATCH 3/9] Update transforms/csdl/preprocess_csdl_test_input.xml Co-authored-by: Musale Martin --- transforms/csdl/preprocess_csdl_test_input.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transforms/csdl/preprocess_csdl_test_input.xml b/transforms/csdl/preprocess_csdl_test_input.xml index 9666401e..0c8f5292 100644 --- a/transforms/csdl/preprocess_csdl_test_input.xml +++ b/transforms/csdl/preprocess_csdl_test_input.xml @@ -245,7 +245,7 @@ - + From c207031323fc210c633394bcb5877d7cd35d93ba Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 11 Sep 2024 10:19:22 +0300 Subject: [PATCH 4/9] Update transforms/csdl/preprocess_csdl.xsl Co-authored-by: Millicent Achieng --- transforms/csdl/preprocess_csdl.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl index 9073e650..8d793a34 100644 --- a/transforms/csdl/preprocess_csdl.xsl +++ b/transforms/csdl/preprocess_csdl.xsl @@ -1875,7 +1875,7 @@ - microsoft.graph.entitlementManagement.acessPackageAssignment + microsoft.graph.entitlementManagement.accessPackageAssignment false From 02e05952f9877429eec28104f443868305b02fe7 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 11 Sep 2024 10:19:45 +0300 Subject: [PATCH 5/9] Update transforms/csdl/preprocess_csdl_test_output.xml Co-authored-by: Millicent Achieng --- transforms/csdl/preprocess_csdl_test_output.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml index a7921abc..b62170da 100644 --- a/transforms/csdl/preprocess_csdl_test_output.xml +++ b/transforms/csdl/preprocess_csdl_test_output.xml @@ -745,7 +745,7 @@ - + From 65446cd870593b03eaa0d5d7bf639c846d03c640 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 11 Sep 2024 10:21:05 +0300 Subject: [PATCH 6/9] Update transforms/csdl/preprocess_csdl.xsl Co-authored-by: Millicent Achieng --- transforms/csdl/preprocess_csdl.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl index 8d793a34..ccbe7db9 100644 --- a/transforms/csdl/preprocess_csdl.xsl +++ b/transforms/csdl/preprocess_csdl.xsl @@ -1873,7 +1873,7 @@ - + microsoft.graph.entitlementManagement.accessPackageAssignment From 9ff308fe695a260d362d8ebd2bdeb0570050570c Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Wed, 11 Sep 2024 10:52:37 +0300 Subject: [PATCH 7/9] Updated property type from graph.json to Edm.Untyped --- transforms/csdl/preprocess_csdl_test_input.xml | 8 ++++---- transforms/csdl/preprocess_csdl_test_output.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/transforms/csdl/preprocess_csdl_test_input.xml b/transforms/csdl/preprocess_csdl_test_input.xml index 0c8f5292..3597a070 100644 --- a/transforms/csdl/preprocess_csdl_test_input.xml +++ b/transforms/csdl/preprocess_csdl_test_input.xml @@ -116,7 +116,7 @@ - + @@ -444,9 +444,9 @@ - - - + + + diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml index b62170da..4c8e96c5 100644 --- a/transforms/csdl/preprocess_csdl_test_output.xml +++ b/transforms/csdl/preprocess_csdl_test_output.xml @@ -565,7 +565,7 @@ - + @@ -1191,9 +1191,9 @@ - - - + + + From e52eee9fb9cd650d1d06059df9e2e6bbab12055e Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Wed, 11 Sep 2024 15:22:46 +0300 Subject: [PATCH 8/9] Corrected annotation target from microsoft.graph.entitlementManagement.accessPackageAssignment to microsoft.graph.entitlementManagement/accessPackageAssignments --- transforms/csdl/preprocess_csdl.xsl | 4 ++-- transforms/csdl/preprocess_csdl_test_input.xml | 2 +- transforms/csdl/preprocess_csdl_test_output.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/transforms/csdl/preprocess_csdl.xsl b/transforms/csdl/preprocess_csdl.xsl index ccbe7db9..cc0c5dbc 100644 --- a/transforms/csdl/preprocess_csdl.xsl +++ b/transforms/csdl/preprocess_csdl.xsl @@ -1873,9 +1873,9 @@ - + - microsoft.graph.entitlementManagement.accessPackageAssignment + microsoft.graph.entitlementManagement/accessPackageAssignments false diff --git a/transforms/csdl/preprocess_csdl_test_input.xml b/transforms/csdl/preprocess_csdl_test_input.xml index 3597a070..5d66ec39 100644 --- a/transforms/csdl/preprocess_csdl_test_input.xml +++ b/transforms/csdl/preprocess_csdl_test_input.xml @@ -245,7 +245,7 @@ - + diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml index 4c8e96c5..d8ae67d6 100644 --- a/transforms/csdl/preprocess_csdl_test_output.xml +++ b/transforms/csdl/preprocess_csdl_test_output.xml @@ -745,7 +745,7 @@ - + From 11bfa733a9b992a75fe24c9a4bbcf93e6b7fbf9a Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Thu, 12 Sep 2024 15:30:24 +0300 Subject: [PATCH 9/9] Updated with corrections --- transforms/csdl/preprocess_csdl_test_input.xml | 15 ++++----------- transforms/csdl/preprocess_csdl_test_output.xml | 16 +++++++++++----- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/transforms/csdl/preprocess_csdl_test_input.xml b/transforms/csdl/preprocess_csdl_test_input.xml index 5d66ec39..fcba4993 100644 --- a/transforms/csdl/preprocess_csdl_test_input.xml +++ b/transforms/csdl/preprocess_csdl_test_input.xml @@ -116,7 +116,7 @@ - + @@ -245,13 +245,6 @@ - - - - - - - @@ -444,9 +437,9 @@ - - - + + + diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml index d8ae67d6..26f29099 100644 --- a/transforms/csdl/preprocess_csdl_test_output.xml +++ b/transforms/csdl/preprocess_csdl_test_output.xml @@ -565,7 +565,7 @@ - + @@ -745,7 +745,6 @@ - @@ -1191,9 +1190,9 @@ - - - + + + @@ -1519,6 +1518,13 @@ + + + + + + +