Fix build: React to CoreCLR behavior change.

aspnet · Mar 23, 2015 · 196e111 · 196e111
1 parent 3a62feb
commit 196e111
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/Microsoft.Framework.ApplicationHost/Program.cs b/src/Microsoft.Framework.ApplicationHost/Program.cs
@@ -205,7 +205,19 @@ private Task<int> ExecuteMain(DefaultHost host, string applicationName, string[]
             {
                 assembly = host.GetEntryPoint(applicationName);
             }
-            catch (FileNotFoundException ex) when (new AssemblyName(ex.FileName).Name == applicationName)
+            catch (FileLoadException ex) when (new AssemblyName(ex.FileName).Name == applicationName)
+            {
+                if (ex.InnerException is ICompilationException)
+                {
+                    throw ex.InnerException;
+                }
+
+                ThrowEntryPointNotfoundException(
+                    host,
+                    applicationName,
+                    ex.InnerException);
+            }
+            catch (FileNotFoundException ex) when (ex.FileName == applicationName)
             {
                 if (ex.InnerException is ICompilationException)
                 {