Merge pull request #2376 from NikCharlebois/FixIssue2338

Fix issue 2338 & 2339
microsoft · Oct 6, 2022 · 99773f4 · 99773f4
2 parents 7160977 + 851b352
commit 99773f4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change log for Microsoft365DSC
 
+# 1.22.1012.1
+
+* SCRetentionCompliancePolicy
+  * Fixed issue where the locations weren't properly returned.
+  FIXES [#2338](https://github.com/microsoft/Microsoft365DSC/issues/2338)
+  FIXES [#2339](https://github.com/microsoft/Microsoft365DSC/issues/2339)
+
 # 1.22.1005.1
 
 * AADUser

diff --git a/...65DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.psm1 b/...65DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.psm1
@@ -123,7 +123,7 @@ function Get-TargetResource
     $nullReturn.Ensure = 'Absent'
     try
     {
-        $PolicyObject = Get-RetentionCompliancePolicy $Name -ErrorAction SilentlyContinue
+        $PolicyObject = Get-RetentionCompliancePolicy $Name -DistributionDetail -ErrorAction SilentlyContinue
 
         if ($null -eq $PolicyObject)
         {
@@ -146,7 +146,7 @@ function Get-TargetResource
                     TeamsChannelLocationException = $PolicyObject.TeamsChannelLocationException
                     TeamsChatLocation             = [array]$PolicyObject.TeamsChatLocation
                     TeamsChatLocationException    = $PolicyObject.TeamsChatLocationException
-                    Credential            = $Credential
+                    Credential                    = $Credential
                 }
             }
             else

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -11,7 +11,7 @@
     # RootModule = ''
 
     # Version number of this module.
-    ModuleVersion     = '1.22.921.1'
+    ModuleVersion     = '1.22.1005.1'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()