From 44dfb6fac5650aa2c10cc76832d836a440ad8a2d Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Wed, 30 Nov 2016 22:44:40 -0500
Subject: fix assembly resolution failing for rewritten mods that reference a
 different version of Json.NET (#166)

---
 src/StardewModdingAPI/Framework/ModAssemblyLoader.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/StardewModdingAPI/Framework')

diff --git a/src/StardewModdingAPI/Framework/ModAssemblyLoader.cs b/src/StardewModdingAPI/Framework/ModAssemblyLoader.cs
index e095cde8..6c5e6032 100644
--- a/src/StardewModdingAPI/Framework/ModAssemblyLoader.cs
+++ b/src/StardewModdingAPI/Framework/ModAssemblyLoader.cs
@@ -103,10 +103,9 @@ namespace StardewModdingAPI.Framework
         }
 
         /// <summary>Resolve an assembly from its name.</summary>
-        /// <param name="name">The assembly name.</param>
-        public Assembly ResolveAssembly(string name)
+        /// <param name="shortName">The short assembly name.</param>
+        public Assembly ResolveAssembly(string shortName)
         {
-            string shortName = name.Split(new[] { ',' }, 2).First();
             return this.AssemblyMap.Targets.FirstOrDefault(p => p.GetName().Name == shortName);
         }
 
-- 
cgit