Merge pull request #2395 from NikCharlebois/Release-1.22.1012.1

Release 1.22.1012.1
microsoft · Oct 13, 2022 · 600a99b · 600a99b
2 parents 4b682c4 + 988c472
commit 600a99b
Show file tree

Hide file tree

Showing 10 changed files with 1,048 additions and 745 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,5 @@
 # Change log for Microsoft365DSC
 
-# Unreleased
-
-* EXO Workload
-  * Add support for Managed Identity authentication
-
 # 1.22.1012.1
 
 * EXOManagementRoleAssignment
@@ -27,13 +22,18 @@
   * Added 35 new parameters.
   * Set AllowPlusAddressInRecipients parameter to deprecated. Use DisablePlusAddressInRecipients instead.
 * DEPENDENCIES
+  * Updated Microsoft.Graph dependencies to version 1.13.0.
+  * Updates MicrosoftTeams to version 4.8.0;
   * Updated ReverseDSC to version 2.0.0.13;
   FIXES [#2270](https://github.com/microsoft/Microsoft365DSC/issues/2270)
 * MISC
+  * EXO Workload
+    * Add support for Managed Identity authentication
   * Fixed an issue in in Export-M365DSCConfiguration when used with Service Principal
     FIXES [2374](https://github.com/microsoft/Microsoft365DSC/issues/2374)
     FIXES [2379](https://github.com/microsoft/Microsoft365DSC/issues/2379)
   * Added support for Exchange to the Update-M365DSCAzureAdApplication cmdlet
+  * Fixes an issue where filters were ignored on export when specifying the Workloads parameter.
 
 # 1.22.1005.1
 

diff --git a/...65DSC/DSCResources/MSFT_EXOManagementRoleAssignment/MSFT_EXOManagementRoleAssignment.psm1 b/...65DSC/DSCResources/MSFT_EXOManagementRoleAssignment/MSFT_EXOManagementRoleAssignment.psm1
@@ -329,6 +329,11 @@ function Set-TargetResource
         Write-Verbose -Message "Management Role Assignment'$($Name)' already exists, but needs updating."
         $NewManagementRoleParams.Add('Identity', $Name)
         $NewManagementRoleParams.Remove('Name') | Out-Null
+        $NewManagementRoleParams.Remove('User') | Out-Null
+        $NewManagementRoleParams.Remove('Role') | Out-Null
+        $NewManagementRoleParams.Remove('Computer') | Out-Null
+        $NewManagementRoleParams.Remove('App') | Out-Null
+        $NewManagementRoleParams.Remove('Policy') | Out-Null
         Set-ManagementRoleAssignment @NewManagementRoleParams
     }
 }

diff --git a/...les/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoiceUser/MSFT_TeamsOnlineVoiceUser.psm1 b/...les/Microsoft365DSC/DSCResources/MSFT_TeamsOnlineVoiceUser/MSFT_TeamsOnlineVoiceUser.psm1
@@ -58,8 +58,8 @@ function Get-TargetResource
         Write-Verbose -Message "Found Teams Online Voicemail Policy {$Identity}"
         return @{
             Identity        = $Identity
-            LocationID      = $instance.LocationID
-            TelephoneNumber = $instance.TelephoneNumber
+            LocationID      = $instance.Location
+            TelephoneNumber = $instance.Number
             Ensure          = 'Present'
             Credential      = $Credential
         }
@@ -217,6 +217,9 @@ function Export-TargetResource
     )
     $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftTeams' `
         -InboundParameters $PSBoundParameters
+
+    $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+        -InboundParameters $PSBoundParameters
 
     #Ensure the proper dependencies are installed in the current environment.
     Confirm-M365DSCDependencies
