Merge pull request #20 from Miista/15-cache-resolved-methods

src/Pose/Extensions/DictionaryExtensions.cs

@@ -1,12 +1,14 @@
-using System.Collections.Generic;
-
-namespace Pose.Extensions
+// Putting the extension method under this namespace makes it synonymous
+// with its official counterpart when using the library on platforms
+// which do not have the official version.
+#if !(NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER)
+// ReSharper disable once CheckNamespace
+namespace System.Collections.Generic
 {
     internal static class DictionaryExtensions
     {
         public static bool TryAdd<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key, TValue value)
         {
-#if NETSTANDARD2_0 || NET48
             try
             {
                 dictionary.Add(key, value);
@@ -16,9 +18,7 @@ internal static class DictionaryExtensions
             {
                 return false;
             }
-#else
-            return dictionary.TryAdd(key, value);
-#endif
         }
     }
-}
+}
+#endif

src/Pose/Extensions/ILGeneratorExtensions.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Reflection;
-using System.Reflection.Emit;
-
 namespace Pose.Extensions
 {
+    using System;
+    using System.Reflection;
+    using System.Reflection.Emit;
+
     internal static class ILGeneratorExtensions
     {
         public static byte[] GetILBytes(this ILGenerator ilGenerator)

src/Pose/Helpers/StubHelper.cs

@@ -9,14 +9,15 @@ namespace Pose.Helpers
 {
     internal static class StubHelper
     {
+        private static readonly MethodInfo GetMethodDescriptor =
+            typeof(DynamicMethod).GetMethod("GetMethodDescriptor", BindingFlags.Instance | BindingFlags.NonPublic)
+            ?? throw new Exception($"Cannot get method GetMethodDescriptor from type {nameof(DynamicMethod)}");
+
         public static IntPtr GetMethodPointer(MethodBase method)
         {
             if (method is DynamicMethod dynamicMethod)
             {
-                var methodDescriptor = typeof(DynamicMethod).GetMethod("GetMethodDescriptor", BindingFlags.Instance | BindingFlags.NonPublic)
-                                        ?? throw new Exception($"Cannot get method GetMethodDescriptor from type {nameof(DynamicMethod)}");
-
-                return ((RuntimeMethodHandle)methodDescriptor.Invoke(dynamicMethod, null)).GetFunctionPointer();
+                return ((RuntimeMethodHandle)GetMethodDescriptor.Invoke(dynamicMethod, null)).GetFunctionPointer();
             }
 
             return method.MethodHandle.GetFunctionPointer();

src/Pose/IL/MethodRewriter.cs

@@ -16,11 +16,15 @@ namespace Pose.IL
     internal class MethodRewriter
     {
         private static readonly List<OpCode> IgnoredOpCodes = new List<OpCode> { OpCodes.Endfilter, OpCodes.Endfinally };
-
+
+        private static readonly MethodInfo Unbox =
+            typeof(Unsafe).GetMethod(nameof(Unsafe.Unbox))
+            ?? throw new Exception($"Cannot get method {nameof(Unsafe.Unbox)} from type {nameof(Unsafe)}");
+
         private readonly MethodBase _method;
         private readonly Type _owningType;
         private readonly bool _isInterfaceDispatch;
-
+        
         private int _exceptionBlockLevel;
         private TypeInfo _constrainedType;
 
@@ -247,9 +251,7 @@ private void EmitILForExceptionHandlers(ILGenerator ilGenerator, Instruction ins
 
         private void EmitThisPointerAccessForBoxedValueType(ILGenerator ilGenerator)
         {
-            var unboxMethod = typeof(Unsafe).GetMethod(nameof(Unsafe.Unbox)) ?? throw new Exception($"Cannot get method {nameof(Unsafe.Unbox)} from type {nameof(Unsafe)}");
-
-            ilGenerator.Emit(OpCodes.Call, unboxMethod.MakeGenericMethod(_method.DeclaringType));
+            ilGenerator.Emit(OpCodes.Call, Unbox.MakeGenericMethod(_method.DeclaringType));
         }
 
         private void EmitILForInlineNone(ILGenerator ilGenerator, Instruction instruction)

src/Pose/Pose.csproj

@@ -3,7 +3,7 @@
     <Title>Pose</Title>
     <Description>Replace any .NET method (including static and non-virtual) with a delegate</Description>
     <PackageVersion>1.2.1</PackageVersion>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0;net48;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp2.0;netcoreapp3.0;net48;net7.0;net8.0</TargetFrameworks>
     <DebugType>portable</DebugType>
     <AssemblyName>Pose</AssemblyName>
     <PackageId>Pose</PackageId>

test/Pose.Tests/Extensions/DictionaryExtensionsTests.cs

@@ -1,8 +1,5 @@
 using System.Collections.Generic;
 using FluentAssertions;
-// ReSharper disable once RedundantUsingDirective
-// The using statement is not redundant on platforms targeting net48
-using Pose.Extensions;
 using Xunit;
 
 namespace Pose.Tests

test/Pose.Tests/Pose.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp3.0;net47;net48;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;netcoreapp3.0;netcoreapp3.1;net47;net48;net6.0;net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>