This repository was archived by the owner on Dec 18, 2017. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 224
Also remove stack traces from compilation errors as part of #864 #2853
Closed
Closed
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -229,19 +229,24 @@ private Task<int> ExecuteMain(DefaultHost host, string applicationName, string[] | |
{ | ||
assembly = host.GetEntryPoint(applicationName); | ||
} | ||
catch (FileNotFoundException ex) when (new AssemblyName(ex.FileName).Name == applicationName) | ||
catch (Exception ex) | ||
{ | ||
if (ex.InnerException is ICompilationException) | ||
// Compilation exceptions either throw FileNotFound or FileLoad exceptions and may change | ||
// from version to version. It's safest to catch both types of exceptions | ||
if (ex is FileLoadException || ex is FileNotFoundException) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not check the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We could for compilation exceptions, but historically I've seen us only catching these two types of exceptions. e.g. 196e111. Alternatively, we can catch FileNotFoundExceptions for ICompilationException and EntryPointNotFoundException then catch generic Exception only for ICompilationExceptions. |
||
{ | ||
throw ex.InnerException; | ||
if (ex.InnerException is ICompilationException) | ||
{ | ||
throw SuppressStackTrace(ex.InnerException); | ||
} | ||
|
||
ThrowEntryPointNotfoundException( | ||
host, | ||
applicationName, | ||
ex.InnerException); | ||
} | ||
|
||
ThrowEntryPointNotfoundException( | ||
host, | ||
applicationName, | ||
ex.InnerException); | ||
|
||
return Task.FromResult(-1); | ||
throw; | ||
} | ||
|
||
if (assembly == null) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Before we threw with
ThrowEntryPointNotfoundException
only ifex.FileName == applicationName
now we will throw for any FileLoadException or FileNotFoundException - is it intentional?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I checked with @davidfowl about it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Couldn't you write this as
Wouldn't need the other throw.