@@ -233,14 +236,15 @@ function Export-TargetResource
     try
     {
         $i = 1
-        [array]$policies = Get-CsOnlineVoiceUser -ErrorAction Stop
+        [array]$users = Get-CsOnlineVoiceUser -ErrorAction Stop
         $dscContent = ''
         Write-Host "`r`n" -NoNewline
-        foreach ($policy in $policies)
+        foreach ($user in $users)
         {
-            Write-Host "    |---[$i/$($policies.Count)] $($policy.Identity)" -NoNewline
+            Write-Host "    |---[$i/$($users.Count)] $($user.Name)" -NoNewline
+            $userEntry = Get-MgUser -UserId $user.Id
             $params = @{
-                Identity           = $policy.Identity
+                Identity   = $userEntry.UserPrincipalName
                 Credential = $Credential
             }
             $Results = Get-TargetResource @Params

diff --git a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1
@@ -10,67 +10,67 @@
         },
         @{
             ModuleName      = 'Microsoft.Graph.Applications'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Authentication'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.DeviceManagement'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.DeviceManagement.Administration'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.DeviceManagement.Enrolment'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Devices.CorporateManagement'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Groups'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Identity.DirectoryManagement'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Identity.Governance'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Identity.SignIns'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Planner'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Teams'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Users'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Users.Actions'
-            RequiredVersion = '1.12.3'
+            RequiredVersion = '1.13.0'
         },
         @{
             ModuleName      = 'Microsoft.PowerApps.Administration.PowerShell'
             RequiredVersion = '2.0.153'
         },
         @{
             ModuleName      = 'MicrosoftTeams'
-            RequiredVersion = '4.7.0'
+            RequiredVersion = '4.8.0'
         },
         @{
             ModuleName      = "MSCloudLoginAssistant"

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2022-09-21
+# Generated on: 2022-10-12
 
 @{
 
     # Script module or binary module file associated with this manifest.
     # RootModule = ''
 
     # Version number of this module.
-    ModuleVersion     = '1.22.1005.1'
+    ModuleVersion     = '1.22.1012.1'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -138,23 +138,36 @@
             IconUri      = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true'
 
             # ReleaseNotes of this module
-            ReleaseNotes = "* AADRoleSetting
-            * Fixed an issue if the P2 License is not present on the tenant the Export stop working
-              FIXES [#2227](https://github.com/microsoft/Microsoft365DSC/issues/2227)
-            * Fixed an issue with approver can be a group
-              FIXES [#2283](https://github.com/microsoft/Microsoft365DSC/issues/2283)
-          * AADConditionalAccessPolicy
-            * Added support for the CustomAuthenticationFactors parameter.
-            FIXES [#2292](https://github.com/microsoft/Microsoft365DSC/issues/2292)
-          * O365User
-            * Improved extraction performance by leveraging StringBuilder instead of re-assigning string.
-          * SCAutoSensitivityLabelPolicy
-            * Initial Release.
-          * SCAutoSensitivityLabelRule
-            * Initial Release.
+            ReleaseNotes = "* EXOManagementRoleAssignment
+            * Initial Release
+            FIXES [#2355](https://github.com/microsoft/Microsoft365DSC/issues/2355)
+            FIXES [#2356](https://github.com/microsoft/Microsoft365DSC/issues/2356)
+          * SCRetentionCompliancePolicy
+            * Fixed issue where the locations weren't properly returned.
+            FIXES [#2338](https://github.com/microsoft/Microsoft365DSC/issues/2338)
+            FIXES [#2339](https://github.com/microsoft/Microsoft365DSC/issues/2339)
+          * TeamsOnlineVoicemailPolicy
+            * Initial Release
+          * TeamsOnlineVoicemailUserSettings
+            * Initial Release
+          * TeamsOnlineVoiceUser
+            * Initial Release
+          * TeamsUserCallingSettings
+            * InitialRelease
+          * EXOOrganizationConfig
+            * Added 35 new parameters.
+            * Set AllowPlusAddressInRecipients parameter to deprecated. Use DisablePlusAddressInRecipients instead.
           * DEPENDENCIES
-            * Updated the ExchangeOnlineManagement dependency to version 3.0.0.
-            * Updated the MSCloudLoginAssistant dependency to version 1.0.89."
+            * Updated ReverseDSC to version 2.0.0.13;
+            FIXES [#2270](https://github.com/microsoft/Microsoft365DSC/issues/2270)
+            * Updates MicrosoftTeams to version 4.8.0;
+          * MISC
+            * EXO Workload
+              * Add support for Managed Identity authentication
+            * Fixed an issue in in Export-M365DSCConfiguration when used with Service Principal
+              FIXES [2374](https://github.com/microsoft/Microsoft365DSC/issues/2374)
+              FIXES [2379](https://github.com/microsoft/Microsoft365DSC/issues/2379)
+            * Added support for Exchange to the Update-M365DSCAzureAdApplication cmdlet"
 
             # Flag to indicate whether the module requires explicit user acceptance for install/update
             # RequireLicenseAcceptance = $false

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCStubsUtility.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCStubsUtility.psm1
@@ -202,6 +202,10 @@ function New-M365DSCStubFiles
                             {
                                 $ParamType = "PSObject"
                             }
+                            elseif ($ParamType.StartsWith("Microsoft.Rtc."))
+                            {
+                                $ParamType = "PSObject"
+                            }
                             $StubContent += "        [$ParamType]`r`n"
                             $StubContent += "        `$$($param.Name),`r`n`r`n"
                         }

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
@@ -8,7 +8,7 @@ $Global:DefaultComponents = @('SPOApp', 'SPOSiteDesign')
 $Global:FullComponents = @('AADGroup', 'AADServicePrincipal', 'EXOMailboxSettings', 'EXOManagementRole', 'O365Group', 'AADUSer', `
         'PlannerPlan', 'PlannerBucket', 'PlannerTask', 'PPPowerAppsEnvironment', 'PPTenantSettings', `
         'SPOSiteAuditSettings', 'SPOSiteGroup', 'SPOSite', 'SPOUserProfileProperty', 'SPOPropertyBag', 'TeamsTeam', 'TeamsChannel', `
-        'TeamsUser', 'TeamsChannelTab')
+        'TeamsUser', 'TeamsChannelTab', 'TeamsOnlineVoicemailUserSettings', 'TeamsUserCallingSettings')
 #endregion
 
 <#
@@ -1200,7 +1200,8 @@ function Export-M365DSCConfiguration
             -CertificatePath $CertificatePath `
             -CertificatePassword $CertificatePassword `
             -ManagedIdentity:$ManagedIdentity `
-            -GenerateInfo $GenerateInfo
+            -GenerateInfo $GenerateInfo `
+            -Filters $Filters
     }
     elseif ($null -ne $Components)
     {

diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsOnlineVoiceUser.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsOnlineVoiceUser.Tests.ps1
@@ -86,8 +86,8 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
 
                 Mock -CommandName Get-CsOnlineVOiceUser -MockWith {
                     return @{
-                        TelephoneNumber = '+14255043920'
-                        LocationId      = "c7c5a17f-00d7-47c0-9ddb-3383229d606b"
+                        Number = '+14255043920'
+                        Location      = "c7c5a17f-00d7-47c0-9ddb-3383229d606b"
                     }
                 }
             }
@@ -109,8 +109,8 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
 
                 Mock -CommandName Get-CsOnlineVOiceUser -MockWith {
                     return @{
-                        TelephoneNumber = '+15555555555' #Drift
-                        LocationId      = "c7c5a17f-00d7-47c0-9ddb-3383229d606b"
+                        Number   = '+15555555555' #Drift
+                        Location = "c7c5a17f-00d7-47c0-9ddb-3383229d606b"
                     }
                 }
             }
@@ -137,8 +137,8 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
 
                 Mock -CommandName Get-CsOnlineVOiceUser -MockWith {
                     return @{
-                        TelephoneNumber = '+14255043920'
-                        LocationId      = "c7c5a17f-00d7-47c0-9ddb-3383229d606b"
+                        Number = '+14255043920'
+                        Location      = "c7c5a17f-00d7-47c0-9ddb-3383229d606b"
                     }
                 }
             }