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

Author: xplicit

build/copy.bat

@@ -15,3 +15,5 @@ COPY ..\src\ServiceStack.Text\bin\Signed\ServiceStack.Text.* ..\..\ServiceStack.
 COPY ..\src\ServiceStack.Text.SL5\bin\%BUILD%\ServiceStack.Text.* ..\..\ServiceStack\lib\sl5
 
 COPY ..\src\ServiceStack.Text\bin\Pcl\ServiceStack.Text.dll ..\..\ServiceStack\lib\pcl
+
+COPY ..\src\ServiceStack.Text\bin\Debug\netstandard1.1\*.* ..\..\ServiceStack\lib\netcore

src/ServiceStack.Text/AssemblyUtils.cs

@@ -45,8 +45,7 @@ public static Type FindType(string typeName)
             do
             {
                 snapshot = TypeCache;
-                newCache = new Dictionary<string, Type>(TypeCache);
-                newCache[typeName] = type;
+                newCache = new Dictionary<string, Type>(TypeCache) { [typeName] = type };
 
             } while (!ReferenceEquals(
                 Interlocked.CompareExchange(ref TypeCache, newCache, snapshot), snapshot));

src/ServiceStack.Text/PclExport.Net40.cs

@@ -1022,26 +1022,6 @@ public static StringCollection ToStringCollection(List<string> items)
 
     public static class PclExportExt
     {
-        public static string ToFormUrlEncoded(this NameValueCollection queryParams)
-        {
-            var sb = new System.Text.StringBuilder();
-            foreach (string key in queryParams)
-            {
-                var values = queryParams.GetValues(key);
-                if (values == null) continue;
-
-                foreach (var value in values)
-                {
-                    if (sb.Length > 0)
-                        sb.Append('&');
-
-                    sb.AppendFormat("{0}={1}", key.UrlEncode(), value.UrlEncode());
-                }
-            }
-
-            return sb.ToString();
-        }
-
         //HttpUtils
         public static WebResponse PostFileToUrl(this string url,
             FileInfo uploadFileInfo, string uploadFileMimeType,

src/ServiceStack.Text/Reflection/StaticAccessors.cs

@@ -10,7 +10,9 @@
 // Licensed under the same terms of ServiceStack.
 //
 using System;
+using System.Collections.Generic;
 using System.Reflection;
+using System.Threading;
 using ServiceStack.Text;
 #if !XBOX
 using System.Linq.Expressions;
@@ -20,6 +22,52 @@ namespace ServiceStack.Reflection
     //Also exists in ServiceStack.Common in ServiceStack.Reflection namespace
     public static class StaticAccessors
     {
+        private static Dictionary<string, Func<object, object>> getterFnCache = new Dictionary<string, Func<object, object>>();
+
+        public static Func<object, object> GetFastGetter(this Type type, string propName)
+        {
+            var key = $"{type.Namespace}.{type.Name}::{propName}";
+            Func<object, object> fn;
+            if (getterFnCache.TryGetValue(key, out fn))
+                return fn;
+
+            fn = GetValueGetter(type.GetPropertyInfo(propName));
+
+            Dictionary<string, Func<object, object>> snapshot, newCache;
+            do
+            {
+                snapshot = getterFnCache;
+                newCache = new Dictionary<string, Func<object, object>>(getterFnCache) { [key] = fn };
+
+            } while (!ReferenceEquals(
+                Interlocked.CompareExchange(ref getterFnCache, newCache, snapshot), snapshot));
+
+            return fn;
+        }
+
+        private static Dictionary<string, Action<object, object>> setterFnCache = new Dictionary<string, Action<object, object>>();
+
+        public static Action<object, object> GetFastSetter(this Type type, string propName)
+        {
+            var key = $"{type.Namespace}.{type.Name}::{propName}";
+            Action<object, object> fn;
+            if (setterFnCache.TryGetValue(key, out fn))
+                return fn;
+
+            fn = GetValueSetter(type.GetPropertyInfo(propName));
+
+            Dictionary<string, Action<object, object>> snapshot, newCache;
+            do
+            {
+                snapshot = setterFnCache;
+                newCache = new Dictionary<string, Action<object, object>>(setterFnCache) { [key] = fn };
+
+            } while (!ReferenceEquals(
+                Interlocked.CompareExchange(ref setterFnCache, newCache, snapshot), snapshot));
+
+            return fn;
+        }
+
         public static Func<object, object> GetValueGetter(this PropertyInfo propertyInfo)
         {
             return GetValueGetter(propertyInfo, propertyInfo.DeclaringType);

src/ServiceStack.Text/ReflectionExtensions.cs

@@ -82,10 +82,9 @@ public static Type[] GetGenericArguments(this Type type)
             return type.GetTypeInfo().GenericTypeArguments;
         }
 
-        public static TypeInfo GetTypeInfo(this Type type)
+        internal static TypeInfo GetTypeInfo(this Type type)
         {
-            IReflectableType reflectableType = (IReflectableType)type;
-            return reflectableType.GetTypeInfo();
+            return ((IReflectableType)type).GetTypeInfo();
         }
 #endif
 
@@ -1761,6 +1760,15 @@ public static bool IsGenericType(this Type type)
 #endif
         }
 
+        public static bool ContainsGenericParameters(this Type type)
+        {
+#if (NETFX_CORE || PCL || NETSTANDARD1_1)
+            return type.GetTypeInfo().ContainsGenericParameters;
+#else
+            return type.ContainsGenericParameters;
+#endif
+        }
+
 #if (NETFX_CORE)
         public static object GetDefaultValue(this Type type)
         {