From e3e2353b06be377552a429c77550e23783126cb0 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Fri, 14 Feb 2025 11:30:28 +0530 Subject: [PATCH 1/9] Fix #5742: Ensure TermsOfUse is an array in AADConditionalAccessPolicy --- .../MSFT_AADConditionalAccessPolicy.psm1 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 index 20c557d1a8..65cb6d1ee6 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 @@ -1777,12 +1777,13 @@ function Set-TargetResource } } - if ($TermsOfUse) - { - Write-Verbose -Message "Gettign Terms of Use {$TermsOfUse}" - $TermsOfUseObj = Get-MgBetaAgreement | Where-Object -FilterScript { $_.DisplayName -eq $TermsOfUse } - $GrantControls.Add('termsOfUse', $TermsOfUseObj.Id) - } + if ($TermsOfUse) +{ + Write-Verbose -Message "Getting Terms of Use {$TermsOfUse}" + $TermsOfUseObj = Get-MgBetaAgreement | Where-Object -FilterScript { $_.DisplayName -eq $TermsOfUse } + $GrantControls.Add('termsOfUse', @($TermsOfUseObj.Id)) +} + #no translation or conversion needed Write-Verbose -Message 'Set-Targetresource: Adding processed grant controls' From 331519e2e4ad5609ae80b5520e826311496381ec Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Mon, 17 Feb 2025 21:14:39 +0530 Subject: [PATCH 2/9] Update MSFT_AADConditionalAccessPolicy.psm1 --- .../MSFT_AADConditionalAccessPolicy.psm1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 index 65cb6d1ee6..d40b220ae5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 @@ -1778,11 +1778,11 @@ function Set-TargetResource } if ($TermsOfUse) -{ - Write-Verbose -Message "Getting Terms of Use {$TermsOfUse}" - $TermsOfUseObj = Get-MgBetaAgreement | Where-Object -FilterScript { $_.DisplayName -eq $TermsOfUse } - $GrantControls.Add('termsOfUse', @($TermsOfUseObj.Id)) -} + { + Write-Verbose -Message "Getting Terms of Use {$TermsOfUse}" + $TermsOfUseObj = Get-MgBetaAgreement | Where-Object -FilterScript { $_.DisplayName -eq $TermsOfUse } + $GrantControls.Add('termsOfUse', @($TermsOfUseObj.Id)) + } #no translation or conversion needed From 6fbba5b712639c3498b87ad8a0d2475a39bed3de Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Mon, 17 Feb 2025 21:27:14 +0530 Subject: [PATCH 3/9] Update CHANGELOG.md --- CHANGELOG.md | 54 +++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 902d2e9b38..10150a09e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,30 +1,36 @@ # Change log for Microsoft365DSC -# UNRELEASED +## UNRELEASED + +### AADRoleEligibilityScheduleRequest +- Reduce call count when reconciling object type. FIXES #5621 + +### ADOSecurityPolicy +- Fixes an issue where the resource threw an error trying to parse the default values. + +### M365DSCUtil +- Add M365DSC prefix to Remove-EmptyValue. +- Fixes an issue with Credential property being escaped and indentation. +- Adds the possibility to allow variables in strings and no authentication results update during conversion to final export. FIXES #3861 + +### SCSensitivityLabel +- Fixes invalid accepted content type values. + +### TeamsAppPermissionPolicy +- Updated correct Typecasting for AppPresetMeeting and PinnedMessagebarApps before adding them to the policy. + +### TeamsAppSetupPolicy +- FIXES [#5752] + +### TeamsM365App +- Remove Ensure property from being exported. FIXES #5781 + +### **AADConditionalAccessPolicy** +- Fixed an issue where `TermsOfUse` was not passed as an array, causing failures in GCC-High environments. ([#5742](https://github.com/microsoft/your-repo/issues/5742)) + +### DEPENDENCIES +- Updated ReverseDSC to version 2.0.0.27 -* AADRoleEligibilityScheduleRequest - * Reduce call count when reconciling object type - FIXES [#5621](https://github.com/microsoft/Microsoft365DSC/issues/5621) -* ADOSecurityPolicy - * Fixes an issue where the resource threw an error trying to parse the default - values. -* M365DSCUtil - * Add M365DSC prefix to `Remove-EmptyValue`. - * Fixes an issue with `Credential` property being escaped and indentation. - * Adds the possibility to allow variables in strings and no authentication - results update during conversion to final export. - FIXES [#3861](https://github.com/microsoft/Microsoft365DSC/issues/3861) -* SCSensitivityLabel - * Fixes invalid accepted content type values. -* TeamsAppPermissionPolicy - * Updated correct Typecasting for AppPresetMeeting and PinnedMessagebarApps before adding them to the policy -* TeamsAppSetupPolicy - * FIXES [[#5752](https://github.com/microsoft/Microsoft365DSC/issues/5752) -* TeamsM365App - * Remove `Ensure` property from being exported. - FIXES [#5781](https://github.com/microsoft/Microsoft365DSC/issues/5781) -* DEPENDENCIES - * Updated ReverseDSC to version 2.0.0.27 # 1.25.212.2 From 275334b41b37b1c6556dfb21554654b747d136b0 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Mon, 17 Feb 2025 21:29:57 +0530 Subject: [PATCH 4/9] Update CHANGELOG.md --- CHANGELOG.md | 54 +++++++++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10150a09e1..902d2e9b38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,36 +1,30 @@ # Change log for Microsoft365DSC -## UNRELEASED - -### AADRoleEligibilityScheduleRequest -- Reduce call count when reconciling object type. FIXES #5621 - -### ADOSecurityPolicy -- Fixes an issue where the resource threw an error trying to parse the default values. - -### M365DSCUtil -- Add M365DSC prefix to Remove-EmptyValue. -- Fixes an issue with Credential property being escaped and indentation. -- Adds the possibility to allow variables in strings and no authentication results update during conversion to final export. FIXES #3861 - -### SCSensitivityLabel -- Fixes invalid accepted content type values. - -### TeamsAppPermissionPolicy -- Updated correct Typecasting for AppPresetMeeting and PinnedMessagebarApps before adding them to the policy. - -### TeamsAppSetupPolicy -- FIXES [#5752] - -### TeamsM365App -- Remove Ensure property from being exported. FIXES #5781 - -### **AADConditionalAccessPolicy** -- Fixed an issue where `TermsOfUse` was not passed as an array, causing failures in GCC-High environments. ([#5742](https://github.com/microsoft/your-repo/issues/5742)) - -### DEPENDENCIES -- Updated ReverseDSC to version 2.0.0.27 +# UNRELEASED +* AADRoleEligibilityScheduleRequest + * Reduce call count when reconciling object type + FIXES [#5621](https://github.com/microsoft/Microsoft365DSC/issues/5621) +* ADOSecurityPolicy + * Fixes an issue where the resource threw an error trying to parse the default + values. +* M365DSCUtil + * Add M365DSC prefix to `Remove-EmptyValue`. + * Fixes an issue with `Credential` property being escaped and indentation. + * Adds the possibility to allow variables in strings and no authentication + results update during conversion to final export. + FIXES [#3861](https://github.com/microsoft/Microsoft365DSC/issues/3861) +* SCSensitivityLabel + * Fixes invalid accepted content type values. +* TeamsAppPermissionPolicy + * Updated correct Typecasting for AppPresetMeeting and PinnedMessagebarApps before adding them to the policy +* TeamsAppSetupPolicy + * FIXES [[#5752](https://github.com/microsoft/Microsoft365DSC/issues/5752) +* TeamsM365App + * Remove `Ensure` property from being exported. + FIXES [#5781](https://github.com/microsoft/Microsoft365DSC/issues/5781) +* DEPENDENCIES + * Updated ReverseDSC to version 2.0.0.27 # 1.25.212.2 From 0cfb696472f8261a8d2943bb817385317fb34f53 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Mon, 17 Feb 2025 21:34:12 +0530 Subject: [PATCH 5/9] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 902d2e9b38..a741214f75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,9 @@ * TeamsM365App * Remove `Ensure` property from being exported. FIXES [#5781](https://github.com/microsoft/Microsoft365DSC/issues/5781) + * **AADConditionalAccessPolicy** + * Fixed an issue where `TermsOfUse` was not passed as an array, causing failures in GCC-High environments. + FIXES [#5742](https://github.com/microsoft/Microsoft365DSC/issues/5742) * DEPENDENCIES * Updated ReverseDSC to version 2.0.0.27 From f0c30f62ba6f4fbcf0b356690d0a9353a5f8a50e Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Mon, 17 Feb 2025 21:49:44 +0530 Subject: [PATCH 6/9] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a741214f75..c79fdef14c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ * TeamsM365App * Remove `Ensure` property from being exported. FIXES [#5781](https://github.com/microsoft/Microsoft365DSC/issues/5781) - * **AADConditionalAccessPolicy** + * AADConditionalAccessPolicy * Fixed an issue where `TermsOfUse` was not passed as an array, causing failures in GCC-High environments. FIXES [#5742](https://github.com/microsoft/Microsoft365DSC/issues/5742) * DEPENDENCIES From 962ee65fab4fc859ef0864e13bf4b94936e2a879 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Mon, 17 Feb 2025 21:56:26 +0530 Subject: [PATCH 7/9] Update CHANGELOG.md Co-authored-by: Fabien Tschanz <71251572+FabienTschanz@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c79fdef14c..7af715ddb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ * TeamsM365App * Remove `Ensure` property from being exported. FIXES [#5781](https://github.com/microsoft/Microsoft365DSC/issues/5781) - * AADConditionalAccessPolicy +* AADConditionalAccessPolicy * Fixed an issue where `TermsOfUse` was not passed as an array, causing failures in GCC-High environments. FIXES [#5742](https://github.com/microsoft/Microsoft365DSC/issues/5742) * DEPENDENCIES From ffd6d23952bc0fcb4cc0024be9afd4c488642f93 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Tue, 25 Feb 2025 09:52:00 +0530 Subject: [PATCH 8/9] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7af715ddb8..2bc5f64cdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,10 @@ * AADConditionalAccessPolicy * Fixed an issue where `TermsOfUse` was not passed as an array, causing failures in GCC-High environments. FIXES [#5742](https://github.com/microsoft/Microsoft365DSC/issues/5742) +* AADGroupEligibilitySchedule + * FIXES [#5792](https://github.com/microsoft/Microsoft365DSC/issues/5792) issue where complete DSC isn't exported after generated + * FIXES [#5793](https://github.com/microsoft/Microsoft365DSC/issues/5793) issue where PrincipalType isn't correctly captured in AzureGov + * DEPENDENCIES * Updated ReverseDSC to version 2.0.0.27 From 0483c6ffad9f1aa1ff073ca4e75741bb82387b7d Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Tue, 25 Feb 2025 09:53:38 +0530 Subject: [PATCH 9/9] Update CHANGELOG.md --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bc5f64cdd..7af715ddb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,10 +26,6 @@ * AADConditionalAccessPolicy * Fixed an issue where `TermsOfUse` was not passed as an array, causing failures in GCC-High environments. FIXES [#5742](https://github.com/microsoft/Microsoft365DSC/issues/5742) -* AADGroupEligibilitySchedule - * FIXES [#5792](https://github.com/microsoft/Microsoft365DSC/issues/5792) issue where complete DSC isn't exported after generated - * FIXES [#5793](https://github.com/microsoft/Microsoft365DSC/issues/5793) issue where PrincipalType isn't correctly captured in AzureGov - * DEPENDENCIES * Updated ReverseDSC to version 2.0.0.27