Merge branch 'master' into netcore

# Conflicts:
#	src/ServiceStack.Text/PclExport.NetStandard.cs

Author: mythz

src/ServiceStack.Text/PathUtils.cs

@@ -50,7 +50,7 @@ public static string MapAbsolutePath(this string relativePath)
         /// <remarks>Assumes static content is in the parent folder of the /bin/ directory</remarks>
         public static string MapHostAbsolutePath(this string relativePath)
         {
-            var mapPath = MapAbsolutePath(relativePath, string.Format("{0}..", PclExport.Instance.DirSep));
+            var mapPath = MapAbsolutePath(relativePath, $"{PclExport.Instance.DirSep}..");
             return mapPath;
         }
 

src/ServiceStack.Text/PclExport.Net40.cs

@@ -223,12 +223,12 @@ public override Type FindType(string typeName, string assemblyName)
         {
             var binPath = AssemblyUtils.GetAssemblyBinPath(Assembly.GetExecutingAssembly());
             Assembly assembly = null;
-            var assemblyDllPath = binPath + string.Format("{0}.{1}", assemblyName, "dll");
+            var assemblyDllPath = binPath + $"{assemblyName}.dll";
             if (File.Exists(assemblyDllPath))
             {
                 assembly = AssemblyUtils.LoadAssembly(assemblyDllPath);
             }
-            var assemblyExePath = binPath + string.Format("{0}.{1}", assemblyName, "exe");
+            var assemblyExePath = binPath + $"{assemblyName}.exe";
             if (File.Exists(assemblyExePath))
             {
                 assembly = AssemblyUtils.LoadAssembly(assemblyExePath);

src/ServiceStack.Text/PclExport.NetStandard.cs

@@ -24,30 +24,30 @@ public class NetStandardPclExport : PclExport
 
         static string[] allDateTimeFormats = new string[]
         {
-                    "yyyy-MM-ddTHH:mm:ss.FFFFFFFzzzzzz",
-                    "yyyy-MM-ddTHH:mm:ss.FFFFFFF",
-                    "yyyy-MM-ddTHH:mm:ss.FFFFFFFZ",
-                    "HH:mm:ss.FFFFFFF",
-                    "HH:mm:ss.FFFFFFFZ",
-                    "HH:mm:ss.FFFFFFFzzzzzz",
-                    "yyyy-MM-dd",
-                    "yyyy-MM-ddZ",
-                    "yyyy-MM-ddzzzzzz",
-                    "yyyy-MM",
-                    "yyyy-MMZ",
-                    "yyyy-MMzzzzzz",
-                    "yyyy",
-                    "yyyyZ",
-                    "yyyyzzzzzz",
-                    "--MM-dd",
-                    "--MM-ddZ",
-                    "--MM-ddzzzzzz",
-                    "---dd",
-                    "---ddZ",
-                    "---ddzzzzzz",
-                    "--MM--",
-                    "--MM--Z",
-                    "--MM--zzzzzz",
+            "yyyy-MM-ddTHH:mm:ss.FFFFFFFzzzzzz",
+            "yyyy-MM-ddTHH:mm:ss.FFFFFFF",
+            "yyyy-MM-ddTHH:mm:ss.FFFFFFFZ",
+            "HH:mm:ss.FFFFFFF",
+            "HH:mm:ss.FFFFFFFZ",
+            "HH:mm:ss.FFFFFFFzzzzzz",
+            "yyyy-MM-dd",
+            "yyyy-MM-ddZ",
+            "yyyy-MM-ddzzzzzz",
+            "yyyy-MM",
+            "yyyy-MMZ",
+            "yyyy-MMzzzzzz",
+            "yyyy",
+            "yyyyZ",
+            "yyyyzzzzzz",
+            "--MM-dd",
+            "--MM-ddZ",
+            "--MM-ddzzzzzz",
+            "---dd",
+            "---ddZ",
+            "---ddzzzzzz",
+            "--MM--",
+            "--MM--Z",
+            "--MM--zzzzzz",
         };
 
         public NetStandardPclExport()
@@ -119,6 +119,26 @@ public override string MapAbsolutePath(string relativePath, string appendPartial
             }
             return relativePath;
         }
+#elif NETSTANDARD1_1
+        public string BinPath = null;
+
+        public override string MapAbsolutePath(string relativePath, string appendPartialPathModifier)
+        {
+            if (BinPath == null)
+            {
+                var dll = typeof(PclExport).GetAssembly();
+                var pi = dll.GetType().GetProperty("CodeBase");
+                var codeBase = pi?.GetProperty(dll).ToString();
+                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()
@@ -192,6 +212,7 @@ private static StringCollection ParseStringCollection<TSerializer>(string value)
             return result;
         }
 #endif
+
         public override Type UseType(Type type)
         {
             if (type.IsInterface() || type.IsAbstract())