Merge pull request #4285 from microsoft/Dev

Release 1.24.131.2
microsoft · Feb 2, 2024 · 996750c · 996750c
2 parents 12f990e + fcc28fe
commit 996750c
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change log for Microsoft365DSC
 
+# 1.24.131.2
+
+* TeamsMeetingPolicy
+  * Fixed issue with missing ManagedIdentity parameter in Test signature.
+* TeamsUpdateManagementPolicy
+  * Fixed issue with missing ManagedIdentity parameter in Set signature.
+
 # 1.24.131.1
 
 * EXOAvailabilityAddressSpace

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1
@@ -295,7 +295,11 @@ function Get-TargetResource
 
         [Parameter()]
         [System.String]
-        $CertificateThumbprint
+        $CertificateThumbprint,
+
+        [Parameter()]
+        [Switch]
+        $ManagedIdentity
     )
 
     Write-Verbose -Message "Getting the Teams Meeting Policy $($Identity)"
@@ -396,6 +400,7 @@ function Get-TargetResource
             ApplicationId                              = $ApplicationId
             TenantId                                   = $TenantId
             CertificateThumbprint                      = $CertificateThumbprint
+            ManagedIdentity                            = $ManagedIdentity.IsPresent
         }
     }
     catch
@@ -706,7 +711,11 @@ function Set-TargetResource
 
         [Parameter()]
         [System.String]
-        $CertificateThumbprint
+        $CertificateThumbprint,
+
+        [Parameter()]
+        [Switch]
+        $ManagedIdentity
     )
 
     Write-Verbose -Message 'Setting Teams Meeting Policy'
@@ -734,6 +743,7 @@ function Set-TargetResource
     $SetParameters.Remove('ApplicationId') | Out-Null
     $SetParameters.Remove('TenantId') | Out-Null
     $SetParameters.Remove('CertificateThumbprint') | Out-Null
+    $SetParameters.Remove('ManagedIdentity') | Out-Null
     $SetParameters.Remove('Verbose') | Out-Null # Needs to be implicitly removed for the cmdlet to work
 
     if ($Ensure -eq 'Present' -and $CurrentValues.Ensure -eq 'Absent')
@@ -1074,7 +1084,11 @@ function Test-TargetResource
 
         [Parameter()]
         [System.String]
-        $CertificateThumbprint
+        $CertificateThumbprint,
+
+        [Parameter()]
+        [Switch]
+        $ManagedIdentity
     )
     #Ensure the proper dependencies are installed in the current environment.
     Confirm-M365DSCDependencies
@@ -1134,7 +1148,11 @@ function Export-TargetResource
 
         [Parameter()]
         [System.String]
-        $CertificateThumbprint
+        $CertificateThumbprint,
+
+        [Parameter()]
+        [Switch]
+        $ManagedIdentity
     )
     $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftTeams' `
         -InboundParameters $PSBoundParameters
@@ -1166,6 +1184,7 @@ function Export-TargetResource
                 ApplicationId         = $ApplicationId
                 TenantId              = $TenantId
                 CertificateThumbprint = $CertificateThumbprint
+                ManagedIdentity       = $ManagedIdentity.IsPresent
             }
             $Results = Get-TargetResource @Params
             $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `

diff --git a/...65DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 b/...65DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1
@@ -197,7 +197,11 @@ function Set-TargetResource
 
         [Parameter()]
         [System.String]
-        $CertificateThumbprint
+        $CertificateThumbprint,
+
+        [Parameter()]
+        [Switch]
+        $ManagedIdentity
     )
 
     #Ensure the proper dependencies are installed in the current environment.

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2024-02-01
+# Generated on: 2024-02-02
 
 @{
 
   # Script module or binary module file associated with this manifest.
   # RootModule = ''
 
   # Version number of this module.
-  ModuleVersion     = '1.24.131.1'
+  ModuleVersion     = '1.24.131.2'
 
   # Supported PSEditions
   # CompatiblePSEditions = @()
@@ -161,6 +161,10 @@
     * TeamsEmergencyCallRoutingPolicy
       * Fix deletion of resource
         FIXES [#4261](https://github.com/microsoft/Microsoft365DSC/issues/4261)
+    * TeamsMeetingPolicy
+        * Fixed issue with missing ManagedIdentity parameter in Test signature.
+    * TeamsUpdateManagementPolicy
+      * Fixed issue with missing ManagedIdentity parameter in Set signature.
     * TEAMS
       * Added support for ManagedIdentity Authentication across Teams resources.
     * DEPENDENCIES