Index: Core/Common/src/Core.Common.Assembly/AssemblyResolver.cs
===================================================================
diff -u -r104d2d6389e829e9020ec8458c544c1fc5ae273d -rf47163c2cebf58b247a5f9809c88164ec8536098
--- Core/Common/src/Core.Common.Assembly/AssemblyResolver.cs	(.../AssemblyResolver.cs)	(revision 104d2d6389e829e9020ec8458c544c1fc5ae273d)
+++ Core/Common/src/Core.Common.Assembly/AssemblyResolver.cs	(.../AssemblyResolver.cs)	(revision f47163c2cebf58b247a5f9809c88164ec8536098)
@@ -198,7 +198,9 @@
 
         private static System.Reflection.Assembly LoadFileFromAssemblyLookup(object sender, ResolveEventArgs args)
         {
-            string assemblyName = args.Name.Substring(0, args.Name.IndexOf(','));
+            string assemblyName = args.Name.Contains(",") 
+                                      ? args.Name.Substring(0, args.Name.IndexOf(','))
+                                      : args.Name;
 
             if (assemblyLookup.TryGetValue(assemblyName, out string assemblyFile))
             {