Imported Upstream version 6.12.0.140

Former-commit-id: ed640e59d63de60be89ee9bbe5a6b63afcf639f5
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2021-04-30 08:47:39 +00:00
parent 611f410153
commit 3cbb9c7924
59 changed files with 808 additions and 754 deletions

View File

@ -1 +1 @@
67764cc0ce3a70e2f07aab4f0b3bf2cd541c3c61
ca70e7ad97da895b04486bba2376dfbdcd41ae84

View File

@ -1 +1 @@
49e1188ef7077fd8d7bf98d055752a51007b6f57
dbb4b66ee02f35c72b2d4ad83e58c1c2b5e9499b

File diff suppressed because it is too large Load Diff

View File

@ -10,7 +10,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
## Platform. ##
## --------- ##
hostname = az-ubuntu-general040dd0
hostname = az-ubuntu-generala53ae0
uname -m = x86_64
uname -r = 4.15.0-1113-azure
uname -s = Linux
@ -747,7 +747,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_COMMANDS =
$ ./config.status
on az-ubuntu-general040dd0
on az-ubuntu-generala53ae0
config.status:1238: creating Makefile
config.status:1238: creating bdw-gc.pc

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
4ab588d557b2783f3f3feba4c9218814214feecd
1042c0c8b36892acffeaa1f6363e25729cf037fe

View File

@ -53,16 +53,19 @@ internal static partial class Interop
}
}
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_OpenDir", SetLastError = true)]
internal static extern IntPtr OpenDir(string path);
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetReadDirRBufferSize", SetLastError = false)]
internal static extern int GetReadDirRBufferSize();
#if !MONO
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_OpenDir", SetLastError = true)]
internal static extern IntPtr OpenDir(string path);
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_ReadDirR", SetLastError = false)]
internal static extern unsafe int ReadDirR(IntPtr dir, byte* buffer, int bufferSize, out DirectoryEntry outputEntry);
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_CloseDir", SetLastError = true)]
internal static extern int CloseDir(IntPtr dir);
#endif
}
}
}

View File

@ -455,7 +455,7 @@ int32_t SystemNative_ReadDirR(DIR* dir, uint8_t* buffer, int32_t bufferSize, str
// kernel set errno -> failure
if (errno != 0)
{
assert_err(errno == EBADF, "Invalid directory stream descriptor dir", errno);
assert_err(errno == EBADF || errno == EINTR, "Invalid directory stream descriptor dir", errno);
return errno;
}
return -1;

View File

@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "6.12.0.139";
public const string MonoVersion = "6.12.0.140";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1,5 +1,6 @@
corefx/Unix/Interop.cs
corefx/Unix/Interop.Read.cs
../../../external/corefx/src/Common/src/Interop/Unix/*.cs
../../../external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs

View File

@ -19,3 +19,5 @@ Mono.Btls/MonoBtlsX509LookupAndroid.cs
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Poll.cs
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Open.cs
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Close.cs
../corlib/corefx/Interop.ReadDir.Mono.cs

View File

@ -15,3 +15,5 @@
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Close.cs
../../../external/corefx/src/Common/src/System/Net/ContextAwareResult.Unix.cs
Internal.Cryptography/OidLookup.Managed.cs
../corlib/corefx/Interop.ReadDir.Mono.cs

View File

@ -0,0 +1,45 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Runtime.InteropServices;
internal static partial class Interop
{
internal static partial class Sys
{
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_OpenDir", SetLastError = true)]
internal static extern IntPtr OpenDir_native(string path);
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_ReadDirR", SetLastError = false)]
internal static extern unsafe int ReadDirR_native(IntPtr dir, byte* buffer, int bufferSize, out DirectoryEntry outputEntry);
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_CloseDir", SetLastError = true)]
internal static extern int CloseDir_native(IntPtr dir);
internal static IntPtr OpenDir (string path) {
IntPtr result;
do {
result = OpenDir_native (path);
} while (result == IntPtr.Zero && Marshal.GetLastWin32Error () == (int) Interop.Error.EINTR);
return result;
}
internal static int CloseDir (IntPtr dir) {
int result;
do {
result = CloseDir_native (dir);
} while (result < 0 && Marshal.GetLastWin32Error () == (int) Interop.Error.EINTR);
return result;
}
internal static unsafe int ReadDirR (IntPtr dir, byte* buffer, int bufferSize, out DirectoryEntry outputEntry) {
int result;
do {
result = ReadDirR_native (dir, buffer, bufferSize, out outputEntry);
} while (result == (int) Interop.Error.EINTR);
return result;
}
}
}

View File

@ -27,6 +27,7 @@
../../../external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeDirectoryHandle.Unix.cs
corefx/DriveInfoInternal.Unix.cs
corefx/Interop.ReadDir.Mono.cs
../../../external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetRandomBytes.cs
../../../external/corefx/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.ReadDir.cs

View File

@ -1 +1 @@
7b0585d2376eb881b6fdb12873b7c8e3c15f4aa8
197d0e8ec97a7b31173acfd9776552bf4a3fe65c

View File

@ -1 +1 @@
931a7e1705baff5e63b5587bc6c863db32101e7b
2bb964144027e768d7227bebe2344793acef7f21

View File

@ -1 +1 @@
8790e6bff22f8c9dc38b08e15d07c262c55abd71
8e6e0d99312169743afa184e9dc39bcb7876b2d1

View File

@ -1 +1 @@
2ae3de17435d6b8c3a54ac9245bb84879936b918
4e8a9098bfe67c396b5c70eb052c61e83403d820

View File

@ -1 +1 @@
c9f48ea0b1b90c5515cf037ca74ba50734cca1f7
156f96999d96d3fd08d3a0253334529cfeb0029d

View File

@ -1 +1 @@
7d51a7f678667dee96e294313a97fc0d3caaef32
955009f5debaca49c4733f2e841b0184d9bc168d

Some files were not shown because too many files have changed in this diff Show More