From 2357c4517e514f8ede9af2fb3f6798b57d19e9f3 Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Fri, 8 Jun 2018 09:07:35 -0700
Subject: [PATCH] Fix issue with MSBuildAssemblyResolver

Resolve any assembly that matches full name in the MSBuild directory
---
 src/MSBuildProjectCreator/MSBuildAssemblyResolver.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/MSBuildProjectCreator/MSBuildAssemblyResolver.cs b/src/MSBuildProjectCreator/MSBuildAssemblyResolver.cs
index bacb08a..dd74bff 100644
--- a/src/MSBuildProjectCreator/MSBuildAssemblyResolver.cs
+++ b/src/MSBuildProjectCreator/MSBuildAssemblyResolver.cs
@@ -63,11 +63,6 @@ public static Assembly AssemblyResolve(object sender, ResolveEventArgs args)
         {
             AssemblyName assemblyName = new AssemblyName(args.Name);
 
-            if (!assemblyName.Name.StartsWith("Microsoft.Build") || !MicrosoftPublicKeyToken.SequenceEqual(assemblyName.GetPublicKeyToken()) || String.IsNullOrWhiteSpace(MSBuildDirectoryLazy.Value))
-            {
-                return null;
-            }
-
             FileInfo fileInfo = new FileInfo(Path.Combine(MSBuildDirectoryLazy.Value, $"{assemblyName.Name}.dll"));
 
             if (!fileInfo.Exists)
@@ -75,7 +70,7 @@ public static Assembly AssemblyResolve(object sender, ResolveEventArgs args)
                 return null;
             }
 
-            return Assembly.LoadFrom(fileInfo.FullName);
+            return !assemblyName.FullName.Equals(AssemblyName.GetAssemblyName(fileInfo.FullName).FullName) ? null : Assembly.LoadFrom(fileInfo.FullName);
         }
     }
 }
\ No newline at end of file