Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix AADDeviceRegistrationPolicy to correctly use parsed Group and User objects for Select EntraJoin #5799

Merged
merged 3 commits into from
Feb 20, 2025
Merged

Fix AADDeviceRegistrationPolicy to correctly use parsed Group and User objects for Select EntraJoin #5799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65534f9
Fix AADDeviceRegistrationPolicy to correctly use parsed Group and Use…
Feb 18, 2025
d68dc25
Update changelog for AADDeviceRegistrationPolicy 5798 change
Feb 18, 2025
23f4991
Merge branch 'Dev' into mpoulson/5798
NikCharlebois Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
* AADDeviceRegistrationPolicy
* Fixed an issue where the AzureADJoinIsAdminConfigurable was not returned by the
Get-TargetResource function.
* Fix issue setting Selected Users and Groups for Entra Join.
FIXES [#5798](https://github.com/microsoft/Microsoft365DSC/issues/5798)
* AADGroup
* Returns an empty array for roles and licenses from the Get-TargetResource
function instead of null when no instances are found.
Expand Down
4 changes: 2 additions & 2 deletions ...65DSC/DSCResources/MSFT_AADDeviceRegistrationPolicy/MSFT_AADDeviceRegistrationPolicy.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,8 @@ function Set-TargetResource
isAdminConfigurable = $AzureADJoinIsAdminConfigurable
allowedToJoin = @{
'@odata.type' = $azureADRegistrationAllowedToRegister
users = $AzureADAllowedToJoinUsers
groups = $AzureADAllowedToJoinGroups
users = $azureADRegistrationAllowedUsers
groups = $azureADRegistrationAllowedGroups
}
localAdmins = @{
enableGlobalAdmins = $LocalAdminsEnableGlobalAdmins
Expand Down