Fix redist

Signed-off-by: dotnet-bot <[email protected]> Commit migrated from dotnet/coreclr@439ed82
hgdiaz · Jun 8, 2019 · 6632eca · 6632eca
1 parent 5f3ed6e
commit 6632eca
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/libraries/System.Private.CoreLib/src/System/IO/PathInternal.cs b/src/libraries/System.Private.CoreLib/src/System/IO/PathInternal.cs
@@ -15,8 +15,16 @@ internal static partial class PathInternal
         /// </summary>
         internal static bool StartsWithDirectorySeparator(ReadOnlySpan<char> path) => path.Length > 0 && IsDirectorySeparator(path[0]);
 
+#if MS_IO_REDIST
         internal static string EnsureTrailingSeparator(string path)
-            => Path.EndsInDirectorySeparator(path.AsSpan()) ? path : path + DirectorySeparatorCharAsString;        
+            => EndsInDirectorySeparator(path) ? path : path + DirectorySeparatorCharAsString;
+
+        internal static bool EndsInDirectorySeparator(string path)
+            => !string.IsNullOrEmpty(path) && IsDirectorySeparator(path[path.Length - 1]);
+#else
+        internal static string EnsureTrailingSeparator(string path)
+            => Path.EndsInDirectorySeparator(path.AsSpan()) ? path : path + DirectorySeparatorCharAsString;
+#endif
 
         internal static bool IsRoot(ReadOnlySpan<char> path)
             => path.Length == GetRootLength(path);