Fix export of EXO resources with ErrorAction Stop

FabienTschanz · FabienTschanz · commit a913bed97ea0 · 2025-12-07T16:25:18.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Change log for Microsoft365DSC
 
+# UNRELEASED
+
+* EXOExternalInOutlook
+  * Fixed an issue where the export would fail.
+    FIXES [#6753](https://github.com/microsoft/Microsoft365DSC/issues/6753)
+* EXOPhishSimOverrideRule
+  * Fixed an issue where the export would fail.
+    FIXES [#6753](https://github.com/microsoft/Microsoft365DSC/issues/6753)
+* EXOSecOpsOverrideRule
+  * Fixed an issue where the export would fail.
+    FIXES [#6753](https://github.com/microsoft/Microsoft365DSC/issues/6753)
+
 # 1.25.1203.2
+
 * DEPENDENCIES
   * Updated MSCloudLoginAssistant to version 1.1.56.
 
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOExternalInOutlook/MSFT_EXOExternalInOutlook.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOExternalInOutlook/MSFT_EXOExternalInOutlook.psm1
@@ -325,7 +325,7 @@ function Export-TargetResource
 
     try
     {
-        [array]$getValue = Get-ExternalInOutlook -ErrorAction Stop
+        [array]$getValue = Get-ExternalInOutlook
 
         $i = 1
         $dscContent = ''
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPhishSimOverrideRule/MSFT_EXOPhishSimOverrideRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPhishSimOverrideRule/MSFT_EXOPhishSimOverrideRule.psm1
@@ -374,7 +374,7 @@ function Export-TargetResource
 
     try
     {
-        [array]$rules = Get-EXOPhishSimOverrideRule -ErrorAction Stop
+        [array]$rules = Get-EXOPhishSimOverrideRule
 
         $i = 1
         $dscContent = ''
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSecOpsOverrideRule/MSFT_EXOSecOpsOverrideRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSecOpsOverrideRule/MSFT_EXOSecOpsOverrideRule.psm1
@@ -313,7 +313,7 @@ function Export-TargetResource
 
     try
     {
-        [array]$overrideRules = Get-EXOSecOpsOverrideRule -ErrorAction Stop
+        [array]$overrideRules = Get-EXOSecOpsOverrideRule
 
         $i = 1
         $dscContent = ''

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ function Export-TargetResource`
`325`	`325`
`326`	`326`	`try`
`327`	`327`	`{`
`328`		`- [array]$getValue = Get-ExternalInOutlook -ErrorAction Stop`
	`328`	`+ [array]$getValue = Get-ExternalInOutlook`
`329`	`329`
`330`	`330`	`$i = 1`
`331`	`331`	`$dscContent = ''`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ function Export-TargetResource`
`374`	`374`
`375`	`375`	`try`
`376`	`376`	`{`
`377`		`- [array]$rules = Get-EXOPhishSimOverrideRule -ErrorAction Stop`
	`377`	`+ [array]$rules = Get-EXOPhishSimOverrideRule`
`378`	`378`
`379`	`379`	`$i = 1`
`380`	`380`	`$dscContent = ''`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ function Export-TargetResource`
`313`	`313`
`314`	`314`	`try`
`315`	`315`	`{`
`316`		`- [array]$overrideRules = Get-EXOSecOpsOverrideRule -ErrorAction Stop`
	`316`	`+ [array]$overrideRules = Get-EXOSecOpsOverrideRule`
`317`	`317`
`318`	`318`	`$i = 1`
`319`	`319`	`$dscContent = ''`