From 958cece83bd14979ebc4630f320c34baca39eda1 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 21 Sep 2022 10:09:54 -0400 Subject: [PATCH 1/2] Release 1.22.921.1 --- CHANGELOG.md | 4 ++- .../Dependencies/Manifest.psd1 | 5 +++ Modules/Microsoft365DSC/Microsoft365DSC.psd1 | 33 +++++++++++-------- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c69d3e3a4e..39813e8709 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Change log for Microsoft365DSC -# UNRELEASED +# 1.22.921.1 + * AADRoleSetting * Fixed an issue if the P2 License is not present on the tenant the Export stop working FIXES [#2227](https://github.com/microsoft/Microsoft365DSC/issues/2227) @@ -16,6 +17,7 @@ * SCAutoSensitivityLabelRule * Initial Release. * DEPENDENCIES + * Updated the ExchangeOnlineManagement dependency to version 3.0.0. * Updated the MSCloudLoginAssistant dependency to version 1.0.89. # 1.22.914.1 diff --git a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 index 4f4294a2e5..a26ed3127d 100644 --- a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 +++ b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 @@ -5,8 +5,13 @@ RequiredVersion = '1.3.0.6' }, @{ +<<<<<<< Updated upstream ModuleName = 'ExchangeOnlineManagement' RequiredVersion = '2.0.5' +======= + ModuleName = "ExchangeOnlineManagement" + RequiredVersion = "3.0.0" +>>>>>>> Stashed changes }, @{ ModuleName = 'Microsoft.Graph.Applications' diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 index fd6b4e35e3..93e2d2ba30 100644 --- a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 +++ b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 @@ -3,7 +3,7 @@ # # Generated by: Microsoft Corporation # -# Generated on: 2022-09-14 +# Generated on: 2022-09-21 @{ @@ -11,7 +11,7 @@ # RootModule = '' # Version number of this module. - ModuleVersion = '1.22.914.1' + ModuleVersion = '1.22.921.1' # Supported PSEditions # CompatiblePSEditions = @() @@ -137,18 +137,23 @@ IconUri = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true' # ReleaseNotes of this module - ReleaseNotes = "* AADGroup - * Changed behavior where if a group has a dynamic membership rule that is active, - we no longer process members from the export, Get and Set functions. - FIXES [#2190](https://github.com/microsoft/Microsoft365DSC/issues/2190) - * Fixed an issue where if the licenses parameter was omitted and another parameter caused - a drift, that the licenses would get stripped from the group. - FIXES [#2191](https://github.com/microsoft/Microsoft365DSC/issues/2191) - * AADRoleSetting - * Fixed an issue where the export wasn't properly passing credential to the Get function. - * TeamsCallingPolicy - * Added UserOverride as an accepted value for the BusyOnBusyEnabledType parameter. - FIXES [#2271](https://github.com/microsoft/Microsoft365DSC/issues/2271)" + ReleaseNotes = "* AADRoleSetting + * Fixed an issue if the P2 License is not present on the tenant the Export stop working + FIXES [#2227](https://github.com/microsoft/Microsoft365DSC/issues/2227) + * Fixed an issue with approver can be a group + FIXES [#2283](https://github.com/microsoft/Microsoft365DSC/issues/2283) + * AADConditionalAccessPolicy + * Added support for the CustomAuthenticationFactors parameter. + FIXES [#2292](https://github.com/microsoft/Microsoft365DSC/issues/2292) + * O365User + * Improved extraction performance by leveraging StringBuilder instead of re-assigning string. + * SCAutoSensitivityLabelPolicy + * Initial Release. + * SCAutoSensitivityLabelRule + * Initial Release. + * DEPENDENCIES + * Updated the ExchangeOnlineManagement dependency to version 3.0.0. + * Updated the MSCloudLoginAssistant dependency to version 1.0.89." # Flag to indicate whether the module requires explicit user acceptance for install/update # RequireLicenseAcceptance = $false From a9a4d0d12a2b920e7f4c8186e87cad08f3bef605 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 21 Sep 2022 12:28:39 -0400 Subject: [PATCH 2/2] Release 1.22.921.1 --- .../MSFT_EXOAvailabilityAddressSpace.psm1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 index 23fdd6347f..690ea0586a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 @@ -257,6 +257,8 @@ function Set-TargetResource # AvailabilityAddressSpace doe not have a new-AvailabilityAddressSpace cmdlet but instead uses an add-AvailabilityAddressSpace cmdlet try { + $AvailabilityAddressSpaceParams.Remove('Identity') | Out-Null + $AvailabilityAddressSpaceParams.Remove('Credentials') | Out-Null add-AvailabilityAddressSpace @AvailabilityAddressSpaceParams -ea stop } catch @@ -279,6 +281,8 @@ function Set-TargetResource try { + $AvailabilityAddressSpaceParams.Remove('Identity') | Out-Null + $AvailabilityAddressSpaceParams.Remove('Credentials') | Out-Null add-AvailabilityAddressSpace @AvailabilityAddressSpaceParams -ea stop } catch