Rename internal type System.IO.File in CoreLib to System.IO.InternalFile

The internal type System.IO.File in CoreLib conflicts with the public type in System.IO.FileSystem. This was causing Rosyln tests in ProjectN to fail(Bug300372) as the type is mentioned in rd.xml and the toolchain was confused by the existence of types with same name.

[tfs-changeset: 1661298]

5 files changed, 8 insertions, 8 deletions

diff --git a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj
index d7def1728..f028cf293 100644
--- a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj
+++ b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj
@@ -217,9 +217,9 @@
     <Compile Include="System\InvokeUtils.cs" />
     <Compile Include="System\IO\BinaryReader.cs" />
     <Compile Include="System\IO\BinaryWriter.cs" />
-    <Compile Include="System\IO\File.cs" />
-    <Compile Include="System\IO\File.Windows.cs" Condition="'$(TargetsWindows)'=='true'" />
-    <Compile Include="System\IO\File.Unix.cs" Condition="'$(TargetsUnix)'=='true'" />
+    <Compile Include="System\IO\InternalFile.cs" />
+    <Compile Include="System\IO\InternalFile.Windows.cs" Condition="'$(TargetsWindows)'=='true'" />
+    <Compile Include="System\IO\InternalFile.Unix.cs" Condition="'$(TargetsUnix)'=='true'" />
     <Compile Include="System\IO\FileLoadException.CoreRT.cs" />
     <Compile Include="System\IO\IOException.cs" />
     <Compile Include="System\IO\MemoryStream.cs" />
diff --git a/src/System.Private.CoreLib/src/System/IO/File.Unix.cs b/src/System.Private.CoreLib/src/System/IO/InternalFile.Unix.cs
index 3cf5bf836..a51c69bce 100644
--- a/src/System.Private.CoreLib/src/System/IO/File.Unix.cs
+++ b/src/System.Private.CoreLib/src/System/IO/InternalFile.Unix.cs
@@ -4,7 +4,7 @@
 
 namespace System.IO
 {
-    internal static partial class File
+    internal static partial class InternalFile
     {
         internal static bool InternalExists(String path)
         {
diff --git a/src/System.Private.CoreLib/src/System/IO/File.Windows.cs b/src/System.Private.CoreLib/src/System/IO/InternalFile.Windows.cs
index 4bd8e9426..59dffd7d9 100644
--- a/src/System.Private.CoreLib/src/System/IO/File.Windows.cs
+++ b/src/System.Private.CoreLib/src/System/IO/InternalFile.Windows.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 
 namespace System.IO
 {
-    internal static partial class File
+    internal static partial class InternalFile
     {
         internal static bool InternalExists(String path)
         {
diff --git a/src/System.Private.CoreLib/src/System/IO/File.cs b/src/System.Private.CoreLib/src/System/IO/InternalFile.cs
index 30513c894..726e25419 100644
--- a/src/System.Private.CoreLib/src/System/IO/File.cs
+++ b/src/System.Private.CoreLib/src/System/IO/InternalFile.cs
@@ -7,7 +7,7 @@ using System.Security;
 
 namespace System.IO
 {
-    internal static partial class File
+    internal static partial class InternalFile
     {
         // Tests if a file exists. The result is true if the file
         // given by the specified path exists; otherwise, the result is
diff --git a/src/System.Private.CoreLib/src/System/Resources/FileBasedResourceGroveler.cs b/src/System.Private.CoreLib/src/System/Resources/FileBasedResourceGroveler.cs
index 07353f4b6..bb3e3ae95 100644
--- a/src/System.Private.CoreLib/src/System/Resources/FileBasedResourceGroveler.cs
+++ b/src/System.Private.CoreLib/src/System/Resources/FileBasedResourceGroveler.cs
@@ -90,14 +90,14 @@ namespace System.Resources
             if (_mediator.ModuleDir != null)
             {
                 String path = Path.Combine(_mediator.ModuleDir, fileName);
-                if (File.Exists(path))
+                if (InternalFile.Exists(path))
                 {
                     return path;
                 }
             }
 
             // look in .
-            if (File.Exists(fileName))
+            if (InternalFile.Exists(fileName))
                 return fileName;
                 
             return null;  // give up.