Resolve conflicts

microsoft · Oct 11, 2023 · 48d923d · 48d923d
1 parent 7a046f6
commit 48d923d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@
     FIXES [#3744](https://github.com/microsoft/Microsoft365DSC/issues/3744)
 * EXODistributionGroup
   * Fixes the export of group membership to use Identity.
+* MISC
+  * M365DSCReport: Also define property dataType, if present, as being primary key on CIM instances
 * TeamsUpgradeConfiguration
   * Fixes an issue where the SfBMeetingJoinUx property wasn't properly updated.
 * DEPENDENCIES

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCReport.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCReport.psm1
@@ -1071,6 +1071,7 @@ function Get-M365DSCCIMInstanceKey
         [System.Collections.Hashtable]
         $CIMInstance
     )
+
     $primaryKey = ''
     if ($CIMInstance.ContainsKey('IsSingleInstance'))
     {
@@ -1108,6 +1109,11 @@ function Get-M365DSCCIMInstanceKey
     {
         $primaryKey = 'odataType'
     }
+    elseif ($CIMInstance.ContainsKey("dataType"))
+    {
+        $primaryKey = 'dataType'
+    }
+
     return $primaryKey
 }