From 41189edf30c5be8a7db7930111d268cc31f7345f Mon Sep 17 00:00:00 2001 From: Cho Woong Suk Date: Thu, 8 Dec 2016 22:08:59 +0900 Subject: [PATCH] bug-fix : load app ni dll file Change-Id: Iaf03cfb5893bf5ace992c48cbc96756dbdf3f814 --- Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyLoader.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) mode change 100644 => 100755 Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyLoader.cs 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); -- 2.7.4