From f2c0f2ac788959acd0a9f274dbb1dd4dd9450c17 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 27 Mar 2024 16:47:09 -0400 Subject: [PATCH] FIXES #4496 --- CHANGELOG.md | 3 +++ .../MSFT_TeamsUpdateManagementPolicy.psm1 | 6 +++--- .../MSFT_TeamsUpdateManagementPolicy.schema.mof | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a79a6282eb..53a2b1d287 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,9 @@ * Fix output of property NormalizationRules as a string to the blueprint FIXES [#4428](https://github.com/microsoft/Microsoft365DSC/issues/4428) * Fix creation, update and deletion of resource +* TeamsUpdateManagementPolicy + * Adds support for the NewTeamsOnly value or the UseNewTeamsClient property. + FIXES [#4496](https://github.com/microsoft/Microsoft365DSC/issues/4496) * DEPENDENCIES * Updated DSCParser to version 2.0.0.2. * MISC diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 index 7f795ddcb8..381010632d 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 @@ -39,7 +39,7 @@ function Get-TargetResource $UpdateTimeOfDay, [Parameter()] - [ValidateSet('UserChoice', 'MicrosoftChoice', 'AdminDisabled', 'NewTeamsAsDefault')] + [ValidateSet('UserChoice', 'MicrosoftChoice', 'AdminDisabled', 'NewTeamsAsDefault', 'NewTeamsOnly')] [System.String] $UseNewTeamsClient, @@ -174,7 +174,7 @@ function Set-TargetResource $UpdateTimeOfDay, [Parameter()] - [ValidateSet('UserChoice', 'MicrosoftChoice', 'AdminDisabled', 'NewTeamsAsDefault')] + [ValidateSet('UserChoice', 'MicrosoftChoice', 'AdminDisabled', 'NewTeamsAsDefault', 'NewTeamsOnly')] [System.String] $UseNewTeamsClient, @@ -297,7 +297,7 @@ function Test-TargetResource $UpdateTimeOfDay, [Parameter()] - [ValidateSet('UserChoice', 'MicrosoftChoice', 'AdminDisabled', 'NewTeamsAsDefault')] + [ValidateSet('UserChoice', 'MicrosoftChoice', 'AdminDisabled', 'NewTeamsAsDefault', 'NewTeamsOnly')] [System.String] $UseNewTeamsClient, diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.schema.mof index 5efe8f1dbc..dd0630358b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.schema.mof +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.schema.mof @@ -9,7 +9,7 @@ class MSFT_TeamsUpdateManagementPolicy : OMI_BaseResource [Write, Description("Determines the day of week to perform the updates. Value shoud be between 0 and 6.")] UInt32 UpdateDayOfWeek; [Write, Description("Determines the time of day to perform the updates. Must be a valid HH:MM format string with leading 0. For instance 08:30.")] String UpdateTime; [Write, Description("Determines the time of day to perform the updates. Accepts a DateTime as string. Only the time will be considered.")] String UpdateTimeOfDay; - [Write, Description("Determines whether or not users will use the new Teams client."), ValueMap{"NewTeamsAsDefault","UserChoice","MicrosoftChoice","AdminDisabled"}, Values{"NewTeamsAsDefault","UserChoice","MicrosoftChoice","AdminDisabled"}] String UseNewTeamsClient; + [Write, Description("Determines whether or not users will use the new Teams client."), ValueMap{"NewTeamsAsDefault","UserChoice","MicrosoftChoice","AdminDisabled","NewTeamsOnly"}, Values{"NewTeamsAsDefault","UserChoice","MicrosoftChoice","AdminDisabled","NewTeamsOnly"}] String UseNewTeamsClient; [Write, Description("Present ensures the policy exists, absent ensures it is removed."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure; [Write, Description("Credentials of the Teams Admin"), EmbeddedInstance("MSFT_Credential")] string Credential; [Write, Description("Id of the Azure Active Directory application to authenticate with.")] String ApplicationId;