Support generic methods in the ResourceProxyBuilder

src/Moryx.Resources.Management/Resources/ResourceProxyBuilder.cs

@@ -229,7 +229,33 @@ private static void DefineMethod(TypeBuilder typeBuilder, Type baseType, MethodI
             var argumentTypes = parameters.Select(p => p.ParameterType).ToArray();
 
             const MethodAttributes methodAttributes = MethodAttributes.Private | MethodAttributes.Final | MethodAttributes.Virtual | MethodAttributes.NewSlot;
-            var methodBuilder = typeBuilder.DefineMethod(ExplicitMemberName(method), methodAttributes, method.ReturnType, argumentTypes);
+            MethodBuilder methodBuilder;
+            if (method.IsGenericMethodDefinition)
+            {
+                var genericArguments = method.GetGenericArguments();
+
+                methodBuilder = typeBuilder.DefineMethod(ExplicitMemberName(method), methodAttributes);
+                var genericDefinitions = methodBuilder.DefineGenericParameters(genericArguments.Select(ga => ga.Name).ToArray());
+
+                if (method.ReturnType.IsGenericParameter)
+                {
+                    methodBuilder.SetReturnType(genericDefinitions[method.ReturnType.GenericParameterPosition]);
+                }
+                else if (method.ReturnType.IsGenericType && method.GetGenericArguments()[0].IsGenericParameter)
+                {
+                    var genericReturn = method.ReturnType.GetGenericTypeDefinition();
+                    genericReturn = genericReturn.MakeGenericType(genericDefinitions[method.ReturnType.GetGenericArguments()[0].GenericParameterPosition]);
+                    methodBuilder.SetReturnType(genericReturn);
+                }
+                else
+                {
+                    methodBuilder.SetReturnType(method.ReturnType);
+                }
+            }
+            else
+            {
+                methodBuilder = typeBuilder.DefineMethod(ExplicitMemberName(method), methodAttributes, method.ReturnType, argumentTypes);
+            }
 
             var isResourceReference = IsResourceReference(method.ReturnType);
 
@@ -265,7 +291,7 @@ private static void DefineMethod(TypeBuilder typeBuilder, Type baseType, MethodI
         /// Create a unique name for each explicit member implementation
         /// </summary>
         private static string ExplicitMemberName(MemberInfo member) => $"{member.DeclaringType.Name}_{member.Name}";
-        
+
 
         /// <summary>
         /// Determine if the return type indicates a resource reference

src/Tests/Moryx.Resources.Management.Tests/Mocks/ResourceWithGenericMethod.cs

@@ -0,0 +1,28 @@
+using Moryx.AbstractionLayer.Drivers;
+using Moryx.AbstractionLayer.Drivers.InOut;
+using Moryx.AbstractionLayer.Drivers.Message;
+using Moryx.AbstractionLayer.Resources;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Moryx.Resources.Management.Tests
+{
+    public interface IGenericMethodCall<T> : IResource
+    {
+        /// <summary>
+        /// Get channel using specialized API
+        /// </summary>
+        IList<TChannel> GenericMethod<TChannel>(string identifier);
+    }
+
+    public class ResourceWithGenericMethod : Driver, IGenericMethodCall<object>
+    {
+        public IList<TChannel> GenericMethod<TChannel>(string identifier)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

src/Tests/Moryx.Resources.Management.Tests/TypeControllerTests.cs

@@ -193,6 +193,19 @@ public void AfterDisposeTheProxyIsDetached()
             Assert.Throws<ProxyDetachedException>(() => proxy.MultiplyFoo(2));
         }
 
+        [Test]
+        public void ProxyForGenericMethod()
+        {
+            // Arrange
+            var driver = new ResourceWithGenericMethod { Id = 2, Name = "Some other Resource" };
+
+            // Act
+            var proxy = (IGenericMethodCall<object>)_typeController.GetProxy(driver);
+
+            // Assert
+            Assert.IsNotNull(proxy);
+        }
+
         [Test]
         public void ReplaceWithProxy()
         {