Remove all old NETFX_CORE / NETSTANDARD1_1

Author: mythz

src/ServiceStack.Text/Common/ParseUtils.cs

@@ -21,11 +21,7 @@ internal static class ParseUtils
 
         public static object NullValueType(Type type)
         {
-#if NETFX_CORE
-            return type.GetTypeInfo().IsValueType ? Activator.CreateInstance(type) : null;
-#else
             return type.GetDefaultValue();
-#endif
         }
 
         public static object ParseObject(string value)

src/ServiceStack.Text/Common/WriteType.cs

@@ -208,11 +208,8 @@ private static bool Init()
                     && JsConfig.HasSerializeFn.Contains(propertyType)
                     && !JsConfig.HasIncludeDefaultValue.Contains(propertyType);
                 bool propertySuppressDefaultAttribute = false;
-#if (NETFX_CORE)
-                var shouldSerialize = (Func<T, bool>)null;
-#else
+
                 var shouldSerialize = GetShouldSerializeMethod(fieldInfo);
-#endif
                 if (isDataContract)
                 {
                     var dcsDataMember = fieldInfo.GetDataMember();

src/ServiceStack.Text/HashSet.cs

@@ -1437,7 +1437,7 @@ public static class HttpHeaders
 
     public static class HttpMethods
     {
-        static readonly string[] allVerbs = new[] {
+        static readonly string[] allVerbs = {
             "OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "CONNECT", // RFC 2616
             "PROPFIND", "PROPPATCH", "MKCOL", "COPY", "MOVE", "LOCK", "UNLOCK",    // RFC 2518
             "VERSION-CONTROL", "REPORT", "CHECKOUT", "CHECKIN", "UNCHECKOUT",
@@ -1452,14 +1452,8 @@ public static class HttpMethods
 
         public static HashSet<string> AllVerbs = new HashSet<string>(allVerbs);
 
-        public static bool HasVerb(string httpVerb)
-        {
-#if NETFX_CORE
-            return allVerbs.Any(p => p.Equals(httpVerb.ToUpper()));
-#else
-            return AllVerbs.Contains(httpVerb.ToUpper());
-#endif
-        }
+        public static bool Exists(string httpMethod) => AllVerbs.Contains(httpMethod.ToUpper());
+        public static bool HasVerb(string httpVerb) => Exists(httpVerb);
 
         public const string Get = "GET";
         public const string Put = "PUT";

src/ServiceStack.Text/HttpUtils.cs

@@ -17,7 +17,7 @@
 using ServiceStack.Text.Support;
 #endif
 
-#if !(SL5 ||  __IOS__ || NETFX_CORE)
+#if !(__IOS__)
 using System.Reflection;
 using System.Reflection.Emit;
 #endif
@@ -193,7 +193,7 @@ internal static string Underscored(IEnumerable<char> pascalCase)
         }
     }
 
-#if !(SL5 ||  __IOS__ || NETFX_CORE)
+#if !(__IOS__)
     public static class DynamicProxy
     {
         public static T GetInstanceFor<T>()

src/ServiceStack.Text/Pcl.Dynamic.cs

@@ -594,7 +594,7 @@ public MacPclExport()
 	}
 #endif
 
-#if NET45 || NETFX_CORE
+#if NET45 || NETSTANDARD2_0
     public class Net45PclExport : Net40PclExport
     {
         public static new Net45PclExport Provider = new Net45PclExport();

src/ServiceStack.Text/PclExport.Net40.cs

@@ -172,26 +172,7 @@ public override string MapAbsolutePath(string relativePath, string appendPartial
                 return Path.GetFullPath(relativePath.Replace("~", hostDirectoryPath));
             }
             return relativePath;
-        }
-        
-#elif NETSTANDARD1_1
-        public string BinPath = null;
-
-        public override string MapAbsolutePath(string relativePath, string appendPartialPathModifier)
-        {
-            if (BinPath == null)
-            {
-                var codeBase = GetAssemblyCodeBase(typeof(PclExport).GetTypeInfo().Assembly);
-                if (codeBase == null)
-                    throw new Exception("NetStandardPclExport.BinPath must be initialized");
-
-                BinPath = Path.GetDirectoryName(codeBase.Replace("file:///", ""));
-            }
-
-            return relativePath.StartsWith("~")
-                ? relativePath.Replace("~", BinPath)
-                : relativePath;
-        }
+        }        
 #endif
         public static PclExport Configure()
         {