Release 1.23.628.1

CHANGELOG.md

@@ -1,5 +1,48 @@
 # Change log for Microsoft365DSC
 
+# 1.23.628.1
+
+* AADAdministrativeUnit
+  * Improved export performance.
+* AADApplication
+  * Updated the Set and Test function to ignore the AppId parameter.
+    FIXES [#3390](https://github.com/microsoft/Microsoft365DSC/issues/3390)
+  * Improved export performance.
+* AADAuthenticationMethodPolicyAuthenticator
+  * Deprecated the NumberMatchingRequiredState Feature Setting.
+    FIXES [#3406](https://github.com/microsoft/Microsoft365DSC/issues/3406)
+* AADRoleDefinition
+  * Improved export performance.
+* AADRoleSetting
+  * Improved export performance.
+* AADServicePrincipal
+  * Updated the Set and Test function to ignore the AppId parameter.
+    FIXES [#3390](https://github.com/microsoft/Microsoft365DSC/issues/3390)
+  * Improved export performance.
+* EXOAvailabilityConfig
+  * Fixes an error where an error was thrown when the OrgWideAccount wasn't set.
+    FIXES [#3402](https://github.com/microsoft/Microsoft365DSC/issues/3402)
+* IntuneDeviceEnrollmentPlatformRestriction
+  * Fixes an error where the WindowsMobileRestriction property was still being assessed dispite it being deprecated.
+    FIXES [#3407](https://github.com/microsoft/Microsoft365DSC/issues/3407)
+* O365OrgSettings
+  * Added support for Forms, Dynamics Customer Voice, To Do and Apps & Services settings.
+* TeamsCallQueue
+  * Initial release.
+* Teams resources
+  * Added required application permissions to support [Application Based Authentication](https://learn.microsoft.com/en-us/microsoftteams/teams-powershell-application-authentication)
+* MISC
+  * Added API to the Organization.Read.All permission in the Get-M365DSCCompiledPermisisonList cmdlet
+  * Fixes an issue with Update-M365DSCAzureAdApplication where it was throwing an error complaining about duplicate keys.
+    FIXES #3417
+  * Update-M365DSCModule now forces a reload of the latest version of the Microsoft365DSC module.
+    FIXES [#3326](https://github.com/microsoft/Microsoft365DSC/issues/3326)
+  * Update-M365DSCAyureADApplication
+    Added retry logic to catch the "Key credential end date is invalid" error when updating the application certificate.
+    FIXES [#3426](https://github.com/microsoft/Microsoft365DSC/issues/3426)
+* DEPENDENCIES
+  * Updated ReverseDSC to version 2.0.0.16.
+
 # 1.23.621.1
 
 * AADAdministrativeUnit
@@ -34,6 +77,10 @@
 * AADNamedLocationPolicy
   * Added support forthe CountryLookupMethod property
     FIXES [#3345](https://github.com/microsoft/Microsoft365DSC/issues/3345)
+* IntuneDeviceConfigurationAdministrativeTemplatePolicyWindows10
+  * Fixes an issue with Set-TargetResource when an array is empty
+  * Fixes presentationValue updates
+    FIXES [#3355](https://github.com/microsoft/Microsoft365DSC/issues/3355)
 * TeamsAppPermissionPolicy
   * Fixes an issue where the wrong app types were trying to get assigned.
     FIXES [#3373](https://github.com/microsoft/Microsoft365DSC/issues/3373)

Modules/Microsoft365DSC/DSCResources/MSFT_AADAdministrativeUnit/MSFT_AADAdministrativeUnit.psm1

@@ -100,16 +100,29 @@ function Get-TargetResource
         #region resource generator code
         if (-not [string]::IsNullOrEmpty($Id))
         {
-            $getValue = Get-MgDirectoryAdministrativeUnit -AdministrativeUnitId $Id -ErrorAction SilentlyContinue
+            if ($null -ne $Script:exportedInstances -and $Script:ExportMode)
+            {
+                $getValue = $Script:exportedInstances | Where-Object -FilterScript {$_.Id -eq $Id}
+            }
+            else
+            {
+                $getValue = Get-MgDirectoryAdministrativeUnit -AdministrativeUnitId $Id -ErrorAction SilentlyContinue
+            }
         }
 
         if ($null -eq $getValue -and -not [string]::IsNullOrEmpty($DisplayName))
         {
             Write-Verbose -Message "Could not find an Azure AD Administrative Unit with Id {$Id}"
-
             if (-Not [string]::IsNullOrEmpty($DisplayName))
             {
-                $getValue = Get-MgDirectoryAdministrativeUnit -Filter "DisplayName eq '$DisplayName'" -ErrorAction Stop
+                if ($null -ne $Script:exportedInstances -and $Script:ExportMode)
+                {
+                    $getValue = $Script:exportedInstances | Where-Object -FilterScript {$_.DisplayName -eq $DisplayName}
+                }
+                else
+                {
+                    $getValue = Get-MgDirectoryAdministrativeUnit -Filter "DisplayName eq '$DisplayName'" -ErrorAction Stop
+                }
             }
         }
         #endregion
@@ -946,29 +959,30 @@ function Export-TargetResource
 
     try
     {
+        $Script:ExportMode = $true
         #region resource generator code
-        [array]$getValue = Get-MgDirectoryAdministrativeUnit -All `
+        [array] $Script:exportedInstances = Get-MgDirectoryAdministrativeUnit -All `
             -ErrorAction Stop
         #endregion
 
         $i = 1
         $dscContent = ''
-        if ($getValue.Length -eq 0)
+        if ($Script:exportedInstances.Length -eq 0)
         {
             Write-Host $Global:M365DSCEmojiGreenCheckMark
         }
         else
         {
             Write-Host "`r`n" -NoNewline
         }
-        foreach ($config in $getValue)
+        foreach ($config in $Script:exportedInstances)
         {
             $displayedKey = $config.Id
             if (-not [String]::IsNullOrEmpty($config.displayName))
             {
                 $displayedKey = $config.displayName
             }
-            Write-Host "    |---[$i/$($getValue.Count)] $displayedKey" -NoNewline
+            Write-Host "    |---[$i/$($Script:exportedInstances.Count)] $displayedKey" -NoNewline
             $params = @{
                 DisplayName           = $config.DisplayName
                 Id                    = $config.Id

Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1

@@ -110,7 +110,14 @@ function Get-TargetResource
         {
             if (-not [System.String]::IsNullOrEmpty($AppId))
             {
-                $AADApp = Get-MgApplication -Filter "AppId eq '$AppId'"
+                if ($null -ne $Script:exportedInstances -and $Script:ExportMode)
+                {
+                    $AADApp = $Script:exportedInstances | Where-Object -FilterScript {$_.Id -eq $AppId}
+                }
+                else
+                {
+                    $AADApp = Get-MgApplication -Filter "AppId eq '$AppId'"
+                }
             }
         }
         catch
@@ -121,11 +128,19 @@ function Get-TargetResource
         if ($null -eq $AADApp)
         {
             Write-Verbose -Message "Attempting to retrieve Azure AD Application by DisplayName {$DisplayName}"
-            $AADApp = Get-MgApplication -Filter "DisplayName eq '$($DisplayName)'"
+
+            if ($null -ne $Script:exportedInstances -and $Script:ExportMode)
+            {
+                $AADApp = $Script:exportedInstances | Where-Object -FilterScript {$_.DisplayName -eq $DisplayName}
+            }
+            else
+            {
+                $AADApp = Get-MgApplication -Filter "DisplayName eq '$($DisplayName)'"
+            }
         }
         if ($null -ne $AADApp -and $AADApp.Count -gt 1)
         {
-            Throw "Multiple AAD Apps with the Displayname $($DisplayName) exist in the tenant. Aborting."
+            Throw "Multiple AAD Apps with the Displayname $($DisplayName) exist in the tenant. These apps will not be exported."
         }
         elseif ($null -eq $AADApp)
         {
@@ -799,10 +814,11 @@ function Export-TargetResource
     Write-Host "`r`n" -NoNewline
     try
     {
-        $AADApplications = Get-MgApplication -Filter $Filter -All -ErrorAction Stop
-        foreach ($AADApp in $AADApplications)
+        $Script:ExportMode = $true
+        [array] $Script:exportedInstances = Get-MgApplication -Filter $Filter -All -ErrorAction Stop
+        foreach ($AADApp in $Script:exportedInstances)
         {
-            Write-Host "    |---[$i/$($AADApplications.Count)] $($AADApp.DisplayName)" -NoNewline
+            Write-Host "    |---[$i/$($Script:exportedInstances.Count)] $($AADApp.DisplayName)" -NoNewline
             $Params = @{
                 ApplicationId         = $ApplicationId
                 AppId                 = $AADApp.AppId

Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1

@@ -242,58 +242,6 @@ function Get-TargetResource
             $complexDisplayLocationInformationRequiredState = $null
         }
         $complexFeatureSettings.Add('DisplayLocationInformationRequiredState', $complexDisplayLocationInformationRequiredState)
-        $complexNumberMatchingRequiredState = @{}
-        $complexExcludeTarget = @{}
-        if ($getValue.additionalProperties.featureSettings.numberMatchingRequiredState.excludeTarget.id -notmatch 'all_users|00000000-0000-0000-0000-000000000000')
-            {
-                $myExcludeTargetsDisplayName = Get-MgGroup -GroupId $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.excludeTarget.id
-                $complexExcludeTarget.Add('Id', $myExcludeTargetsDisplayName.DisplayName)
-            }
-            else
-            {
-                $complexExcludeTarget.Add('Id', $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.excludeTarget.id)
-            }
-        if ($null -ne $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.excludeTarget.targetType)
-        {
-            $complexExcludeTarget.Add('TargetType', $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.excludeTarget.targetType.toString())
-        }
-        if ($complexExcludeTarget.values.Where({ $null -ne $_ }).count -eq 0)
-        {
-            $complexExcludeTarget = $null
-        }
-        $complexNumberMatchingRequiredState.Add('ExcludeTarget', $complexExcludeTarget)
-        $complexIncludeTarget = @{}
-        if ($getValue.additionalProperties.featureSettings.numberMatchingRequiredState.includeTarget.id -notmatch 'all_users|00000000-0000-0000-0000-000000000000')
-            {
-                $myIncludeTargetsDisplayName = Get-MgGroup -GroupId $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.includeTarget.id
-                $complexIncludeTarget.Add('Id', $myIncludeTargetsDisplayName.DisplayName)
-            }
-            else
-            {
-                $complexIncludeTarget.Add('Id', $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.includeTarget.id)
-            }
-        if ($null -ne $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.includeTarget.targetType)
-        {
-            $complexIncludeTarget.Add('TargetType', $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.includeTarget.targetType.toString())
-        }
-        if ($complexIncludeTarget.values.Where({ $null -ne $_ }).count -eq 0)
-        {
-            $complexIncludeTarget = $null
-        }
-        $complexNumberMatchingRequiredState.Add('IncludeTarget', $complexIncludeTarget)
-        if ($null -ne $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.state)
-        {
-            $complexNumberMatchingRequiredState.Add('State', $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.state.toString())
-        }
-        if ($complexNumberMatchingRequiredState.values.Where({ $null -ne $_ }).count -eq 0)
-        {
-            $complexNumberMatchingRequiredState = $null
-        }
-        $complexFeatureSettings.Add('NumberMatchingRequiredState', $complexNumberMatchingRequiredState)
-        if ($complexFeatureSettings.values.Where({ $null -ne $_ }).count -eq 0)
-        {
-            $complexFeatureSettings = $null
-        }
 
         $complexExcludeTargets = @()
         foreach ($currentExcludeTargets in $getValue.excludeTargets)
@@ -499,15 +447,12 @@ function Set-TargetResource
             $groupid = (Get-MgGroup -Filter $Filter).id.ToString()
             $CreateParameters.featureSettings.displayLocationInformationRequiredState.excludeTarget.foreach('id',$groupid)
         }
-        if ($CreateParameters.featureSettings.numberMatchingRequiredState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
-            $Filter = "Displayname eq '$($CreateParameters.featureSettings.numberMatchingRequiredState.includeTarget.id)'" | Out-String
-            $groupid = (Get-MgGroup -Filter $Filter).id.ToString()
-            $CreateParameters.featureSettings.numberMatchingRequiredState.includeTarget.foreach('id',$groupid)
-        }
-        if ($CreateParameters.featureSettings.numberMatchingRequiredState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
-            $Filter = "Displayname eq '$($CreateParameters.featureSettings.numberMatchingRequiredState.excludeTarget.id)'" | Out-String
-            $groupid = (Get-MgGroup -Filter $Filter).id.ToString()
-            $CreateParameters.featureSettings.numberMatchingRequiredState.excludeTarget.foreach('id',$groupid)
+
+        # DEPRECATED
+        if ($CreateParameters.featureSettings.ContainsKey('NumberMatchingRequiredState'))
+        {
+            Write-Verbose -Message "The NumberMatchingRequiredState feature is deprecated and will be ignored. Please remove it from your configuration."
+            $CreateParameters.featureSettings.Remove('NumberMatchingRequiredState')
         }
 
         $keys = (([Hashtable]$CreateParameters).clone()).Keys
@@ -558,45 +503,54 @@ function Set-TargetResource
 
         $UpdateParameters.Remove('Id') | Out-Null
         # replace group Displayname with group id
-        if ($UpdateParameters.featureSettings.companionAppAllowedState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
+        if ($UpdateParameters.featureSettings.companionAppAllowedState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users' -and
+            $UpdateParameters.featureSettings.ContainsKey('companionAppAllowedState'))
+        {
             $Filter = "Displayname eq '$($UpdateParameters.featureSettings.companionAppAllowedState.includeTarget.id)'" | Out-String
             $groupid = (Get-MgGroup -Filter $Filter).id.ToString()
             $UpdateParameters.featureSettings.companionAppAllowedState.includeTarget.foreach('id',$groupid)
         }
-        if ($UpdateParameters.featureSettings.companionAppAllowedState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
+        if ($UpdateParameters.featureSettings.companionAppAllowedState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users' -and
+            $UpdateParameters.featureSettings.ContainsKey('companionAppAllowedState'))
+        {
             $Filter = "Displayname eq '$($UpdateParameters.featureSettings.companionAppAllowedState.excludeTarget.id)'" | Out-String
             $groupid = (Get-MgGroup -Filter $Filter).id.ToString()
             $UpdateParameters.featureSettings.companionAppAllowedState.excludeTarget.foreach('id',$groupid)
         }
-        if ($UpdateParametrs.featureSettings.displayAppInformationRequiredState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
+        if ($UpdateParameters.featureSettings.displayAppInformationRequiredState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users' -and
+            $UpdateParameters.featureSettings.ContainsKey('displayAppInformationRequiredState'))
+        {
             $Filter = "Displayname eq '$($UpdateParameters.featureSettings.displayAppInformationRequiredState.includeTarget.id)'" | Out-String
             $groupid = (Get-MgGroup -Filter $Filter).id.ToString()
             $UpdateParameters.featureSettings.displayAppInformationRequiredState.includeTarget.foreach('id',$groupid)
         }
-        if ($UpdateParameters.featureSettings.displayAppInformationRequiredState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
+        if ($UpdateParameters.featureSettings.displayAppInformationRequiredState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users' -and
+            $UpdateParameters.featureSettings.ContainsKey('displayAppInformationRequiredState'))
+        {
             $Filter = "Displayname eq '$($UpdateParameters.featureSettings.displayAppInformationRequiredState.excludeTarget.id)'" | Out-String
             $groupid = (Get-MgGroup -Filter $Filter).id.ToString()
             $UpdateParameters.featureSettings.displayAppInformationRequiredState.excludeTarget.foreach('id',$groupid)
         }
-        if ($UpdateParameters.featureSettings.displayLocationInformationRequiredState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
+        if ($UpdateParameters.featureSettings.displayLocationInformationRequiredState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users' -and
+        $UpdateParameters.featureSettings.ContainsKey('displayLocationInformationRequiredState'))
+        {
             $Filter = "Displayname eq '$($UpdateParameters.featureSettings.displayLocationInformationRequiredState.includeTarget.id)'" | Out-String
             $groupid = (Get-MgGroup -Filter $Filter).id.ToString()
             $UpdateParameters.featureSettings.displayLocationInformationRequiredState.includeTarget.foreach('id',$groupid)
         }
-        if ($UpdateParameters.featureSettings.displayLocationInformationRequiredState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
+        if ($UpdateParameters.featureSettings.displayLocationInformationRequiredState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users' -and
+            $UpdateParameters.featureSettings.ContainsKey('displayLocationInformationRequiredState'))
+        {
             $Filter = "Displayname eq '$($UpdateParameters.featureSettings.displayLocationInformationRequiredState.excludeTarget.id)'" | Out-String
             $groupid = (Get-MgGroup -Filter $Filter).id.ToString()
             $UpdateParameters.featureSettings.displayLocationInformationRequiredState.excludeTarget.foreach('id',$groupid)
         }
-        if ($UpdateParameters.featureSettings.numberMatchingRequiredState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
-            $Filter = "Displayname eq '$($UpdateParameters.featureSettings.numberMatchingRequiredState.includeTarget.id)'" | Out-String
-            $groupid = (Get-MgGroup -Filter $Filter).id.ToString()
-            $UpdateParameters.featureSettings.numberMatchingRequiredState.includeTarget.foreach('id',$groupid)
-        }
-        if ($UpdateParameters.featureSettings.numberMatchingRequiredState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
-            $Filter = "Displayname eq '$($UpdateParameters.featureSettings.numberMatchingRequiredState.excludeTarget.id)'" | Out-String
-            $groupid = (Get-MgGroup -Filter $Filter).id.ToString()
-            $UpdateParameters.featureSettings.numberMatchingRequiredState.excludeTarget.foreach('id',$groupid)
+
+        # DEPRECATED
+        if ($UpdateParameters.featureSettings.ContainsKey('NumberMatchingRequiredState'))
+        {
+            Write-Verbose -Message "The NumberMatchingRequiredState feature is deprecated and will be ignored. Please remove it from your configuration."
+            $UpdateParameters.featureSettings.Remove('NumberMatchingRequiredState')
         }
 
         $keys = (([Hashtable]$UpdateParameters).clone()).Keys