Merge branch 'master' of https://github.com/ServiceStack/ServiceStack.Text into netcore

Author: xplicit

src/ServiceStack.Text/Reflection/StaticAccessors.cs

@@ -27,7 +27,7 @@ public static Func<object, object> GetValueGetter(this PropertyInfo propertyInfo
 
         public static Func<object, object> GetValueGetter(this PropertyInfo propertyInfo, Type type)
         {
-#if NETFX_CORE || NETSTANDARD1_1
+#if NETFX_CORE 
             var getMethodInfo = propertyInfo.GetMethod;
             if (getMethodInfo == null) return null;
             return x => getMethodInfo.Invoke(x, TypeConstants.EmptyObjectArray);
@@ -47,7 +47,7 @@ public static Func<object, object> GetValueGetter(this PropertyInfo propertyInfo
 
         public static Func<T, object> GetValueGetter<T>(this PropertyInfo propertyInfo)
         {
-#if NETFX_CORE || NETSTANDARD1_1
+#if NETFX_CORE
             var getMethodInfo = propertyInfo.GetMethod;
             if (getMethodInfo == null) return null;
             return x => getMethodInfo.Invoke(x, TypeConstants.EmptyObjectArray);
@@ -67,7 +67,7 @@ public static Func<T, object> GetValueGetter<T>(this PropertyInfo propertyInfo)
 
         public static Func<T, object> GetValueGetter<T>(this FieldInfo fieldInfo)
         {
-#if (SL5 && !WP) || __IOS__ || XBOX || NETSTANDARD1_1
+#if (SL5 && !WP) || __IOS__ || XBOX
             return x => fieldInfo.GetValue(x);
 #else
 

src/ServiceStack.Text/ReflectionExtensions.cs

@@ -517,9 +517,9 @@ public static EmptyCtorDelegate GetConstructorMethodToCache(Type type)
             if (emptyCtor != null)
             {
 
-#if __IOS__ || XBOX || NETFX_CORE || NETSTANDARD1_1
+#if __IOS__ || XBOX || NETFX_CORE
 				return () => Activator.CreateInstance(type);
-#elif WP || PCL
+#elif WP || PCL || NETSTANDARD1_1
                 return System.Linq.Expressions.Expression.Lambda<EmptyCtorDelegate>(
                     System.Linq.Expressions.Expression.New(type)).Compile();
 #else

src/ServiceStack.Text/ServiceStack.Text.Signed.project.json

@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}

src/ServiceStack.Text/project.json

@@ -28,7 +28,8 @@
         "System.Net.Requests": "4.0.11",
         "System.Dynamic.Runtime": "4.0.11",
         "Microsoft.CSharp": "4.0.1-*",
-        "System.Reflection.Emit": "4.0.1"
+        "System.Reflection.Emit": "4.0.1",
+        "System.Linq.Expressions": "4.1.0"
       }
     },
     "netstandard1.3": {