Merge branch 'Dev' into fix4653

microsoft · May 14, 2024 · 5393264 · 5393264
2 parents 1737774 + fd10d40
commit 5393264
Show file tree

Hide file tree

Showing 231 changed files with 2,789 additions and 686 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,29 +2,54 @@
 
 # UNRELEASED
 
+* AADGroup
+  * Fixes #4596
 * AADGroupSettings
   * Added support for parameter NewUnifiedGroupWritebackDefault
+* EXOManagementRoleEntry
+  * Initial Rrelease
 * SCAutoSensitivityLabelPolicy
   * Fix incorrect mandatory Credential parameter in Set and Test methods
     FIXES [#4283](https://github.com/microsoft/Microsoft365DSC/issues/4283)
+* IntuneAntivirusPolicyWindows10SettingCatalog
+  * Add missing properties from templates
+  * Update setting handling so that the value is reverted to default when unset
 * IntuneDeviceConfigurationCustomPolicyWindows10
   * Fixed an issue where the payload of xml files was not encoded as base64.
 * IntuneDeviceConfigurationDefenderForEndpointOnboardingPolicyWindows10
   * Fixed a creation and update issue when the exported policy contains a
     onboarding blob and the tenant is connected to Defender for Endpoint Service.
+<<<<<<< fix4653
 * TeamsMeetingPolicy
   * Fix creation and set of resource when cloud recording is set to false (off)
     FIXES [#4653](https://github.com/microsoft/Microsoft365DSC/issues/4653)
+=======
+* SPOSharingSettings
+  * Remove properties from being tested in certain conditions
+    FIXES [#4649](https://github.com/microsoft/Microsoft365DSC/issues/4649)
+  * Changed logic to retrieve my site for sovereign clouds.
+* TeamsGroupPolicyAssignment
+  * Add missing policy type TeamsVerticalPackagePolicy
+    FIXES [#4647](https://github.com/microsoft/Microsoft365DSC/issues/4647)
+* TeamsUpdateManagementPolicy
+  * Remove unnecessary parameters from PSBoundParameters such as authentication
+    methods, Ensure and Verbose by calling Remove-M365DSCAuthenticationParameter
+    FIXES [#4651](https://github.com/microsoft/Microsoft365DSC/issues/4651)
+>>>>>>> Dev
 * M365DSCUtil
   * Fixed an issue where one could not pass empty arrays to the
     `Compare-PSCustomObjectArrays` function.
 * DEPENDENCIES
-  * Updated Microsoft.Graph to version 2.18.0.
-  * Updated Microsoft.PowerApps.Administration.PowerShell to version 2.0.182.
+  * Updated DSCParser to version 2.0.0.4.
+  * Updated Microsoft.Graph to version 2.19.0.
+  * Updated Microsoft.PowerApps.Administration.PowerShell to version 2.0.187.
 * MISC
   * Added support for Access Tokens across AAD resources.
+  * Added support for Access Tokens across SC resources.
+  * Added support for Access Tokens across SPO resources.
   * Added support for Access Tokens across Teams resources.
   * Fixing fake passwords in Unit Tests.
+  * Added ability to configure Telemetry client by ConnectionString.
 
 # 1.24.424.1
 

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroup/MSFT_AADGroup.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroup/MSFT_AADGroup.psm1
@@ -437,8 +437,7 @@ function Set-TargetResource
     $currentParameters.Remove('Owners') | Out-Null
     $currentParameters.Remove('Members') | Out-Null
     $currentParameters.Remove('MemberOf') | Out-Null
-    $currentParameters.Remove('AssignedToRole') | Out-Null
-    $currentParameters.Remove('AccessTokens') | Out-Null
+    #$currentParameters.Remove('AssignedToRole') | Out-Null
 
     if ($Ensure -eq 'Present' -and `
         ($null -ne $GroupTypes -and $GroupTypes.Contains('Unified')) -and `
@@ -717,6 +716,9 @@ function Set-TargetResource
                 elseif ($diff.SideIndicator -eq '<=')
                 {
                     Write-Verbose -Message "Removing new member {$($diff.InputObject)} to AAD Group {$($currentGroup.DisplayName)}"
+                    $memberObject = @{
+                        '@odata.id' = "https://graph.microsoft.com/v1.0/users/{$($user.Id)}"
+                    }
                     Remove-MgGroupMemberDirectoryObjectByRef -GroupId ($currentGroup.Id) -DirectoryObjectId ($user.Id) | Out-Null
                 }
             }
@@ -792,7 +794,7 @@ function Set-TargetResource
             }
         }
 
-        if ($currentGroup.IsAssignableToRole -eq $true)
+        if ($currentGroup.IsAssignableToRole -eq $true -and $currentParameters.ContainsKey('AssignedToRole'))
         {
             #AssignedToRole
             $currentAssignedToRoleValue = @()
@@ -843,7 +845,7 @@ function Set-TargetResource
                     elseif ($diff.SideIndicator -eq '<=')
                     {
                         Write-Verbose -Message "Removing AAD group {$($currentGroup.DisplayName)} from Directory Role {$($role.DisplayName)}"
-                        Remove-MgBetaDirectoryRoleMemberByRef -DirectoryRoleId ($role.Id) -DirectoryObjectId ($currentGroup.Id) | Out-Null
+                        Remove-MgBetaDirectoryRoleMemberDirectoryObjectByRef -DirectoryRoleId ($role.Id) -DirectoryObjectId ($currentGroup.Id) | Out-Null
                     }
                 }
             }