Don't try to early load DLLs that aren't present on-disk. Closes #91

reactiveui · Oct 31, 2012 · 801fdab · 801fdab
1 parent d958463
commit 801fdab
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/ReactiveUI/RxApp.cs b/ReactiveUI/RxApp.cs
@@ -403,6 +403,13 @@ static IEnumerable<string> attemptToEarlyLoadReactiveUIDLLs()
 
             return guiLibs.SelectMany(x => {
                 var fullName = String.Format("{0}, Version={1}, Culture=neutral, PublicKeyToken=null", x, name.Version.ToString());
+
+                var path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), x);
+                if (!File.Exists(path)) {
+                    LogHost.Default.Debug("Couldn't find {0}", path);
+                    return Enumerable.Empty<string>();
+                }
+
                 try {
                     Assembly.Load(fullName);
                     return new[] {x};