Imported Upstream version 6.0.0.246

Former-commit-id: 241b0eee0d9f22ae63312d981dd04646ce8514ed
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-05-18 08:35:58 +00:00
parent fdf94592db
commit 65ce5c75f1
75 changed files with 607 additions and 61 deletions

View File

@ -42,7 +42,7 @@ namespace Mono.Net.Security
{
#if MONOTOUCH
is_macosx = true;
#elif MONODROID || ORBIS
#elif (MONODROID || ORBIS) && !MOBILE_DESKTOP_HOST
is_macosx = false;
#else
is_macosx = Environment.OSVersion.Platform != PlatformID.Win32NT && System.IO.File.Exists (OSX509Certificates.SecurityLibrary);
@ -133,7 +133,7 @@ namespace Mono.Net.Security
var leaf = certs [0];
bool result;
#if MONODROID
#if MONODROID && !MOBILE_DESKTOP_HOST
try {
result = AndroidPlatform.TrustEvaluateSsl (certs);
if (result) {

View File

@ -37,7 +37,7 @@ using System.Threading;
namespace System.Diagnostics {
#if !MOBILE
#if !MOBILE || MOBILE_DESKTOP_HOST
internal class TraceImplSettings {
public const string Key = ".__TraceInfoSettingsKey__.";

View File

@ -1,4 +1,4 @@
#if !MOBILE
#if !MOBILE || MOBILE_DESKTOP_HOST
using System.Diagnostics;
using System.IO;

View File

@ -0,0 +1,9 @@
System.IO/DefaultWatcher.cs
System.IO/FAMWatcher.cs
System.IO/NullFileWatcher.cs
System.IO/FileAction.cs
System.IO/FileSystemWatcher.cs
System.IO/IFileWatcher.cs
System.IO/KeventWatcher.cs
System.IO/SearchPattern.cs
System.IO/CoreFXFileSystemWatcherProxy.cs

View File

@ -1,5 +1,6 @@
#include common.sources
#include common_networking.sources
#include mono_fsw.sources
Microsoft.CSharp/CSharpCodeGenerator.cs
Microsoft.VisualBasic/VBCodeGenerator.cs
@ -133,17 +134,6 @@ System.Diagnostics/PerformanceCounterType.cs
System.Diagnostics/TraceSourceInfo.cs
System.Diagnostics/Win32EventLog.cs
System.IO/DefaultWatcher.cs
System.IO/FAMWatcher.cs
System.IO/NullFileWatcher.cs
System.IO/FileAction.cs
System.IO/FileSystemWatcher.cs
System.IO/IFileWatcher.cs
System.IO/KeventWatcher.cs
System.IO/SearchPattern.cs
System.IO/CoreFXFileSystemWatcherProxy.cs
System.IO.Ports/Handshake.cs
System.IO.Ports/ISerialStream.cs
System.IO.Ports/Parity.cs

View File

@ -0,0 +1,5 @@
#include unix_networkinfo.sources
#include linux_networkinfo.sources
#include macos_networkinfo.sources
../../../external/corefx/src/Common/src/System/Net/Security/CertificateHelper.Unix.cs

View File

@ -0,0 +1,25 @@
#include common.sources
#include common_networking.sources
#include corefx.windows.sources
#include mono_fsw.sources
System.Net.NetworkInformation/Win32UnixFactoryPal.cs
../../../external/corefx/src/Common/src/Interop/Windows/Interop.Libraries.cs
../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateFile.cs
../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.FileOperations.cs
../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.SECURITY_ATTRIBUTES.cs
../../../external/corefx/src/Common/src/Interop/Windows/Interop.BOOL.cs
../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CloseHandle.cs
../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.ReadDirectoryChangesW.cs
../../../external/corefx/src/Common/src/System/IO/PathInternal.Windows.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.Win32.cs
../../../external/corefx/src/Common/src/System/Net/ContextAwareResult.Windows.cs
../../../external/corefx/src/Common/src/Interop/Windows/Crypt32/Interop.FindOidInfo.cs
../../../external/corefx/src/System.Security.Cryptography.Encoding/src/Internal/Cryptography/OidLookup.Windows.cs
../../../external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCompiler.cs
../../../external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CompiledRegexRunner.cs
../../../external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CompiledRegexRunnerFactory.cs
../../../external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexLWCGCompiler.cs

View File

@ -0,0 +1,81 @@
#include testing_aot_full_System_test.dll.exclude.sources
Microsoft.Win32/IntranetZoneCredentialPolicyCas.cs
Microsoft.Win32/IntranetZoneCredentialPolicyTest.cs
Microsoft.Win32/PowerModeChangedEventArgsCas.cs
Microsoft.Win32/SessionEndedEventArgsCas.cs
Microsoft.Win32/SessionEndingEventArgsCas.cs
Microsoft.Win32/SessionSwitchEventArgsCas.cs
Microsoft.Win32/SessionSwitchEventArgsTest.cs
Microsoft.Win32/SystemEventsCas.cs
Microsoft.Win32/TimerElapsedEventArgsCas.cs
Microsoft.Win32/UserPreferenceChangedEventArgsCas.cs
Microsoft.Win32/UserPreferenceChangingEventArgsCas.cs
System.Collections.Specialized/BitVector32Cas.cs
System.Collections.Specialized/CollectionsUtilCas.cs
System.Collections.Specialized/HybridDictionaryCas.cs
System.Collections.Specialized/ListDictionaryCas.cs
System.Collections.Specialized/NameObjectCollectionBaseCas.cs
System.Collections.Specialized/NameValueCollectionCas.cs
System.Collections.Specialized/OrderedDictionaryCas.cs
System.Collections.Specialized/StringCollectionCas.cs
System.Collections.Specialized/StringDictionaryCas.cs
System.ComponentModel.Design.Serialization/InstanceDescriptorCas.cs
System/FileStyleUriParserCas.cs
System/FtpStyleUriParserCas.cs
System/GenericUriParserCas.cs
System/GopherStyleUriParserCas.cs
System/HttpStyleUriParserCas.cs
System.IO.Compression/DeflateStreamCas.cs
System.IO.Compression/GZipStreamCas.cs
System/LdapStyleUriParserCas.cs
System.Net/DnsCas.cs
System.Net/FileWebRequestCas.cs
System.Net/HttpListener2Test.cs
System.Net/HttpListenerRequestTest.cs
System.Net/HttpWebRequestCas.cs
System/NetPipeStyleUriParserCas.cs
System.Net.Sockets/NetworkStreamCas.cs
System.Net.Sockets/SocketCas.cs
System.Net.Sockets/TcpClientCas.cs
System/NetTcpStyleUriParserCas.cs
System/NewsStyleUriParserCas.cs
System.Security.Cryptography.X509Certificates/PublicKeyCas.cs
System.Security.Cryptography.X509Certificates/X500DistinguishedNameCas.cs
System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtensionCas.cs
System.Security.Cryptography.X509Certificates/X509CertificateCollectionCas.cs
System.Security.Cryptography.X509Certificates/X509ChainCas.cs
System.Security.Cryptography.X509Certificates/X509ChainPolicyCas.cs
System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtensionCas.cs
System.Security.Cryptography.X509Certificates/X509ExtensionCas.cs
System.Security.Cryptography.X509Certificates/X509KeyUsageExtensionCas.cs
System.Security.Cryptography.X509Certificates/X509StoreCas.cs
System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtensionCas.cs
System.Security.Permissions/ResourcePermissionBaseCas.cs
System.Security.Permissions/ResourcePermissionBaseEntryCas.cs
System.Security.Permissions/ResourcePermissionBaseEntryTest.cs
System.Security.Permissions/ResourcePermissionBaseTest.cs
System.Security.Permissions/StorePermissionAttributeCas.cs
System.Security.Permissions/StorePermissionAttributeTest.cs
System.Security.Permissions/StorePermissionCas.cs
System.Security.Permissions/StorePermissionTest.cs
System.Text.RegularExpressions/CaptureCas.cs
System.Text.RegularExpressions/CaptureCollectionCas.cs
System.Text.RegularExpressions/GroupCas.cs
System.Text.RegularExpressions/GroupCollectionCas.cs
System.Text.RegularExpressions/MatchCas.cs
System.Text.RegularExpressions/MatchCollectionCas.cs
System.Text.RegularExpressions/RegexCas.cs
System.Text.RegularExpressions/RegexCompilationInfoCas.cs
System.Text.RegularExpressions/RegexRunnerCas.cs
System.Text.RegularExpressions/RegexRunnerFactoryCas.cs
System.Threading/SemaphoreCas.cs
System.Threading/SemaphoreFullExceptionCas.cs
System.Threading/ThreadExceptionEventArgsCas.cs
System.Timers/ElapsedEventArgsCas.cs
System.Timers/TimerCas.cs
System.Timers/TimersDescriptionAttributeCas.cs
System/UriBuilderCas.cs
System/UriCas.cs
System/UriFormatExceptionCas.cs
System/UriParserCas.cs
System/UriTypeConverterCas.cs

View File

@ -0,0 +1,20 @@
../../../external/corefx/src/System.CodeDom/tests/CodeCollections/*.cs
../../../external/corefx/src/System.CodeDom/tests/CodeExpressions/*.cs
../../../external/corefx/src/System.CodeDom/tests/CodeObjects/*.cs
../../../external/corefx/src/System.CodeDom/tests/CodeStatements/*.cs
../../../external/corefx/src/System.CodeDom/tests/CodeTypeMembers/*.cs
../../../external/corefx/src/System.CodeDom/tests/Compiler/*.cs
../../../external/corefx/src/System.CodeDom/tests/Other/*.cs
../../../external/corefx/src/System.CodeDom/tests/Microsoft/CSharp/*.cs
../../../external/corefx/src/System.CodeDom/tests/Microsoft/VisualBasic/*.cs
../../../external/corefx/src/System.CodeDom/tests/*.cs
../../../external/corefx/src/System.Net.Security/tests/UnitTests/Fakes/*.cs
../../../external/corefx/src/System.Text.RegularExpressions/tests/*.cs
System/RemoteExecutorTests.cs
# FileSystemWatcher_Path fails with "System.ArgumentException : The directory name is invalid"
../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.unit.cs