Skip to content
Merged
Changes from all commits
Commits
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
11 changes: 4 additions & 7 deletions src/StreamJsonRpc/Reflection/RpcTargetInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ void ActOnInterfaces([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.
}
}

void ActOn([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TypeInfo t)
void ActOn([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] TypeInfo t)
{
// As we enumerate methods, skip accessor methods
foreach (MethodInfo method in t.DeclaredMethods.Where(m => !m.IsSpecialName))
Expand Down Expand Up @@ -501,14 +501,11 @@ private static IReadOnlyList<EventInfo> GetEventInfos([DynamicallyAccessedMember
{
List<EventInfo> eventInfos = new List<EventInfo>();

for (TypeInfo? t = exposedMembersOnType.GetTypeInfo(); t is not null && t != typeof(object).GetTypeInfo(); t = t.BaseType?.GetTypeInfo())
foreach (EventInfo evt in exposedMembersOnType.GetEvents(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
{
foreach (EventInfo evt in t.DeclaredEvents)
if (evt.AddMethod is object && evt.AddMethod.IsPublic && !evt.AddMethod.IsStatic)
{
if (evt.AddMethod is object && evt.AddMethod.IsPublic && !evt.AddMethod.IsStatic)
{
eventInfos.Add(evt);
}
eventInfos.Add(evt);
}
}

Expand Down