Merge pull request #421 from domenkogler/develop

ReflectionHelper.CompileMethodInvocation
eventflow · Jan 25, 2018 · 1f44061 · 1f44061
2 parents 5e568ca + f1f5800
commit 1f44061
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,8 @@
 ### New in 0.53 (not released yet)
 
 * New: Allow events to have multiple `EventVersion` attributes
+* Fixed: `ReflectionHelper.CompileMethodInvocation` now recognises
+  `private` methods.
 
 ### New in 0.52.3178 (released 2017-11-02)
 

diff --git a/Source/EventFlow.Tests/UnitTests/Core/ReflectionHelperTests.cs b/Source/EventFlow.Tests/UnitTests/Core/ReflectionHelperTests.cs
@@ -89,12 +89,12 @@ public int Add(int a, int b)
                 return a + b;
             }
 
-            public Number Add(Number a, Number b)
+            private Number Add(Number a, Number b)
             {
                 return new Number {I = Add(a.I, b.I)};
             }
 
-            public Number Add(Number a, int b)
+            private Number Add(Number a, int b)
             {
                 return new Number { I = Add(a.I, b) };
             }

diff --git a/Source/EventFlow/Core/ReflectionHelper.cs b/Source/EventFlow/Core/ReflectionHelper.cs
@@ -51,10 +51,13 @@ public static string GetCodeBase(Assembly assembly, bool includeFileName = false
         public static TResult CompileMethodInvocation<TResult>(Type type, string methodName, params Type[] methodSignature)
         {
             var typeInfo = type.GetTypeInfo();
+            var methods = typeInfo
+                .GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+                .Where(m => m.Name == methodName);
 
             var methodInfo = methodSignature == null || !methodSignature.Any()
-                ? typeInfo.GetMethods(BindingFlags.Instance | BindingFlags.Public).SingleOrDefault(m => m.Name == methodName)
-                : typeInfo.GetMethod(methodName, methodSignature);
+                ? methods.SingleOrDefault()
+                : methods.SingleOrDefault(m => m.GetParameters().Select(mp => mp.ParameterType).SequenceEqual(methodSignature));
 
             if (methodInfo == null)
             {