Normalize MapProjectPath / MapHostAbsolutePath so they return project paths in different apps

Author: mythz

src/ServiceStack.Text/PathUtils.cs

@@ -18,42 +18,45 @@ public static string MapAbsolutePath(this string relativePath, string appendPart
         }
 
         /// <summary>
-        /// Maps the path of a file in the context of a VS project
+        /// Maps the path of a file in the context of a VS project in a Consle App
         /// </summary>
         /// <param name="relativePath">the relative path</param>
         /// <returns>the absolute path</returns>
         /// <remarks>Assumes static content is two directories above the /bin/ directory,
         /// eg. in a unit test scenario  the assembly would be in /bin/Debug/.</remarks>
         public static string MapProjectPath(this string relativePath)
         {
-            var mapPath = MapAbsolutePath(relativePath, string.Format("{0}..{0}..", PclExport.Instance.DirSep));
-            return mapPath;
+            var sep = PclExport.Instance.DirSep;
+#if !NETSTANDARD1_1
+            return PclExport.Instance.MapAbsolutePath(relativePath, $"{sep}..{sep}..");
+#else
+            return PclExport.Instance.MapAbsolutePath(relativePath, $"{sep}..{sep}..{sep}..");
+#endif
         }
 
         /// <summary>
-        /// Maps the path of a file in a self-hosted scenario
+        /// Maps the path of a file in the bin\ folder of a self-hosted scenario
         /// </summary>
         /// <param name="relativePath">the relative path</param>
         /// <returns>the absolute path</returns>
         /// <remarks>Assumes static content is copied to /bin/ folder with the assemblies</remarks>
         public static string MapAbsolutePath(this string relativePath)
         {
-            var mapPath = MapAbsolutePath(relativePath, null);
-            return mapPath;
+            return PclExport.Instance.MapAbsolutePath(relativePath, null);
         }
 
         /// <summary>
-        /// Maps the path of a file in an Asp.Net hosted scenario
+        /// Maps the path of a file in an ASP.NET hosted scenario
         /// </summary>
         /// <param name="relativePath">the relative path</param>
         /// <returns>the absolute path</returns>
         /// <remarks>Assumes static content is in the parent folder of the /bin/ directory</remarks>
         public static string MapHostAbsolutePath(this string relativePath)
         {
+            var sep = PclExport.Instance.DirSep;
 #if !NETSTANDARD1_1
-            return PclExport.Instance.MapAbsolutePath(relativePath, $"{PclExport.Instance.DirSep}..");
+            return PclExport.Instance.MapAbsolutePath(relativePath, $"{sep}..");
 #else
-            var sep = PclExport.Instance.DirSep;
             return PclExport.Instance.MapAbsolutePath(relativePath, $"{sep}..{sep}..{sep}..");
 #endif
         }