Fix merge manifest error

Samsung · Feb 5, 2024 · 84a5f62 · 84a5f62
1 parent 198bd60
commit 84a5f62
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/workload/src/Samsung.Tizen.Build.Tasks/MergeManifest.cs b/workload/src/Samsung.Tizen.Build.Tasks/MergeManifest.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
-
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
@@ -17,7 +16,7 @@ public class MergeManifest : Task
 
         public ITaskItem[] SubManifestFileList
         {
-            set
+            set
             {
                 if (value != null)
                     subManifestFileList = value.ToList();
@@ -71,11 +70,25 @@ public override bool Execute()
                     }
                     else if (subapp.Name.LocalName == "privileges")
                     {
-                        mainDoc.Root.Element(ns + "privileges").Add(subapp.Descendants(ns + "privilege"));
+                        if (mainDoc.Root.Element(ns + "privileges") == null)
+                        {
+                            mainDoc.Root.Add(subapp);
+                        }
+                        else
+                        {
+                            mainDoc.Root.Element(ns + "privileges").Add(subapp.Descendants(ns + "privilege"));
+                        }
                     }
                     else if (subapp.Name.LocalName == "account")
                     {
-                        mainDoc.Root.Element(ns + "account").Add(subapp.Descendants(ns + "account-provider"));
+                        if (mainDoc.Root.Element(ns + "account") == null)
+                        {
+                            mainDoc.Root.Add(subapp);
+                        }
+                        else
+                        {
+                            mainDoc.Root.Element(ns + "account").Add(subapp.Descendants(ns + "account-provider"));
+                        }
                     }
                     else if (subapp.Name.LocalName == "feature")
                     {