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

stephentoub · stephentoub · commit 0268cb85fe9e · 2015-08-13T19:00:09.000-04:00
Merge changes from TFS
diff --git a/src/System.IO.FileSystem/src/System/IO/MultiplexingWin32WinRTFileSystem.cs b/src/System.IO.FileSystem/src/System/IO/MultiplexingWin32WinRTFileSystem.cs
@@ -14,8 +14,8 @@ internal class MultiplexingWin32WinRTFileSystem : FileSystem
 
         internal static IFileSystemObject GetFileSystemObject(FileSystemInfo caller, string fullPath)
         {
-            return ShouldUseWinRT(sourceFullPath, isCreate: false) ?
-                (IFileSystemObject)new WinRTFileSystemObject(fullPath, asDirectory: caller is DirectoryInfo) :
+            return ShouldUseWinRT(fullPath, isCreate: false) ?
+                (IFileSystemObject)new WinRTFileSystem.WinRTFileSystemObject(fullPath, asDirectory: caller is DirectoryInfo) :
                 (IFileSystemObject)caller;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ internal class MultiplexingWin32WinRTFileSystem : FileSystem`
`14`	`14`
`15`	`15`	`internal static IFileSystemObject GetFileSystemObject(FileSystemInfo caller, string fullPath)`
`16`	`16`	`{`
`17`		`- return ShouldUseWinRT(sourceFullPath, isCreate: false) ?`
`18`		`- (IFileSystemObject)new WinRTFileSystemObject(fullPath, asDirectory: caller is DirectoryInfo) :`
	`17`	`+ return ShouldUseWinRT(fullPath, isCreate: false) ?`
	`18`	`+ (IFileSystemObject)new WinRTFileSystem.WinRTFileSystemObject(fullPath, asDirectory: caller is DirectoryInfo) :`
`19`	`19`	`(IFileSystemObject)caller;`
`20`	`20`	`}`
`21`	`21`