Improved exception details when failing to load plugins. Updated Alba…

….Framework submodule.
Athari · Dec 20, 2013 · 3039e18 · 3039e18
1 parent a677c94
commit 3039e18
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/Alba.Framework b/Alba.Framework
diff --git a/Alba.XnaConvert.Common/Composition/ContentServiceMetadata.cs b/Alba.XnaConvert.Common/Composition/ContentServiceMetadata.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using Alba.Framework.Collections;
-using Alba.Framework.Linq;
+using Alba.Framework.Reflection;
 
 namespace Alba.XnaConvert.Common
 {

diff --git a/Alba.XnaConvert.Common/Loader/SelfServiceProvider.cs b/Alba.XnaConvert.Common/Loader/SelfServiceProvider.cs
@@ -1,5 +1,5 @@
 using System;
-using Alba.Framework.Sys;
+using Alba.Framework.Reflection;
 using Alba.Framework.Text;
 
 namespace Alba.XnaConvert.Common
@@ -8,7 +8,7 @@ public class SelfServiceProvider : IServiceProvider
     {
         public object GetService (Type serviceType)
         {
-            if (GetType().IsAssignableTo(serviceType))
+            if (GetType().Is(serviceType))
                 return this;
             throw new InvalidOperationException("Service '{0}' not implemented.".Fmt(serviceType));
         }

diff --git a/Alba.XnaConvert/Program.cs b/Alba.XnaConvert/Program.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using Alba.Framework.Sys;
 using Alba.Framework.Text;
 using Alba.XnaConvert.CommandLine;
@@ -29,8 +30,19 @@ private static void Main (string[] args)
                 Console.WriteLine(e.Message);
                 Exit(1);
             }
+            catch (ReflectionTypeLoadException e) {
+                Console.WriteLine("Failed to load one of plugins.");
+                Console.WriteLine(e.GetFullMessage());
+                Console.WriteLine("Detailed exception information:");
+                Console.WriteLine(e);
+                foreach (Exception ei in e.LoaderExceptions)
+                    Console.WriteLine(ei);
+                Exit(1);
+            }
             catch (Exception e) {
                 Console.WriteLine("Unexpected error!");
+                Console.WriteLine(e.GetFullMessage());
+                Console.WriteLine("Detailed exception information:");
                 Console.WriteLine(e);
                 Exit(1);
             }