Merge pull request #2466 from dotnet-bot/from-tfs

stephentoub · stephentoub · commit 5bdeb5be4279 · 2015-07-23T23:22:47.000-04:00
Merge changes from TFS
diff --git a/src/System.IO.FileSystem/src/System/IO/WinRTFileSystem.cs b/src/System.IO.FileSystem/src/System/IO/WinRTFileSystem.cs
@@ -477,7 +477,7 @@ public override FileStreamBase Open(string fullPath, FileMode mode, FileAccess a
         private async Task<FileStreamBase> OpenAsync(string fullPath, FileMode mode, FileAccess access, FileShare share, int bufferSize, FileOptions options, FileStream parent)
         {
             // When trying to open the root directory, we need to throw an Access Denied
-            if (PathHelpers.GetRootLength(fullPath) == fullPath.Length)
+            if (PathInternal.GetRootLength(fullPath) == fullPath.Length)
                 throw Win32Marshal.GetExceptionForWin32Error(Interop.mincore.Errors.ERROR_ACCESS_DENIED, fullPath);
 
             // Win32 CreateFile returns ERROR_PATH_NOT_FOUND when given a path that ends with '\'

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ public override FileStreamBase Open(string fullPath, FileMode mode, FileAccess a`
`477`	`477`	`private async Task<FileStreamBase> OpenAsync(string fullPath, FileMode mode, FileAccess access, FileShare share, int bufferSize, FileOptions options, FileStream parent)`
`478`	`478`	`{`
`479`	`479`	`// When trying to open the root directory, we need to throw an Access Denied`
`480`		`- if (PathHelpers.GetRootLength(fullPath) == fullPath.Length)`
	`480`	`+ if (PathInternal.GetRootLength(fullPath) == fullPath.Length)`
`481`	`481`	`throw Win32Marshal.GetExceptionForWin32Error(Interop.mincore.Errors.ERROR_ACCESS_DENIED, fullPath);`
`482`	`482`
`483`	`483`	`// Win32 CreateFile returns ERROR_PATH_NOT_FOUND when given a path that ends with '\'`