fix: fixed merge logic like js {...obj} such it do not override value…

…s defined after.
EAVFW · Aug 21, 2024 · 332b3d8 · 332b3d8
1 parent f61ede0
commit 332b3d8
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/sdk/DefaultManifestReplacementRunner.cs b/sdk/DefaultManifestReplacementRunner.cs
@@ -187,6 +187,8 @@ public async Task RunReplacements(JToken jsonraw, string customizationprefix, IL
                             {
                                 var parentObj = prop.Parent as JObject;
                                 var obj = prop.Value;
+                                var mergeIndex = Array.IndexOf(parentObj.Properties().ToArray(), prop);
+                                var parentObjKeys = parentObj.Properties().Select(k => k.Name).ToArray();
 
                                 if (obj.Type == JTokenType.String && ShouldEvaluate(obj.ToString()))
                                 {
@@ -211,9 +213,12 @@ public async Task RunReplacements(JToken jsonraw, string customizationprefix, IL
                                     }
                                     else
                                     {
-
-                                            parentObj.Add(childProp);
+
+                                        if (!parentObj.ContainsKey(childProp.Name) || Array.IndexOf(parentObjKeys,childProp.Name) < mergeIndex)
+                                        {
+                                            parentObj[childProp.Name] = childProp.Value;
                                             q.Enqueue(childProp);
+                                        }
 
                                     }