all Android tests green

Telerik.JustMock.Tests/MiscFixture.cs

@@ -390,7 +390,7 @@ namespace Telerik.JustMock.Tests
 		{
 			var container = Mock.Create<FakeContainer<Product>>();
 
-			Mock.Arrange(() => container.Do<Product>()).MustBeCalled();
+ 			Mock.Arrange(() => container.Do<Product>()).MustBeCalled();
 
 			container.Do<Product>();
 		}

Telerik.JustMock.Tests/NonPublicFixture.cs

@@ -411,7 +411,7 @@ namespace Telerik.JustMock.Tests
 			var foo = Mock.Create<WeirdSignature>();
 			var exception = Assert.Throws<MissingMemberException>(() => Mock.NonPublic.Arrange(foo, "Do"));
 			var message = exception.Message;
-			Assert.Equal("Method 'Do' with the given signature was not found on type Telerik.JustMock.Tests.NonPublicFixture+WeirdSignature\r\n" +
+			Assert.Equal(("Method 'Do' with the given signature was not found on type Telerik.JustMock.Tests.NonPublicFixture+WeirdSignature\r\n" +
 "Review the available methods in the message below and optionally paste the appropriate arrangement snippet.\r\n" +
 "----------\r\n" +
 "Method 1: Int32 Do(Int32, System.String, System.Object ByRef, System.Collections.Generic.IEnumerable`1[System.Int32])\r\n" +
@@ -432,12 +432,12 @@ namespace Telerik.JustMock.Tests
 "----------\r\n" +
 "Method 5: Int32 Do(Char)\r\n" +
 "C#: Mock.NonPublic.Arrange<int>(\"Do\", ArgExpr.IsAny<char>());\r\n" +
-"VB: Mock.NonPublic.Arrange(Of Integer)(\"Do\", ArgExpr.IsAny(Of Char)())\r\n", message);
+"VB: Mock.NonPublic.Arrange(Of Integer)(\"Do\", ArgExpr.IsAny(Of Char)())\r\n").Replace("\r\n", Environment.NewLine), message);
 
 			var exception2 = Assert.Throws<MissingMemberException>(() => Mock.NonPublic.Arrange(foo, "Dont"));
 			var message2 = exception2.Message;
-			Assert.Equal("Method 'Dont' with the given signature was not found on type Telerik.JustMock.Tests.NonPublicFixture+WeirdSignature\r\n" +
-				"No methods or properties found with the given name.\r\n", message2);
+			Assert.Equal(("Method 'Dont' with the given signature was not found on type Telerik.JustMock.Tests.NonPublicFixture+WeirdSignature\r\n" +
+				"No methods or properties found with the given name.\r\n").Replace("\r\n", Environment.NewLine), message2);
 		}
 
 		public abstract class NonPublicOverloads

Telerik.JustMock.Tests/RecursiveFixture.cs

@@ -31,13 +31,15 @@ using AssertionException = NUnit.Framework.AssertionException;
 #elif VSTEST_PORTABLE
 using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
 using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException;
-using Telerik.JustMock;
-[assembly: MockedType(typeof(Telerik.JustMock.Tests.RecursiveFixture.ValidateMember))]
 #else
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using AssertionException = Microsoft.VisualStudio.TestTools.UnitTesting.AssertFailedException;
 #endif
 
+#if PORTABLE
+[assembly: Telerik.JustMock.MockedType(typeof(Telerik.JustMock.Tests.RecursiveFixture.ValidateMember))]
+#endif
+
 namespace Telerik.JustMock.Tests
 {
 	[TestClass]

Telerik.JustMock/Core/MockingUtil.cs

@@ -414,7 +414,7 @@ namespace Telerik.JustMock.Core
 					.FirstOrDefault(m => m != null)
 					?? baseMethod;
 
-				if (method.IsGenericMethod)
+				if (method.IsGenericMethod && implementerMethod.IsGenericMethodDefinition)
 					implementerMethod = implementerMethod.MakeGenericMethod(method.GetGenericArguments());
 
 				return implementerMethod;