bug-fix : load app ni dll file 57/104757/1
authorCho Woong Suk <ws77.cho@samsung.com>
Thu, 8 Dec 2016 13:08:59 +0000 (22:08 +0900)
committerJongHeon Choi <j-h.choi@samsung.com>
Wed, 14 Dec 2016 08:08:50 +0000 (17:08 +0900)
Change-Id: Iaf03cfb5893bf5ace992c48cbc96756dbdf3f814

Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyLoader.cs [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 693877f..cbb0095
@@ -68,7 +68,13 @@ namespace Tizen.Runtime.Coreclr
             {
                 foreach (string dir in DllDirectories)
                 {
-                    FileInfo f = new FileInfo(Path.Combine(dir, $"{assemblyName.Name}.dll"));
+                    FileInfo f = new FileInfo(Path.Combine(dir, $"{assemblyName.Name}.ni.dll"));
+                    if (File.Exists(f.FullName))
+                    {
+                        asm = LoadFromNativeImagePath(f.FullName, null);
+                        break;
+                    }
+                    f = new FileInfo(Path.Combine(dir, $"{assemblyName.Name}.dll"));
                     if (File.Exists(f.FullName))
                     {
                         asm = LoadFromAssemblyPath(f.FullName);