Skip to content

Commit 996750c

Browse files
Merge pull request #4285 from microsoft/Dev
Release 1.24.131.2
2 parents 12f990e + fcc28fe commit 996750c

File tree

4 files changed

+41
-7
lines changed

4 files changed

+41
-7
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change log for Microsoft365DSC
22

3+
# 1.24.131.2
4+
5+
* TeamsMeetingPolicy
6+
* Fixed issue with missing ManagedIdentity parameter in Test signature.
7+
* TeamsUpdateManagementPolicy
8+
* Fixed issue with missing ManagedIdentity parameter in Set signature.
9+
310
# 1.24.131.1
411

512
* EXOAvailabilityAddressSpace

Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,11 @@ function Get-TargetResource
295295

296296
[Parameter()]
297297
[System.String]
298-
$CertificateThumbprint
298+
$CertificateThumbprint,
299+
300+
[Parameter()]
301+
[Switch]
302+
$ManagedIdentity
299303
)
300304

301305
Write-Verbose -Message "Getting the Teams Meeting Policy $($Identity)"
@@ -396,6 +400,7 @@ function Get-TargetResource
396400
ApplicationId = $ApplicationId
397401
TenantId = $TenantId
398402
CertificateThumbprint = $CertificateThumbprint
403+
ManagedIdentity = $ManagedIdentity.IsPresent
399404
}
400405
}
401406
catch
@@ -706,7 +711,11 @@ function Set-TargetResource
706711

707712
[Parameter()]
708713
[System.String]
709-
$CertificateThumbprint
714+
$CertificateThumbprint,
715+
716+
[Parameter()]
717+
[Switch]
718+
$ManagedIdentity
710719
)
711720

712721
Write-Verbose -Message 'Setting Teams Meeting Policy'
@@ -734,6 +743,7 @@ function Set-TargetResource
734743
$SetParameters.Remove('ApplicationId') | Out-Null
735744
$SetParameters.Remove('TenantId') | Out-Null
736745
$SetParameters.Remove('CertificateThumbprint') | Out-Null
746+
$SetParameters.Remove('ManagedIdentity') | Out-Null
737747
$SetParameters.Remove('Verbose') | Out-Null # Needs to be implicitly removed for the cmdlet to work
738748

739749
if ($Ensure -eq 'Present' -and $CurrentValues.Ensure -eq 'Absent')
@@ -1074,7 +1084,11 @@ function Test-TargetResource
10741084

10751085
[Parameter()]
10761086
[System.String]
1077-
$CertificateThumbprint
1087+
$CertificateThumbprint,
1088+
1089+
[Parameter()]
1090+
[Switch]
1091+
$ManagedIdentity
10781092
)
10791093
#Ensure the proper dependencies are installed in the current environment.
10801094
Confirm-M365DSCDependencies
@@ -1134,7 +1148,11 @@ function Export-TargetResource
11341148

11351149
[Parameter()]
11361150
[System.String]
1137-
$CertificateThumbprint
1151+
$CertificateThumbprint,
1152+
1153+
[Parameter()]
1154+
[Switch]
1155+
$ManagedIdentity
11381156
)
11391157
$ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftTeams' `
11401158
-InboundParameters $PSBoundParameters
@@ -1166,6 +1184,7 @@ function Export-TargetResource
11661184
ApplicationId = $ApplicationId
11671185
TenantId = $TenantId
11681186
CertificateThumbprint = $CertificateThumbprint
1187+
ManagedIdentity = $ManagedIdentity.IsPresent
11691188
}
11701189
$Results = Get-TargetResource @Params
11711190
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `

Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,11 @@ function Set-TargetResource
197197

198198
[Parameter()]
199199
[System.String]
200-
$CertificateThumbprint
200+
$CertificateThumbprint,
201+
202+
[Parameter()]
203+
[Switch]
204+
$ManagedIdentity
201205
)
202206

203207
#Ensure the proper dependencies are installed in the current environment.

Modules/Microsoft365DSC/Microsoft365DSC.psd1

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 2024-02-01
6+
# Generated on: 2024-02-02
77

88
@{
99

1010
# Script module or binary module file associated with this manifest.
1111
# RootModule = ''
1212

1313
# Version number of this module.
14-
ModuleVersion = '1.24.131.1'
14+
ModuleVersion = '1.24.131.2'
1515

1616
# Supported PSEditions
1717
# CompatiblePSEditions = @()
@@ -161,6 +161,10 @@
161161
* TeamsEmergencyCallRoutingPolicy
162162
* Fix deletion of resource
163163
FIXES [#4261](https://github.com/microsoft/Microsoft365DSC/issues/4261)
164+
* TeamsMeetingPolicy
165+
* Fixed issue with missing ManagedIdentity parameter in Test signature.
166+
* TeamsUpdateManagementPolicy
167+
* Fixed issue with missing ManagedIdentity parameter in Set signature.
164168
* TEAMS
165169
* Added support for ManagedIdentity Authentication across Teams resources.
166170
* DEPENDENCIES

0 commit comments

Comments
 (0)