Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -575,7 +575,7 @@ namespace System.IO
public static void WriteAllText (string path, string contents)
{
WriteAllText (path, contents, Encoding.UTF8Unmarked);
WriteAllText (path, contents, EncodingHelper.UTF8Unmarked);
}
public static void WriteAllText (string path, string contents, Encoding encoding)
@@ -616,7 +616,6 @@ namespace System.IO
throw new NotSupportedException (Locale.GetText ("File encryption isn't supported on any file system."));
}
#if NET_4_0
public static IEnumerable<string> ReadLines (string path)
{
return ReadLines (File.OpenText (path));
@@ -689,6 +688,5 @@ namespace System.IO
w.WriteLine (line);
}
}
#endif
}
}