Skip to content

Commit

Permalink
Merge pull request #5334 from NikCharlebois/Fixes-5188
Browse files Browse the repository at this point in the history
FIXES #5188
  • Loading branch information
NikCharlebois authored Nov 5, 2024
2 parents 1e8f2e4 + dbacf0d commit d59a7c2
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@
ContentSharingInExternalMeetings, Copilot, CopyRestriction,
DetectSensitiveContentDuringScreenSharing, ExternalMeetingJoin, ParticipantNameChange,
VoiceIsolation
* TeamsOrgWideAppSettings
* Fixed an issue where ManagedIdentity wasn't define in the methods' signatures.
FIXES [#5188](https://github.com/microsoft/Microsoft365DSC/issues/5188)
* M365DSCDRGUtil
* Fixes an issue where non-unique properties were not combined
properly with their respective parent setting.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ function Get-TargetResource

[Parameter()]
[System.String[]]
$AccessTokens
$AccessTokens,

[Parameter()]
[Switch]
$ManagedIdentity
)
Write-Verbose -Message 'Checking the Teams Upgrade Configuration'

Expand Down Expand Up @@ -50,6 +54,7 @@ function Get-TargetResource
IsSideloadedAppsInteractionEnabled = $settings.IsSideloadedAppsInteractionEnabled
Credential = $Credential
AccessTokens = $AccessTokens
ManagedIdentity = $ManagedIdentity.IsPresent
}
}
catch
Expand Down Expand Up @@ -93,7 +98,11 @@ function Set-TargetResource

[Parameter()]
[System.String[]]
$AccessTokens
$AccessTokens,

[Parameter()]
[Switch]
$ManagedIdentity
)

Write-Verbose -Message 'Setting Teams Upgrade Configuration'
Expand Down Expand Up @@ -142,7 +151,11 @@ function Test-TargetResource

[Parameter()]
[System.String[]]
$AccessTokens
$AccessTokens,

[Parameter()]
[Switch]
$ManagedIdentity
)
#Ensure the proper dependencies are installed in the current environment.
Confirm-M365DSCDependencies
Expand Down

0 comments on commit d59a7c2

Please sign in to comment.