From e0d3d7e85d265c599363d0a64974be9c96bb8dba Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Fri, 11 Dec 2015 12:36:30 -0800
Subject: [PATCH] Catch and display project validation exceptions correctly

---
 .../Impl/ProjectProvider.cs                   | 42 ++++++++++++++++---
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.Dnx.Watcher.Core/Impl/ProjectProvider.cs b/src/Microsoft.Dnx.Watcher.Core/Impl/ProjectProvider.cs
index bb17b77ebe..73005c5d15 100644
--- a/src/Microsoft.Dnx.Watcher.Core/Impl/ProjectProvider.cs
+++ b/src/Microsoft.Dnx.Watcher.Core/Impl/ProjectProvider.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Microsoft.Extensions.CompilationAbstractions;
 
 namespace Microsoft.Dnx.Watcher.Core
@@ -12,19 +13,28 @@ namespace Microsoft.Dnx.Watcher.Core
     {
         public bool TryReadProject(string projectFile, out IProject project, out string errors)
         {
+            errors = null;
+            project = null;
+
             Runtime.Project runtimeProject;
             if (!TryGetProject(projectFile, out runtimeProject, out errors))
             {
-                project = null;
                 return false;
             }
 
-            errors = null;
-            project = new Project(runtimeProject);
+            try
+            {
+                project = new Project(runtimeProject);
+            }
+            catch (Exception ex)
+            {
+                errors = CollectMessages(ex);
+                return false;
+            }
 
             return true;
         }
-        
+
         // Same as TryGetProject but it doesn't throw
         private bool TryGetProject(string projectFile, out Runtime.Project project, out string errorMessage)
         {
@@ -43,11 +53,33 @@ namespace Microsoft.Dnx.Watcher.Core
             }
             catch (Exception ex)
             {
-                errorMessage = ex.Message;
+                errorMessage = CollectMessages(ex);
             }
 
             project = null;
             return false;
         }
+
+        private string CollectMessages(Exception exception)
+        {
+            var builder = new StringBuilder();
+            builder.AppendLine(exception.Message);
+
+            var aggregateException = exception as AggregateException;
+            if (aggregateException != null)
+            {
+                foreach (var message in aggregateException.Flatten().InnerExceptions.Select(CollectMessages))
+                {
+                    builder.AppendLine(message);
+                }
+            }
+
+            while (exception.InnerException != null)
+            {
+                builder.AppendLine(CollectMessages(exception.InnerException));
+                exception = exception.InnerException;
+            }
+            return builder.ToString();
+        }
     }
 }