From 8548362ae00759e023b865751c31d6fdff1bff2b Mon Sep 17 00:00:00 2001
From: Nik Charlebois <nik_charlebois@hotmail.com>
Date: Sat, 28 Sep 2024 14:06:44 -0400
Subject: [PATCH 1/2] Update Graph.PermissionList.txt

---
 Tests/QA/Graph.PermissionList.txt | Bin 5992 -> 3029 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Tests/QA/Graph.PermissionList.txt b/Tests/QA/Graph.PermissionList.txt
index ab0533d4a562a696ceb8dde1d556c0239f1be4cc..8617c4fd75889c4ec8b20f1167b66a705a496121 100644
GIT binary patch
literal 3029
zcma)8&2HN;489N8o4C0Q+ud=xqQHU%ak`yVi?M~uk|8PSvRB(-kF-}9Z8;Hb%kGXM
zKYpSp{{8*^CoKxFb`NI(Z>v2pzDlJ`Cej~9I9O6`p?(2lE72q=uZ0rU8Ro<po|SNf
zIIbh~r2(ixQJbd8m}63x9S^~x0*pJDlXaO^M^T>IJGCPBEkXuVQWR6;fp8w~HBWB}
z`1+EhO>?!o+e57#Y{0%c-FPRbuh?q|skNe1x0i>z)<(ZsFgbp}H;k$ckBe%8Va6mV
z&WyK6hQ~Ftq8Q0K(<G~yQXp3wkkJ2mFY<ppa=+K*;G9q;@h+wy&PjdZyDU5=BLV_5
z+S&ssrra|IVQ2JFNXRQ@@G@fjE{srOw&*&CB6ZG)ms9&YM@-mZ;$-ikmI%?!v#^+m
zLnkMc6I>u|qhB%yd<Ui$m>XI>7>vRw`Wr0V0zx3jnR2zDEmN%YrIi;(G&GaE*$iTy
z2os%r_?YCTohO*7+A-4<Hc#mv!9B%-cM;q?>3*G(R2{o_)6Ns*VA?+*4WMhLW2PyL
zPznQu)8;~cdmxHH_fY5>dkXJ58;!=*GKL^Tx@Lm3(@i)B(7kfP$u6@<2Hj@KygE=k
z7=3D1nE}lB#2;?<;W)zIVKmP;b4Fde!%uZ1W75mIpXjWJFu)%<P9xziU9oa7A^cHI
zFnls4Q{vaiy@@n#z~masoevraH67^(Bp4UR3Nk^_@Y<j6+Nw+y?=y|01O;s_iq)d9
z-}RuoP{>zp>KW^;D6k*vqx<yb^P{pjx@8C&<v3`rgJuW1!QMU@BoTRd?oQ*VB_%O9
zhdDgxAPEJbhIhT6Nx$__ZGX>y@bt)&tJ-Ywo5U7erFn!8QQGvGF;z!A@?&pTX-DHV
zmWHV8q0z=oL)k7G_fnMNMMzBPyr_VmWIsPP*Pf8HuvjU_<o(=^+AK5P|15CTC?RI*
zpR&O10gD%S$jmJ?1p-UESinvT<^0YujbMIJMP+cZkLx<72p@7__LWr20T^x|WMc}*
UcFhSjaXSUTd_Qd)*~bt60Qi|_&Hw-a

literal 5992
zcmb_gU2hXH5cD$=|0LxF!TTjGs1i}5B*1f;3u#1pi7r>5{CHqyUDv*3edo9+N(y)0
z-SO`1hyC|YVV3x;%mJS%{{Ao<{Qfj=<bMlO;$MZ?;xoYCzO`RX4fzHda;3(Qy*Ib`
zt%2wc+V*0(#M6zb@I63(Z5H_50PV_rmZwbw@i}rj`ZcVr1l0<bVs`exITBP0_-bd?
z0UlkimEb-bGso|P>}&+t%6!A#)_CIf$!B^*^0mZKZDD=+<l%11@s&B+Lzx?Ju!7f1
zGc=FF0PghI-i5IA9zG-IF7Z8>@A&slqTxO1eHYsByr%9cq_)sdK*vG+Ux9PSG1ugW
zh|>;u4_IBB8Dxp(6aJE`2Q_l(GMYs)jaV!AX91g`je+nm_I8N%+}#pB?b70{a@`%I
zDv8GyyP=<{zn$mpRbd`?d%rC=6TQss3K<aY%U6_C3BQL>mf86LzfG_&kF0-%u8ol=
zU*-}GdZ|H0vP_r=FPO{p)=a#}`pBK>mS3(-M`>%z4t%D6m*9AV53$_B7cO^*logiV
zkLCU7sZQnV%0+0s$^JzC5?_}m`*+;0PebaszeYyTZ{!iPp54jT4I=x9CzcC7&M|G=
z5j(J7>A6U2r|<hTjm7o?EMqTq6>J78jQAe7^}GtLou?xQQ2`|TOeCkWIS9_{wSC@6
z(UyZUj6^B5*D)e5ifQ_CkWSI7i%3=N^WLd!4gyxU`Z;65i1cMw=oObUDcW?D8=zpF
z<s?#Le$lPRSEXs?yuO5m`=>1DEZ}N)j2p)`Q+4QwXnP@bSl^-cUek1inn~o1bV}!c
zEhd_s9BB;&t2SqYJ>oTz2-+Gykb3Uk&|~d$Q7Gr$cI&@@e)b8TUpT$_xM}<I`cve(
zE$efc?>OF;zEabEjV@@r3?ul6jz~YUO7VHEvOir$vv>oo?7*A>e)o8<f9*LIICpb)
zr|nXhug`KZtKIT(B$h7??6Rt8EU^|@vpCzi`S}7B+4k8&5VvcZUL|6hE)m-b2srC3
z!P+l~a(s4)Y54#t&P(Un9*ZSAAMbEJZp>Tr-n=u{K*UoP{mQe6%RkTP7>+q`l=x~g
zoauOmv~zpgqxtK#=uTkAo@(_j5r40phr^E7zC9QqD|Jg&hFo^NgT4&!dSbHe{rn$1
zZJj)u+&$Np@J@o&iSHQ0G<;SUx!0~4Dbi^^B0Jq_Zz9;(|8>6ft!?|k-oKICduZg1
z(Q%$@R;E}>244xo*4XzgzGNG#G|vO{ZHbP@RiTDUtf}$LPcVb$`;pYH?5y{#AHljm
zk*C{v3C1h)OLosH&QnsV)i5e~xI+#3I|#L$x0hHI(6G20i<Q(4b`;)JveVOVX&jtM
y&mhyt_>_K~DiQji0Ec)(JqI%00P4Mk*x9|}xufZHw>e>cID4n>PBpwXugpIb5L>?h


From eb52079d570cd8a88ddcdfd04f093be36179885e Mon Sep 17 00:00:00 2001
From: Nik Charlebois <nik_charlebois@hotmail.com>
Date: Tue, 5 Nov 2024 19:48:28 -0500
Subject: [PATCH 2/2] Fixes #5331

---
 CHANGELOG.md                                                   | 2 ++
 .../MSFT_AADRoleEligibilityScheduleRequest.psm1                | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 530acd23a0..ca3a639659 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,8 @@
 * AADRoleEligibilityScheduleRequest
   * Fixes for Custom roles.
     FIXES [#5330](https://github.com/microsoft/Microsoft365DSC/issues/5330)
+  * Fixes to remove elegibility schedule for custom roles.
+    FIXES [#5331](https://github.com/microsoft/Microsoft365DSC/issues/5331)
 * AADRoleManagementPolicyRule
   * Initial release.
 * AADServicePrincipal
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleEligibilityScheduleRequest/MSFT_AADRoleEligibilityScheduleRequest.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleEligibilityScheduleRequest/MSFT_AADRoleEligibilityScheduleRequest.psm1
index 964e7f6241..41aa9c982a 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleEligibilityScheduleRequest/MSFT_AADRoleEligibilityScheduleRequest.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleEligibilityScheduleRequest/MSFT_AADRoleEligibilityScheduleRequest.psm1
@@ -190,7 +190,7 @@
                         $schedule = $instance
                     }
                 }
-                [Array]$request = Get-MgBetaRoleManagementDirectoryRoleEligibilityScheduleRequest -Filter "PrincipalId eq '$PrincipalId' and RoleDefinitionId eq '$RoleDefinitionId'" | Sort-Object -Property CompletedDateTime -Descending
+                [Array]$request = Get-MgBetaRoleManagementDirectoryRoleEligibilityScheduleRequest -Filter "PrincipalId eq '$PrincipalId' and RoleDefinitionId eq '$($schedule.RoleDefinitionId)'" | Sort-Object -Property CompletedDateTime -Descending
 `
                 if ($request.Length -gt 1)
                 {
@@ -200,6 +200,7 @@
         }
         else
         {
+            Write-Verbose -Message "Request is not null: $request"
             $ObjectGuid = [System.Guid]::empty
             if ($PrincipalType -eq 'User')
             {