Switch to GetFieldGetterFn() public API

Author: mythz

src/ServiceStack.Text/Common/WriteType.cs

@@ -184,7 +184,7 @@ private static bool Init()
                     propertyOrder,
                     propertySuppressDefaultConfig,
                     propertySuppressDefaultAttribute,
-                    propertyInfo.GetValueGetter<T>(),
+                    propertyInfo.GetPropertyGetterFn(),
                     Serializer.GetWriteFn(propertyType),
                     propertyType.GetDefaultValue(),
                     shouldSerialize,
@@ -241,7 +241,7 @@ private static bool Init()
                     propertyOrder,
                     propertySuppressDefaultConfig,
                     propertySuppressDefaultAttribute,
-                    fieldInfo.GetValueGetter<T>(),
+                    fieldInfo.GetFieldGetterFn(),
                     Serializer.GetWriteFn(propertyType),
                     defaultValue,
                     shouldSerialize,
@@ -276,7 +276,7 @@ internal string PropertyName
             internal readonly string propertyReferenceName;
             internal readonly string propertyNameCLSFriendly;
             internal readonly string propertyNameLowercaseUnderscore;
-            internal readonly Func<T, object> GetterFn;
+            internal readonly GetMemberDelegate GetterFn;
             internal readonly WriteObjectDelegate WriteFn;
             internal readonly object DefaultValue;
             internal readonly Func<T, bool> shouldSerialize;
@@ -285,7 +285,7 @@ internal string PropertyName
 
             public TypePropertyWriter(Type propertyType, string propertyName, string propertyDeclaredTypeName, string propertyNameCLSFriendly,
                 string propertyNameLowercaseUnderscore, int propertyOrder, bool propertySuppressDefaultConfig, bool propertySuppressDefaultAttribute,
-                Func<T, object> getterFn, WriteObjectDelegate writeFn, object defaultValue,
+                GetMemberDelegate getterFn, WriteObjectDelegate writeFn, object defaultValue,
                 Func<T, bool> shouldSerialize,
                 Func<T, string, bool?> shouldSerializeDynamic,
                 bool isEnum)

src/ServiceStack.Text/PlatformExtensions.cs

@@ -316,7 +316,7 @@ public static MethodInfo Method(this Delegate fn)
 
 #if (NETFX_CORE || PCL || NETSTANDARD1_1)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static MethodInfo GetGetMethod(this PropertyInfo pi) => 
+        public static MethodInfo GetGetMethod(this PropertyInfo pi, bool nonPublic=true) => 
             pi.GetMethod;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/ServiceStack.Text/TypeProperties.cs

@@ -20,8 +20,8 @@ public static class TypeReflector<T> { }
     public class TypePropertyInfo
     {
         public TypePropertyInfo(
-            PropertyInfo propertyInfo, 
-            GetMemberDelegate publicGetter, 
+            PropertyInfo propertyInfo,
+            GetMemberDelegate publicGetter,
             SetMemberDelegate publicSetter)
         {
             PropertyInfo = propertyInfo;
@@ -142,7 +142,6 @@ public static SetMemberDelegate GetPropertySetterFn(this PropertyInfo propertyIn
             PclExport.Instance.GetPropertySetterFn(propertyInfo);
 
 #if !SL5
-
         public static GetMemberDelegate GetReflection(PropertyInfo propertyInfo) => propertyInfo.GetValue;
         public static SetMemberDelegate SetReflection(PropertyInfo propertyInfo) => propertyInfo.SetValue;
 
@@ -217,7 +216,8 @@ public static GetMemberDelegate GetEmit(PropertyInfo propertyInfo)
                 gen.Emit(OpCodes.Castclass, propertyInfo.DeclaringType);
             }
 
-            gen.Emit(OpCodes.Callvirt, propertyInfo.GetGetMethod());
+            var mi = propertyInfo.GetGetMethod(true);
+            gen.Emit(OpCodes.Callvirt, mi);
 
             if (propertyInfo.PropertyType.IsValueType())
             {