Added support for SettingDefinitionId

ykuijs · Oct 1, 2024 · d8e4681 · d8e4681
1 parent 98489d9
commit d8e4681
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Added SettingDefinitionId as a new value to merge items in an array, in addition to UniqueId,
+  NodeName, Id and Identity
+
 ## [0.4.2] - 2024-10-01
 
 ### Fixed

diff --git a/source/Private/Merge-Array.ps1 b/source/Private/Merge-Array.ps1
@@ -46,6 +46,7 @@ function Merge-Array
                     ($_.ContainsKey('UniqueId') -and $_.UniqueId -eq $item.UniqueId) -or `
                     ($_.ContainsKey('Identity') -and $_.Identity -eq $item.Identity) -or `
                     ($_.ContainsKey('Id') -and $_.Id -eq $item.Id) -or `
+                    ($_.ContainsKey('SettingDefinitionId') -and $_.SettingDefinitionId -eq $item.SettingDefinitionId) -or `
                     ($_.ContainsKey('NodeName') -and $_.NodeName -eq $item.NodeName)
                 }
 

diff --git a/source/Public/Convert-M365DSCExportToPowerShellDataFile.ps1 b/source/Public/Convert-M365DSCExportToPowerShellDataFile.ps1
@@ -154,7 +154,7 @@ function Convert-M365DSCExportToPowerShellDataFile
         $Int_Nodes.ForEach{ $_.Value = [int]$_.Value }
 
         # Sort-object
-        $Obj_Result = $Obj_Result | Sort-ObjectGraph -PrimaryKey 'NodeName', 'Identity', 'UniqueId' -MaxDepth 20
+        $Obj_Result = $Obj_Result | Sort-ObjectGraph -PrimaryKey 'NodeName', 'Identity', 'UniqueId', 'SettingDefinitionId' -MaxDepth 20
 
         # Check if data is available
         if ($Obj_Result.NonNodeData.$Workload)