Skip to content

Commit 5571690

Browse files
Merge pull request #6755 from FabienTschanz/fix/exo-export
Fix export of EXO resources with ErrorAction Stop
2 parents f120e50 + 2a91498 commit 5571690

File tree

5 files changed

+13
-4
lines changed

5 files changed

+13
-4
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44

55
* AADNetworkAccessForwardingPolicy
66
* Fixed an issue where empty `PolicyRules` would throw an exception during Get.
7+
* EXOExternalInOutlook
8+
* Fixed an issue where the export would fail.
9+
FIXES [#6753](https://github.com/microsoft/Microsoft365DSC/issues/6753)
10+
* EXOPhishSimOverrideRule
11+
* Fixed an issue where the export would fail.
12+
FIXES [#6753](https://github.com/microsoft/Microsoft365DSC/issues/6753)
713
* EXOPlace
814
* Fixes an issue with the export where it was trying to export RoomList.
15+
* EXOSecOpsOverrideRule
16+
* Fixed an issue where the export would fail.
17+
FIXES [#6753](https://github.com/microsoft/Microsoft365DSC/issues/6753)
918
* IntuneAppConfigurationDevicePolicy
1019
* Added error handling with message if targeted app doesn't exist.
1120
* IntuneAppProtectionPolicyAndroid

Modules/Microsoft365DSC/DSCResources/MSFT_EXOExternalInOutlook/MSFT_EXOExternalInOutlook.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ function Export-TargetResource
325325

326326
try
327327
{
328-
[array]$getValue = Get-ExternalInOutlook -ErrorAction Stop
328+
[array]$getValue = Get-ExternalInOutlook
329329

330330
$i = 1
331331
$dscContent = ''

Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxIRMAccess/MSFT_EXOMailboxIRMAccess.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ function Export-TargetResource
324324
{
325325
Write-M365DSCHost -Message " |---[$i/$($mailboxes.Count)] $($mailbox.UserPrincipalName)" -DeferWrite
326326

327-
[Array]$irmAccesses = Get-MailboxIRMAccess -Identity $mailbox.UserPrincipalName -ErrorAction Stop
327+
[Array]$irmAccesses = Get-MailboxIRMAccess -Identity $mailbox.UserPrincipalName
328328

329329
$j = 1
330330
Write-M365DSCHost -Message "`r`n" -DeferWrite

Modules/Microsoft365DSC/DSCResources/MSFT_EXOPhishSimOverrideRule/MSFT_EXOPhishSimOverrideRule.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ function Export-TargetResource
375375

376376
try
377377
{
378-
[array]$rules = Get-EXOPhishSimOverrideRule -ErrorAction Stop
378+
[array]$rules = Get-EXOPhishSimOverrideRule
379379

380380
$i = 1
381381
$dscContent = ''

Modules/Microsoft365DSC/DSCResources/MSFT_EXOSecOpsOverrideRule/MSFT_EXOSecOpsOverrideRule.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ function Export-TargetResource
313313

314314
try
315315
{
316-
[array]$overrideRules = Get-EXOSecOpsOverrideRule -ErrorAction Stop
316+
[array]$overrideRules = Get-EXOSecOpsOverrideRule
317317

318318
$i = 1
319319
$dscContent = ''

0 commit comments

Comments
 (0)