[Xaml] Fix issue that can't load theme in Tizen.NUI (#2966)
authorAdunFang <30402408+AdunFang@users.noreply.github.com>
Wed, 28 Apr 2021 09:12:21 +0000 (17:12 +0800)
committerGitHub <noreply@github.com>
Wed, 28 Apr 2021 09:12:21 +0000 (18:12 +0900)
* [Xaml] Fix issue that can't load theme in Tizen.NUI

* [Xaml] Fix build warning

src/Tizen.NUI/src/internal/Xaml/XamlParser.cs

index 01c92a2..f2b8e91 100755 (executable)
@@ -327,25 +327,30 @@ namespace Tizen.NUI.Xaml
             //         //typeof(XamlLoader).GetTypeInfo().Assembly,
             // };
             // s_assemblies = new Assembly[]{typeof(View).GetTypeInfo().Assembly};
-            //s_assemblies.Add(typeof(View).GetTypeInfo().Assembly);
-            var assemblies = currentAssembly?.GetReferencedAssemblies();
-
-            if (null == assemblies || 0 == assemblies.Length)
+            if (null == currentAssembly)
             {
                 s_assemblies.Add(typeof(View).GetTypeInfo().Assembly);
             }
             else
             {
-                foreach (var assembly in assemblies)
+                s_assemblies.Add(currentAssembly);
+
+                var assemblies = currentAssembly?.GetReferencedAssemblies();
+
+                if (null != assemblies)
                 {
-                    try
-                    {
-                        s_assemblies.Add(Assembly.Load(assembly));
-                    }
-                    catch (Exception e)
+                    foreach (var assembly in assemblies)
                     {
-                        Tizen.Log.Fatal("NUI", "Load referenced assemblies e.Message: " + e.Message);
-                        Console.WriteLine("\n[FATAL] Load referenced assemblies e.Message: {0}\n", e.Message);
+                        try
+                        {
+                            s_assemblies.Add(Assembly.Load(assembly));
+                        }
+                        catch (Exception e)
+                        {
+                            Tizen.Log.Fatal("NUI", "Load referenced assemblies e.Message: " + e.Message);
+                            Console.WriteLine("\n[FATAL] Load referenced assemblies e.Message: {0}\n", e.Message);
+                            throw new XamlParseException(e.Message);
+                        }
                     }
                 }
             }