1 files changed, 40 insertions, 0 deletions
diff --git a/packaging/0020-Enable-loading-directly-ni-file-for-dotnet-launcher.patch b/packaging/0020-Enable-loading-directly-ni-file-for-dotnet-launcher.patch
new file mode 100644
index 0000000000..fd7a8ec6d9
--- /dev/null
+++ b/packaging/0020-Enable-loading-directly-ni-file-for-dotnet-launcher.patch
@@ -0,0 +1,40 @@
+From 3ead73093ab67643a6f313f2148812c3ad668d7c Mon Sep 17 00:00:00 2001
+From: Yongseop Kim <yons.kim@samsung.com>
+Date: Mon, 4 Sep 2017 15:41:57 +0900
+Subject: [PATCH 20/23] Enable loading directly ni file for dotnet-launcher
+
+---
+ src/vm/appdomain.cpp        | 3 ++-
+ src/vm/coreassemblyspec.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp
+index bd05991..2b1ae1a 100644
+--- a/src/vm/appdomain.cpp
++++ b/src/vm/appdomain.cpp
+@@ -7180,7 +7180,8 @@ EndTry2:;
+                     // Use CoreClr's fusion alternative
+                     CoreBindResult bindResult;
+ 
+-                    pSpec->Bind(this, fThrowOnFileNotFound, &bindResult, FALSE /* fNgenExplicitBind */, FALSE /* fExplicitBindToNativeImage */, pCallerStackMark);
++                    BOOL fExplicitBindToNativeImage = (g_fAllowNativeImages) ? TRUE: FALSE;
++                    pSpec->Bind(this, fThrowOnFileNotFound, &bindResult, FALSE /* fNgenExplicitBind */, fExplicitBindToNativeImage, pCallerStackMark);
+                     hrBindResult = bindResult.GetHRBindResult();
+ 
+                     if (bindResult.Found()) 
+diff --git a/src/vm/coreassemblyspec.cpp b/src/vm/coreassemblyspec.cpp
+index 1d3567e..2c3fba5 100644
+--- a/src/vm/coreassemblyspec.cpp
++++ b/src/vm/coreassemblyspec.cpp
+@@ -163,7 +163,7 @@ VOID  AssemblySpec::Bind(AppDomain      *pAppDomain,
+     else if(m_wszCodeBase==NULL)
+     {
+         // For name based binding these arguments shouldnt have been changed from default
+-        _ASSERTE(!fNgenExplicitBind && !fExplicitBindToNativeImage);
++        //_ASSERTE(!fNgenExplicitBind && !fExplicitBindToNativeImage);
+         SafeComHolder<IAssemblyName> pName;
+         hr = CreateAssemblyNameObject(&pName, assemblyDisplayName, CANOF_PARSE_DISPLAY_NAME, NULL);
+         if (SUCCEEDED(hr))
+-- 
+1.9.1
+