Merge branch 'KelvinTegelaar:master' into master

dsghi · Jun 25, 2024 · 77ca3da · 77ca3da
2 parents 30c3f1c + d513da2
commit 77ca3da
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 57 deletions.
diff --git a/Cache_SAMSetup/SAMManifest.json b/Cache_SAMSetup/SAMManifest.json
@@ -21,9 +21,7 @@
       "resourceAppId": "00000003-0000-0000-c000-000000000000",
       "resourceAccess": [
         { "id": "aa07f155-3612-49b8-a147-6c590df35536", "type": "Scope" },
-        { "id": "0f4595f7-64b1-4e13-81bc-11a249df07a9", "type": "Scope" },
         { "id": "73e75199-7c3e-41bb-9357-167164dbb415", "type": "Scope" },
-        { "id": "7ab1d787-bae7-4d5d-8db6-37ea32df9186", "type": "Scope" },
         { "id": "d01b97e9-cbc0-49fe-810a-750afd5527a3", "type": "Scope" },
         { "id": "46ca0847-7e6b-426e-9775-ea810a948356", "type": "Scope" },
         { "id": "dc38509c-b87d-4da0-bd92-6bec988bac4a", "type": "Scope" },
@@ -36,7 +34,6 @@
         { "id": "0c5e8a55-87a6-4556-93ab-adc52c4d862d", "type": "Scope" },
         { "id": "44642bfe-8385-4adc-8fc6-fe3cb2c375c3", "type": "Scope" },
         { "id": "662ed50a-ac44-4eef-ad86-62eed9be2a29", "type": "Scope" },
-        { "id": "8696daa5-bce5-4b2e-83f9-51b6defc4e1e", "type": "Scope" },
         { "id": "6aedf524-7e1c-45a7-bd76-ded8cab8d0fc", "type": "Scope" },
         { "id": "bac3b9c2-b516-4ef4-bd3b-c2ef73d8d804", "type": "Scope" },
         { "id": "11d4cd79-5ba5-460f-803f-e22c8ab85ccd", "type": "Scope" },
@@ -55,15 +52,13 @@
         { "id": "1d89d70c-dcac-4248-b214-903c457af83a", "type": "Scope" },
         { "id": "2b61aa8a-6d36-4b2f-ac7b-f29867937c53", "type": "Scope" },
         { "id": "ebf0f66e-9fb1-49e4-a278-222f76911cf4", "type": "Scope" },
-        { "id": "c79f8feb-a9db-4090-85f9-90d820caa0eb", "type": "Scope" },
         { "id": "bdfbf15f-ee85-4955-8675-146e8e5296b5", "type": "Scope" },
         { "id": "f81125ac-d3b7-4573-a3b2-7099cc39df9e", "type": "Scope" },
         { "id": "cac97e40-6730-457d-ad8d-4852fddab7ad", "type": "Scope" },
         { "id": "b7887744-6746-4312-813d-72daeaee7e2d", "type": "Scope" },
         { "id": "48971fc1-70d7-4245-af77-0beb29b53ee2", "type": "Scope" },
         { "id": "aec28ec7-4d02-4e8c-b864-50163aea77eb", "type": "Scope" },
         { "id": "a9ff19c2-f369-4a95-9a25-ba9d460efc8e", "type": "Scope" },
-        { "id": "59dacb05-e88d-4c13-a684-59f1afc8cc98", "type": "Scope" },
         { "id": "b98bfd41-87c6-45cc-b104-e2de4f0dafb9", "type": "Scope" },
         { "id": "2f9ee017-59c1-4f1d-9472-bd5529a7b311", "type": "Scope" },
         { "id": "951183d1-1a61-466f-a6d1-1fde911bfd95", "type": "Scope" },
@@ -86,22 +81,10 @@
         { "id": "7e823077-d88e-468f-a337-e18f1f0e6c7c", "type": "Scope" },
         { "id": "edd3c878-b384-41fd-95ad-e7407dd775be", "type": "Scope" },
         { "id": "40b534c3-9552-4550-901b-23879c90bcf9", "type": "Scope" },
-        { "id": "bf3fbf03-f35f-4e93-963e-47e4d874c37a", "type": "Scope" },
-        { "id": "5248dcb1-f83b-4ec3-9f4d-a4428a961a72", "type": "Scope" },
-        { "id": "c395395c-ff9a-4dba-bc1f-8372ba9dca84", "type": "Scope" },
-        { "id": "2e25a044-2580-450d-8859-42eeb6e996c0", "type": "Scope" },
-        { "id": "0ce33576-30e8-43b7-99e5-62f8569a4002", "type": "Scope" },
-        { "id": "207e0cb1-3ce7-4922-b991-5a760c346ebc", "type": "Scope" },
-        { "id": "093f8818-d05f-49b8-95bc-9d2a73e9a43c", "type": "Scope" },
         { "id": "7825d5d6-6049-4ce7-bdf6-3b8d53f4bcd0", "type": "Scope" },
         { "id": "2104a4db-3a2f-4ea0-9dba-143d457dc666", "type": "Scope" },
         { "id": "eda39fa6-f8cf-4c3c-a909-432c683e4c9b", "type": "Scope" },
         { "id": "55896846-df78-47a7-aa94-8d3d4442ca7f", "type": "Scope" },
-        { "id": "aa85bf13-d771-4d5d-a9e6-bca04ce44edf", "type": "Scope" },
-        { "id": "ee928332-e9c2-4747-b4a0-f8c164b68de6", "type": "Scope" },
-        { "id": "c975dd04-a06e-4fbb-9704-62daad77bb49", "type": "Scope" },
-        { "id": "c37c9b61-7762-4bff-a156-afc0005847a0", "type": "Scope" },
-        { "id": "b9abcc4f-94fc-4457-9141-d20ce80ec952", "type": "Scope" },
         { "id": "128ca929-1a19-45e6-a3b8-435ec44a36ba", "type": "Scope" },
         { "id": "b27add92-efb2-4f16-84f5-8108ba77985c", "type": "Scope" },
         { "id": "3404d2bf-2b13-457e-a330-c24615765193", "type": "Scope" },
@@ -156,20 +139,10 @@
         { "id": "280b3b69-0437-44b1-bc20-3b2fca1ee3e9", "type": "Scope" },
         { "id": "885f682f-a990-4bad-a642-36736a74b0c7", "type": "Scope" },
         { "id": "913b9306-0ce1-42b8-9137-6a7df690a760", "type": "Role" },
-        { "id": "cb8f45a0-5c2e-4ea1-b803-84b870a7d7ec", "type": "Scope" },
         { "id": "4c06a06a-098a-4063-868e-5dfee3827264", "type": "Scope" },
         { "id": "1bfefb4e-e0b5-418b-a88f-73c46d2cc8e9", "type": "Role" },
         { "id": "e67e6727-c080-415e-b521-e3f35d5248e9", "type": "Scope" },
         { "id": "b6890674-9dd5-4e42-bb15-5af07f541ae1", "type": "Role" }
-
-      ]
-    },
-    {
-      "resourceAppId": "00000002-0000-0000-c000-000000000000",
-      "resourceAccess": [
-        { "id": "5778995a-e1bf-45b8-affa-663a9f3f4d04", "type": "Role" },
-        { "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a", "type": "Scope" },
-        { "id": "311a71cc-e848-46a1-bdf8-97ff7156d8e6", "type": "Scope" }
       ]
     },
     {

diff --git a/Modules/CIPPCore/Public/SAMManifest.json b/Modules/CIPPCore/Public/SAMManifest.json
@@ -21,9 +21,7 @@
       "resourceAppId": "00000003-0000-0000-c000-000000000000",
       "resourceAccess": [
         { "id": "aa07f155-3612-49b8-a147-6c590df35536", "type": "Scope" },
-        { "id": "0f4595f7-64b1-4e13-81bc-11a249df07a9", "type": "Scope" },
         { "id": "73e75199-7c3e-41bb-9357-167164dbb415", "type": "Scope" },
-        { "id": "7ab1d787-bae7-4d5d-8db6-37ea32df9186", "type": "Scope" },
         { "id": "d01b97e9-cbc0-49fe-810a-750afd5527a3", "type": "Scope" },
         { "id": "46ca0847-7e6b-426e-9775-ea810a948356", "type": "Scope" },
         { "id": "dc38509c-b87d-4da0-bd92-6bec988bac4a", "type": "Scope" },
@@ -36,7 +34,6 @@
         { "id": "0c5e8a55-87a6-4556-93ab-adc52c4d862d", "type": "Scope" },
         { "id": "44642bfe-8385-4adc-8fc6-fe3cb2c375c3", "type": "Scope" },
         { "id": "662ed50a-ac44-4eef-ad86-62eed9be2a29", "type": "Scope" },
-        { "id": "8696daa5-bce5-4b2e-83f9-51b6defc4e1e", "type": "Scope" },
         { "id": "6aedf524-7e1c-45a7-bd76-ded8cab8d0fc", "type": "Scope" },
         { "id": "bac3b9c2-b516-4ef4-bd3b-c2ef73d8d804", "type": "Scope" },
         { "id": "11d4cd79-5ba5-460f-803f-e22c8ab85ccd", "type": "Scope" },
@@ -55,15 +52,13 @@
         { "id": "1d89d70c-dcac-4248-b214-903c457af83a", "type": "Scope" },
         { "id": "2b61aa8a-6d36-4b2f-ac7b-f29867937c53", "type": "Scope" },
         { "id": "ebf0f66e-9fb1-49e4-a278-222f76911cf4", "type": "Scope" },
-        { "id": "c79f8feb-a9db-4090-85f9-90d820caa0eb", "type": "Scope" },
         { "id": "bdfbf15f-ee85-4955-8675-146e8e5296b5", "type": "Scope" },
         { "id": "f81125ac-d3b7-4573-a3b2-7099cc39df9e", "type": "Scope" },
         { "id": "cac97e40-6730-457d-ad8d-4852fddab7ad", "type": "Scope" },
         { "id": "b7887744-6746-4312-813d-72daeaee7e2d", "type": "Scope" },
         { "id": "48971fc1-70d7-4245-af77-0beb29b53ee2", "type": "Scope" },
         { "id": "aec28ec7-4d02-4e8c-b864-50163aea77eb", "type": "Scope" },
         { "id": "a9ff19c2-f369-4a95-9a25-ba9d460efc8e", "type": "Scope" },
-        { "id": "59dacb05-e88d-4c13-a684-59f1afc8cc98", "type": "Scope" },
         { "id": "b98bfd41-87c6-45cc-b104-e2de4f0dafb9", "type": "Scope" },
         { "id": "2f9ee017-59c1-4f1d-9472-bd5529a7b311", "type": "Scope" },
         { "id": "951183d1-1a61-466f-a6d1-1fde911bfd95", "type": "Scope" },
@@ -86,29 +81,14 @@
         { "id": "7e823077-d88e-468f-a337-e18f1f0e6c7c", "type": "Scope" },
         { "id": "edd3c878-b384-41fd-95ad-e7407dd775be", "type": "Scope" },
         { "id": "40b534c3-9552-4550-901b-23879c90bcf9", "type": "Scope" },
-        { "id": "bf3fbf03-f35f-4e93-963e-47e4d874c37a", "type": "Scope" },
-        { "id": "5248dcb1-f83b-4ec3-9f4d-a4428a961a72", "type": "Scope" },
-        { "id": "c395395c-ff9a-4dba-bc1f-8372ba9dca84", "type": "Scope" },
-        { "id": "2e25a044-2580-450d-8859-42eeb6e996c0", "type": "Scope" },
-        { "id": "0ce33576-30e8-43b7-99e5-62f8569a4002", "type": "Scope" },
-        { "id": "207e0cb1-3ce7-4922-b991-5a760c346ebc", "type": "Scope" },
-        { "id": "093f8818-d05f-49b8-95bc-9d2a73e9a43c", "type": "Scope" },
         { "id": "7825d5d6-6049-4ce7-bdf6-3b8d53f4bcd0", "type": "Scope" },
         { "id": "2104a4db-3a2f-4ea0-9dba-143d457dc666", "type": "Scope" },
         { "id": "eda39fa6-f8cf-4c3c-a909-432c683e4c9b", "type": "Scope" },
         { "id": "55896846-df78-47a7-aa94-8d3d4442ca7f", "type": "Scope" },
-        { "id": "aa85bf13-d771-4d5d-a9e6-bca04ce44edf", "type": "Scope" },
-        { "id": "ee928332-e9c2-4747-b4a0-f8c164b68de6", "type": "Scope" },
-        { "id": "c975dd04-a06e-4fbb-9704-62daad77bb49", "type": "Scope" },
-        { "id": "c37c9b61-7762-4bff-a156-afc0005847a0", "type": "Scope" },
-        { "id": "b9abcc4f-94fc-4457-9141-d20ce80ec952", "type": "Scope" },
         { "id": "128ca929-1a19-45e6-a3b8-435ec44a36ba", "type": "Scope" },
         { "id": "b27add92-efb2-4f16-84f5-8108ba77985c", "type": "Scope" },
         { "id": "3404d2bf-2b13-457e-a330-c24615765193", "type": "Scope" },
         { "id": "b955410e-7715-4a88-a940-dfd551018df3", "type": "Scope" },
-        { "id": "9e4862a5-b68f-479e-848a-4e07e25c9916", "type": "Scope" },
-        { "id": "e0a7cdbb-08b0-4697-8264-0069786e9674", "type": "Scope" },
-        { "id": "bb6f654c-d7fd-4ae3-85c3-fc380934f515", "type": "Scope" },
         { "id": "5b07b0dd-2377-4e44-a38d-703f09a0dc3c", "type": "Role" },
         { "id": "19b94e34-907c-4f43-bde9-38b1909ed408", "type": "Role" },
         { "id": "999f8c63-0a38-4f1b-91fd-ed1947bdd1a9", "type": "Role" },
@@ -159,21 +139,12 @@
         { "id": "280b3b69-0437-44b1-bc20-3b2fca1ee3e9", "type": "Scope" },
         { "id": "885f682f-a990-4bad-a642-36736a74b0c7", "type": "Scope" },
         { "id": "913b9306-0ce1-42b8-9137-6a7df690a760", "type": "Role" },
-        { "id": "cb8f45a0-5c2e-4ea1-b803-84b870a7d7ec", "type": "Scope" },
         { "id": "4c06a06a-098a-4063-868e-5dfee3827264", "type": "Scope" },
         { "id": "1bfefb4e-e0b5-418b-a88f-73c46d2cc8e9", "type": "Role" },
         { "id": "e67e6727-c080-415e-b521-e3f35d5248e9", "type": "Scope" },
         { "id": "b6890674-9dd5-4e42-bb15-5af07f541ae1", "type": "Role" }
       ]
     },
-    {
-      "resourceAppId": "00000002-0000-0000-c000-000000000000",
-      "resourceAccess": [
-        { "id": "5778995a-e1bf-45b8-affa-663a9f3f4d04", "type": "Role" },
-        { "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a", "type": "Scope" },
-        { "id": "311a71cc-e848-46a1-bdf8-97ff7156d8e6", "type": "Scope" }
-      ]
-    },
     {
       "resourceAppId": "fc780465-2017-40d4-a0c5-307022471b92",
       "resourceAccess": [

diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-5.9.0
+5.9.2