Merge pull request #6766 from NikCharlebois/Fix-EXOPlace

NikCharlebois · web-flow · commit 61339a7e293e · 2025-12-22T15:05:49.000-05:00
Fix EXOPlace
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Change log for Microsoft365DSC
 
+# UNRELEASED
+
+* EXOPlace
+  * Fixes an issue with the export where it was trying to export RoomList.
+
 # 1.25.1203.2
+
 * DEPENDENCIES
   * Updated MSCloudLoginAssistant to version 1.1.56.
 
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPlace/MSFT_EXOPlace.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPlace/MSFT_EXOPlace.psm1
@@ -607,7 +607,8 @@ function Export-TargetResource
     #endregion
     try
     {
-        [array]$places = Get-Place -ResultSize 'Unlimited' -ErrorAction Stop
+        [array]$places = Get-Place -ResultSize 'Unlimited' -ErrorAction Stop | `
+            Where-Object -FilterScript { $_.PlaceType -ne 'RoomList'}
         $dscContent = ''
 
         if ($places.Length -eq 0)
diff --git a/Modules/Microsoft365DSC/Modules/M365DSCReverse.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCReverse.psm1
@@ -197,8 +197,11 @@ function Start-M365DSCConfigurationExtract
             $ComponentsToSkip += $ExcludeComponents
         }
 
-        $resourcesInBothIncludeAndExclude = Compare-Object -ReferenceObject $Components `
-            -DifferenceObject $ComponentsToSkip -ExcludeDifferent -IncludeEqual
+        if ($null -ne $Components)
+        {
+            $resourcesInBothIncludeAndExclude = Compare-Object -ReferenceObject $Components `
+                -DifferenceObject $ComponentsToSkip -ExcludeDifferent -IncludeEqual
+        }
         if ($resourcesInBothIncludeAndExclude.Count -gt 0)
         {
             foreach ($resource in $resourcesInBothIncludeAndExclude)

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,8 @@ function Export-TargetResource`
`607`	`607`	`#endregion`
`608`	`608`	`try`
`609`	`609`	`{`
`610`		`- [array]$places = Get-Place -ResultSize 'Unlimited' -ErrorAction Stop`
	`610`	+ [array]$places = Get-Place -ResultSize 'Unlimited' -ErrorAction Stop \| `
	`611`	`+ Where-Object -FilterScript { $_.PlaceType -ne 'RoomList'}`
`611`	`612`	`$dscContent = ''`
`612`	`613`
`613`	`614`	`if ($places.Length -eq 0)`
Original file line number	Diff line number	Diff line change
`@@ -197,8 +197,11 @@ function Start-M365DSCConfigurationExtract`
`197`	`197`	`$ComponentsToSkip += $ExcludeComponents`
`198`	`198`	`}`
`199`	`199`
`200`		- $resourcesInBothIncludeAndExclude = Compare-Object -ReferenceObject $Components `
`201`		`- -DifferenceObject $ComponentsToSkip -ExcludeDifferent -IncludeEqual`
	`200`	`+ if ($null -ne $Components)`
	`201`	`+ {`
	`202`	+ $resourcesInBothIncludeAndExclude = Compare-Object -ReferenceObject $Components `
	`203`	`+ -DifferenceObject $ComponentsToSkip -ExcludeDifferent -IncludeEqual`
	`204`	`+ }`
`202`	`205`	`if ($resourcesInBothIncludeAndExclude.Count -gt 0)`
`203`	`206`	`{`
`204`	`207`	`foreach ($resource in $resourcesInBothIncludeAndExclude)`