From: Gaurav Khanna <gkhanna@microsoft.com>
Date: Sat, 17 Jun 2017 00:26:11 +0000 (-0700)
Subject: LoadFromResolve event handler should return null incase of any load error (#12329)
X-Git-Tag: accepted/tizen/base/20180629.140029~1083^2~404
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=27e625f0108915fb514e20c870072fbef2d6291c;p=platform%2Fupstream%2Fcoreclr.git

LoadFromResolve event handler should return null incase of any load error (#12329)
---

diff --git a/src/mscorlib/src/System/Reflection/Assembly.CoreCLR.cs b/src/mscorlib/src/System/Reflection/Assembly.CoreCLR.cs
index 68a4aa0..bbbd80b 100644
--- a/src/mscorlib/src/System/Reflection/Assembly.CoreCLR.cs
+++ b/src/mscorlib/src/System/Reflection/Assembly.CoreCLR.cs
@@ -51,7 +51,19 @@ namespace System.Reflection
             string requestedAssemblyPath = Path.Combine(Path.GetDirectoryName(requestorPath), requestedAssemblyName.Name+".dll");
 
             // Load the dependency via LoadFrom so that it goes through the same path of being in the LoadFrom list.
-            return Assembly.LoadFrom(requestedAssemblyPath);
+            Assembly resolvedAssembly = null;
+
+            try
+            {
+                resolvedAssembly = Assembly.LoadFrom(requestedAssemblyPath);
+            }
+            catch(FileNotFoundException)
+            {
+                // Catch FileNotFoundException when attempting to resolve assemblies via this handler to account for missing assemblies.
+                resolvedAssembly = null;
+            }
+
+            return resolvedAssembly;
         }
 
         public static Assembly LoadFrom(String assemblyFile)