Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@ -289,6 +289,11 @@ namespace System.IO {
return fullpath;
}
internal static String GetFullPathInternal(String path)
{
return InsecureGetFullPath (path);
}
#if !MOBILE
// http://msdn.microsoft.com/en-us/library/windows/desktop/aa364963%28v=vs.85%29.aspx
[DllImport("Kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
@ -488,7 +493,7 @@ namespace System.IO {
f = new FileStream (path, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.Read,
8192, false, (FileOptions) 1);
} catch (IOException ex){
if (ex.hresult != MonoIO.FileAlreadyExistsHResult || count ++ > 65536)
if (ex._HResult != MonoIO.FileAlreadyExistsHResult || count ++ > 65536)
throw;
} catch (UnauthorizedAccessException ex) {
if (count ++ > 65536)
@ -871,5 +876,11 @@ namespace System.IO {
throw new ArgumentException (parameterName);
}
}
internal static string DirectorySeparatorCharAsString {
get {
return DirectorySeparatorStr;
}
}
}
}