Skip to content

Use GetExportedTypes where possible and filter nested types #723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filmor merged 8 commits into from
Nov 14, 2018
Merged

Use GetExportedTypes where possible and filter nested types #723

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8a88a18
Use GetExportedTypes where possible and filter nested types
filmor Aug 21, 2018
4357b4f
Merge branch 'master' into implicit-assembly-loading
filmor Aug 24, 2018
b20d126
Merge branch 'master' into implicit-assembly-loading
filmor Oct 16, 2018
bc53fae
Merge branch 'master' into implicit-assembly-loading
filmor Oct 17, 2018
3b30ff6
Merge branch 'master' into implicit-assembly-loading
filmor Oct 29, 2018
2b1d33f
Merge branch 'master' into implicit-assembly-loading
filmor Nov 14, 2018
7631472
Catch exceptions during type loading
filmor Nov 14, 2018
4a3a7a4
Merge branch 'master' into implicit-assembly-loading
filmor Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Catch exceptions during type loading
  • Loading branch information
@filmor
filmor committed Nov 14, 2018
commit 76314725be60ca0e49a39dcbc4405ae7c7281097
26 changes: 23 additions & 3 deletions src/runtime/assemblymanager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading;

Expand Down Expand Up @@ -470,9 +471,28 @@ public static Type LookupType(string qname)
internal static Type[] GetTypes(Assembly a)
Copy link
Copy Markdown
Contributor

@den-run-ai den-run-ai Aug 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need a try-catch block here for transitive depedencies

Copy link
Copy Markdown
Member Author

@filmor filmor Aug 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't it an error, though, if we can't load transitive dependencies?

Copy link
Copy Markdown
Contributor

@den-run-ai den-run-ai Sep 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@filmor i think it is someone else's job to load transitive dependencies, e.g. the direct dependencies should find them on their own:

NuGet/Home#6614

{
if (a.IsDynamic)
return a.GetTypes();
{
try
{
return a.GetTypes();
}
catch (ReflectionTypeLoadException exc)
{
// Return all types that were successfully loaded
return exc.Types.Where(x => x != null).ToArray();
}
}
Copy link
Copy Markdown
Member Author

@filmor filmor Nov 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@denfromufa Is this what you had in mind?

Copy link
Copy Markdown
Contributor

@den-run-ai den-run-ai Nov 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@filmor this is even more than what i asked for :)

else
return a.GetExportedTypes();
{
try
{
return a.GetExportedTypes();
}
catch (FileNotFoundException)
{
return new Type[0];
}
}
}
}
}
}