From 464d6b2275f52b9db5560e242c6073fbd816bcb3 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 19 Aug 2018 23:41:03 -0400
Subject: fix error handling when resolving assemblies (#582)

---
 src/SMAPI/Program.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/SMAPI/Program.cs')

diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs
index 64eeb45a..f5a32b4f 100644
--- a/src/SMAPI/Program.cs
+++ b/src/SMAPI/Program.cs
@@ -370,21 +370,21 @@ namespace StardewModdingAPI
         /// <param name="e">The event arguments.</param>
         private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs e)
         {
-            AssemblyName name = new AssemblyName(e.Name);
-            foreach (FileInfo dll in new DirectoryInfo(Program.DllSearchPath).EnumerateFiles("*.dll"))
+            try
             {
-                try
+                AssemblyName name = new AssemblyName(e.Name);
+                foreach (FileInfo dll in new DirectoryInfo(Program.DllSearchPath).EnumerateFiles("*.dll"))
                 {
                     if (name.Name.Equals(AssemblyName.GetAssemblyName(dll.FullName).Name, StringComparison.InvariantCultureIgnoreCase))
                         return Assembly.LoadFrom(dll.FullName);
                 }
-                catch (Exception ex)
-                {
-                    throw new InvalidOperationException($"Could not load dependency 'smapi-lib/{dll.Name}'. Consider deleting the smapi-lib folder and reinstalling SMAPI.", ex);
-                }
+                return null;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Error resolving assembly: {ex}");
+                return null;
             }
-
-            return null;
         }
 
         /// <summary>Assert that the minimum conditions are present to initialise SMAPI without type load exceptions.</summary>
-- 
cgit