Permalink
Browse files

Merge pull request #876 from grumpydev/PrivateBinPathFix-873

More private bin path fixes
  • Loading branch information...
thecodejunkie committed Dec 20, 2012
2 parents 31ca17a + ddf1f72 commit 336c40a212fd2769fa5cd284a843bea40e1e9aa4
@@ -160,7 +160,7 @@ private static void LoadReferencesForAssemblyUnderTest(string testAssemblyName)
var assemblyUnderTest = AppDomain.CurrentDomain
.GetAssemblies()
- .SingleOrDefault(x => x.GetName().Name.Equals(testAssemblyNameWithoutExtension, StringComparison.OrdinalIgnoreCase));
+ .FirstOrDefault(x => x.GetName().Name.Equals(testAssemblyNameWithoutExtension, StringComparison.OrdinalIgnoreCase));
if (assemblyUnderTest != null)
{
@@ -211,7 +211,10 @@ private static IEnumerable<string> GetAssemblyDirectories()
foreach (var privateBinPathDirectory in privateBinPathDirectories)
{
- yield return privateBinPathDirectory;
+ if (!string.IsNullOrWhiteSpace(privateBinPathDirectory))
+ {
+ yield return privateBinPathDirectory;
+ }
}
if (AppDomain.CurrentDomain.SetupInformation.PrivateBinPathProbe == null)

0 comments on commit 336c40a

Please sign in to comment.