From: Cho Woong Suk <ws77.cho@samsung.com>
Date: Thu, 8 Dec 2016 13:08:59 +0000 (+0900)
Subject: bug-fix : load app ni dll file
X-Git-Tag: accepted/tizen/mobile/20161215.072340~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41189edf30c5be8a7db7930111d268cc31f7345f;p=platform%2Fcore%2Fdotnet%2Flauncher.git

bug-fix : load app ni dll file

Change-Id: Iaf03cfb5893bf5ace992c48cbc96756dbdf3f814
---

diff --git a/Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyLoader.cs b/Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyLoader.cs
old mode 100644
new mode 100755
index 693877f..cbb0095
--- a/Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyLoader.cs
+++ b/Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyLoader.cs
@@ -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);