From 65ce5c75f1686d76fdce9381472484af98bb9f53 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Sat, 18 May 2019 08:35:58 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.246 Former-commit-id: 241b0eee0d9f22ae63312d981dd04646ce8514ed --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- .../src/System/IO/FileSystemWatcher.cs | 2 +- mcs/build/common/Consts.cs | 2 +- mcs/build/platforms/win32.make | 2 + ...oid_Mono.Security_test.dll.exclude.sources | 2 + ...odel.Composition_xtest.dll.exclude.sources | 11 ++ ..._monodroid_System.Core.dll.exclude.sources | 3 + .../win32_monodroid_System.Core.dll.sources | 56 +++++++ ...droid_System.Core_test.dll.exclude.sources | 1 + ...tem.IdentityModel_test.dll.exclude.sources | 37 +++++ ...me.Serialization_xtest.dll.exclude.sources | 1 + ...d_System.Security_test.dll.exclude.sources | 1 + ...stem.ServiceModel_test.dll.exclude.sources | 148 ++++++++++++++++++ ...stem.Web.Services_test.dll.exclude.sources | 7 + .../SystemCertificateValidator.cs | 4 +- .../System/System.Diagnostics/TraceImpl.cs | 2 +- mcs/class/System/System/MonoToolsLocator.cs | 2 +- mcs/class/System/mono_fsw.sources | 9 ++ mcs/class/System/net_4_x_System.dll.sources | 12 +- ...win32_monodroid_System.dll.exclude.sources | 5 + .../System/win32_monodroid_System.dll.sources | 25 +++ ..._monodroid_System_test.dll.exclude.sources | 81 ++++++++++ ...monodroid_System_xtest.dll.exclude.sources | 20 +++ mcs/class/corlib/System/Console.cs | 2 +- mcs/class/corlib/System/Environment.cs | 2 +- mcs/class/corlib/System/TimeZoneInfo.cs | 2 +- ...win32_monodroid_corlib.dll.exclude.sources | 28 ++++ .../corlib/win32_monodroid_corlib.dll.sources | 67 ++++++++ ..._monodroid_corlib_test.dll.exclude.sources | 52 ++++++ .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../System/net/System/Net/webproxy.cs | 2 +- .../threading/synchronizationcontext.cs | 2 +- mono/mini/version.h | 2 +- mono/unit-tests/Makefile.in | 4 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 +- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 75 files changed, 607 insertions(+), 61 deletions(-) create mode 100644 mcs/class/Mono.Security/win32_monodroid_Mono.Security_test.dll.exclude.sources create mode 100644 mcs/class/System.ComponentModel.Composition.4.5/win32_monodroid_System.ComponentModel.Composition_xtest.dll.exclude.sources create mode 100644 mcs/class/System.Core/win32_monodroid_System.Core.dll.exclude.sources create mode 100644 mcs/class/System.Core/win32_monodroid_System.Core.dll.sources create mode 100644 mcs/class/System.Core/win32_monodroid_System.Core_test.dll.exclude.sources create mode 100644 mcs/class/System.IdentityModel/win32_monodroid_System.IdentityModel_test.dll.exclude.sources create mode 100644 mcs/class/System.Runtime.Serialization/win32_monodroid_System.Runtime.Serialization_xtest.dll.exclude.sources create mode 100644 mcs/class/System.Security/win32_monodroid_System.Security_test.dll.exclude.sources create mode 100644 mcs/class/System.ServiceModel/win32_monodroid_System.ServiceModel_test.dll.exclude.sources create mode 100644 mcs/class/System.Web.Services/win32_monodroid_System.Web.Services_test.dll.exclude.sources create mode 100644 mcs/class/System/mono_fsw.sources create mode 100644 mcs/class/System/win32_monodroid_System.dll.exclude.sources create mode 100644 mcs/class/System/win32_monodroid_System.dll.sources create mode 100644 mcs/class/System/win32_monodroid_System_test.dll.exclude.sources create mode 100644 mcs/class/System/win32_monodroid_System_xtest.dll.exclude.sources create mode 100644 mcs/class/corlib/win32_monodroid_corlib.dll.exclude.sources create mode 100644 mcs/class/corlib/win32_monodroid_corlib.dll.sources create mode 100644 mcs/class/corlib/win32_monodroid_corlib_test.dll.exclude.sources diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 76ab9f06d3..5f923ed00f 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -c6d0b24661a7f986e5fd47875c18a842f55b3eb7 \ No newline at end of file +954be89b239ca67c9f3002506f83a540d7122f21 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 5a40a8fa19..f835ea4b3b 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -d5f9d733774d3dfee7072eeb1a32c54c2373680c \ No newline at end of file +b444b0ebe9b57aadff0603b01811f53ddbbb2341 \ No newline at end of file diff --git a/external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs b/external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs index 39cb7412ac..930816c553 100644 --- a/external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs +++ b/external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs @@ -12,7 +12,7 @@ using System.IO.Enumeration; using System.Threading; using System.Threading.Tasks; -#if MONO && !MOBILE +#if MONO && (!MOBILE || MOBILE_DESKTOP_HOST) using System; using System.IO; diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 5b3860f9b5..e5bc8187c9 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -41,7 +41,7 @@ static partial class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "6.0.0.243"; + public const string MonoVersion = "6.0.0.246"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; diff --git a/mcs/build/platforms/win32.make b/mcs/build/platforms/win32.make index 25250309e0..6b612ef09b 100644 --- a/mcs/build/platforms/win32.make +++ b/mcs/build/platforms/win32.make @@ -30,3 +30,5 @@ hidden_suffix = .tmp platform-check: @: + +PLATFORM_WIN32=1 diff --git a/mcs/class/Mono.Security/win32_monodroid_Mono.Security_test.dll.exclude.sources b/mcs/class/Mono.Security/win32_monodroid_Mono.Security_test.dll.exclude.sources new file mode 100644 index 0000000000..f5cfc9349d --- /dev/null +++ b/mcs/class/Mono.Security/win32_monodroid_Mono.Security_test.dll.exclude.sources @@ -0,0 +1,2 @@ +#include monodroid_Mono.Security_test.dll.build-failure-exclude.sources + diff --git a/mcs/class/System.ComponentModel.Composition.4.5/win32_monodroid_System.ComponentModel.Composition_xtest.dll.exclude.sources b/mcs/class/System.ComponentModel.Composition.4.5/win32_monodroid_System.ComponentModel.Composition_xtest.dll.exclude.sources new file mode 100644 index 0000000000..2948c43db1 --- /dev/null +++ b/mcs/class/System.ComponentModel.Composition.4.5/win32_monodroid_System.ComponentModel.Composition_xtest.dll.exclude.sources @@ -0,0 +1,11 @@ + +../../../external/corefx/src/System.ComponentModel.Composition/tests/*.cs +../../../external/corefx/src/System.ComponentModel.Composition/tests/System/*.cs +../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/*.cs +../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/*.cs +../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Diagnostics/*.cs +../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Factories/*.cs +../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Primitives/*.cs +../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/*.cs +../../../external/corefx/src/System.ComponentModel.Composition/tests/System/Integration/*.cs +../../../external/corefx/src/System.ComponentModel.Composition/tests/System/UnitTesting/*.cs diff --git a/mcs/class/System.Core/win32_monodroid_System.Core.dll.exclude.sources b/mcs/class/System.Core/win32_monodroid_System.Core.dll.exclude.sources new file mode 100644 index 0000000000..0577e221b3 --- /dev/null +++ b/mcs/class/System.Core/win32_monodroid_System.Core.dll.exclude.sources @@ -0,0 +1,3 @@ +../../../external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.Unix.cs +../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.GetDomainSocketSizes.cs +../../../external/corefx/src/Common/src/Interop/Unix/Interop.Libraries.cs diff --git a/mcs/class/System.Core/win32_monodroid_System.Core.dll.sources b/mcs/class/System.Core/win32_monodroid_System.Core.dll.sources new file mode 100644 index 0000000000..3193ca0642 --- /dev/null +++ b/mcs/class/System.Core/win32_monodroid_System.Core.dll.sources @@ -0,0 +1,56 @@ +#include common_System.Core.dll.sources +#include dynamic_System.Core.dll.sources + +System.Security.Cryptography/AesCryptoServiceProvider.cs +System.Security.Cryptography/AesTransform.cs + +../referencesource/System.Core/System/Security/Cryptography/AesManaged.cs + +System.IO.Pipes/NamedPipeClientStream.Windows.cs +System.IO.Pipes/NamedPipeServerStream.Windows.cs +System.IO.Pipes/AnonymousPipeServerStream.Windows.cs +../../../external/corefx/src/Common/src/Interop/Windows/Interop.Libraries.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CloseHandle.cs +../../../external/corefx/src/Common/src/Interop/Windows/Interop.Errors.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.FormatMessage.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.SecurityOptions.cs +../../../external/corefx/src/Common/src/Interop/Windows/Interop.BOOL.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.SECURITY_ATTRIBUTES.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GenericOperations.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.HandleOptions.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.PipeOptions.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.FileOperations.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.FileTypes.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetCurrentProcess_IntPtr.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.DuplicateHandle_IntPtr.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetFileType_SafeHandle.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreatePipe_SafePipeHandle.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.ConnectNamedPipe.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.WaitNamedPipe.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetNamedPipeHandleState.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetNamedPipeInfo.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateNamedPipeClient.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.SetNamedPipeHandleState.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CancelIoEx.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.FlushFileBuffers.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.ReadFile_SafeHandle_IntPtr.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.ReadFile_SafeHandle_NativeOverlapped.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.WriteFile_SafeHandle_IntPtr.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.WriteFile_SafeHandle_NativeOverlapped.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.DisconnectNamedPipe.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.CreateNamedPipe.cs +../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.MaxLengths.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RevertToSelf.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.ImpersonateNamedPipeClient.cs + +../../../external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.cs +../../../external/corefx/src/System.Net.Sockets/src/System/Net/Sockets/UnixDomainSocketEndPoint.Windows.cs + +../../../external/corefx/src/System.IO.Pipes/src/Microsoft/Win32/SafeHandles/SafePipeHandle.Windows.cs +../../../external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/AnonymousPipeServerStream.Windows.cs +../../../external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/ConnectionCompletionSource.cs +../../../external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeClientStream.Windows.cs +../../../external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.Windows.cs +../../../external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeCompletionSource.cs +../../../external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs +../../../external/corefx/src/System.IO.Pipes/src/System/IO/Pipes/ReadWriteCompletionSource.cs diff --git a/mcs/class/System.Core/win32_monodroid_System.Core_test.dll.exclude.sources b/mcs/class/System.Core/win32_monodroid_System.Core_test.dll.exclude.sources new file mode 100644 index 0000000000..56e35a121e --- /dev/null +++ b/mcs/class/System.Core/win32_monodroid_System.Core_test.dll.exclude.sources @@ -0,0 +1 @@ +#include testing_aot_full_System.Core_test.dll.exclude.sources diff --git a/mcs/class/System.IdentityModel/win32_monodroid_System.IdentityModel_test.dll.exclude.sources b/mcs/class/System.IdentityModel/win32_monodroid_System.IdentityModel_test.dll.exclude.sources new file mode 100644 index 0000000000..2fcb687a3a --- /dev/null +++ b/mcs/class/System.IdentityModel/win32_monodroid_System.IdentityModel_test.dll.exclude.sources @@ -0,0 +1,37 @@ +System.IdentityModel.Claims/ClaimSetTest.cs +System.IdentityModel.Claims/ClaimTest.cs +System.IdentityModel.Claims/ClaimTypesTest.cs +System.IdentityModel.Claims/X509CertificateClaimSetTest.cs +System.IdentityModel.Common/MySecurityTokenSerializer.cs +System.IdentityModel.Policy/AuthorizationContextTest.cs +System.IdentityModel.Selectors/CustomUserNameSecurityTokenAuthenticatorTest.cs +System.IdentityModel.Selectors/RsaSecurityTokenAuthenticatorTest.cs +System.IdentityModel.Selectors/SamlSecurityTokenAuthenticatorTest.cs +System.IdentityModel.Selectors/SecurityTokenRequirementTest.cs +System.IdentityModel.Selectors/SecurityTokenResolverTest.cs +System.IdentityModel.Selectors/TestEvaluationContext.cs +System.IdentityModel.Selectors/X509SecurityTokenAuthenticatorTest.cs +System.IdentityModel.Selectors/X509SecurityTokenProviderTest.cs +System.IdentityModel.Tokens/BootstrapContextTest.cs +System.IdentityModel.Tokens/EncryptedKeyIdentifierClauseTest.cs +System.IdentityModel.Tokens/InMemorySymmetricSecurityKeyTest.cs +System.IdentityModel.Tokens/LocalIdKeyIdentifierClauseTest.cs +System.IdentityModel.Tokens/SamlActionTest.cs +System.IdentityModel.Tokens/SamlAssertionTest.cs +System.IdentityModel.Tokens/SamlAttributeStatementTest.cs +System.IdentityModel.Tokens/SamlAudienceRestrictionConditionTest.cs +System.IdentityModel.Tokens/SamlAuthenticationStatementTest.cs +System.IdentityModel.Tokens/SamlAuthorityBindingTest.cs +System.IdentityModel.Tokens/SamlAuthorizationDecisionStatementTest.cs +System.IdentityModel.Tokens/SamlConditionsTest.cs +System.IdentityModel.Tokens/SamlConstantsTest.cs +System.IdentityModel.Tokens/SamlEvidenceTest.cs +System.IdentityModel.Tokens/SamlSubjectTest.cs +System.IdentityModel.Tokens/SecurityAlgorithmsTest.cs +System.IdentityModel.Tokens/SecurityKeyIdentifierTest.cs +System.IdentityModel.Tokens/SecurityTokenTypesTest.cs +System.IdentityModel.Tokens/UserNameSecurityTokenTest.cs +System.IdentityModel.Tokens/X509AsymmetricSecurityKeyTest.cs +System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClauseTest.cs +System.IdentityModel.Tokens/X509SecurityTokenTest.cs +System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClauseTest.cs diff --git a/mcs/class/System.Runtime.Serialization/win32_monodroid_System.Runtime.Serialization_xtest.dll.exclude.sources b/mcs/class/System.Runtime.Serialization/win32_monodroid_System.Runtime.Serialization_xtest.dll.exclude.sources new file mode 100644 index 0000000000..40e88b0a67 --- /dev/null +++ b/mcs/class/System.Runtime.Serialization/win32_monodroid_System.Runtime.Serialization_xtest.dll.exclude.sources @@ -0,0 +1 @@ +../../../external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.RuntimeOnly.cs diff --git a/mcs/class/System.Security/win32_monodroid_System.Security_test.dll.exclude.sources b/mcs/class/System.Security/win32_monodroid_System.Security_test.dll.exclude.sources new file mode 100644 index 0000000000..e2b06dcf13 --- /dev/null +++ b/mcs/class/System.Security/win32_monodroid_System.Security_test.dll.exclude.sources @@ -0,0 +1 @@ +System.Security.Permissions/DataProtectionPermissionAttributeTest.cs diff --git a/mcs/class/System.ServiceModel/win32_monodroid_System.ServiceModel_test.dll.exclude.sources b/mcs/class/System.ServiceModel/win32_monodroid_System.ServiceModel_test.dll.exclude.sources new file mode 100644 index 0000000000..ffa66d59a1 --- /dev/null +++ b/mcs/class/System.ServiceModel/win32_monodroid_System.ServiceModel_test.dll.exclude.sources @@ -0,0 +1,148 @@ +FeatureBased/Features.Contracts/AsyncCallTester.cs +FeatureBased/Features.Contracts/FaultsTester.cs +FeatureBased/Features.Serialization/AsyncCallTest.cs +FeatureBased/Features.Serialization/AsyncPatternTester.cs +FeatureBased/Features.Serialization/DataContractSerializerTest.cs +FeatureBased/Features.Serialization/DualContractTester.cs +FeatureBased/Features.Serialization/ExitProcessHelper.cs +FeatureBased/Features.Serialization/FaultsTest.cs +FeatureBased/Features.Serialization/KnownTypeTest.cs +FeatureBased/Features.Serialization/MessageContractTest.cs +FeatureBased/Features.Serialization/OperationContractTester.cs +FeatureBased/Features.Serialization/PrimitiveTesterTest.cs +FeatureBased/Features.Serialization/UntypedMessageTest.cs +FeatureBased/TestFixtureBase.cs +MetadataTests/BindingTestAssertions.cs +MetadataTests/ExportTests.cs +MetadataTests/ImportTests.cs +MetadataTests/ImportTests_CreateMetadata.cs +MetadataTests/ImportTests_LoadMetadata.cs +MetadataTests/ImportTests_RoundTrip.cs +MetadataTests/MetadataSamples.cs +MetadataTests/MiscImportTests.cs +MetadataTests/TestContext.cs +System.ServiceModel.Channels/AsymmetricSecurityBindingElementTest.cs +System.ServiceModel.Channels/BinaryMessageEncodingBindingElementTest.cs +System.ServiceModel.Channels/BindingElementTest.cs +System.ServiceModel.Channels/CalcSampleProxy.cs +System.ServiceModel.Channels/CommunicationObjectTest.cs +System.ServiceModel.Channels/ConnectionOrientedTransportBindingElementTest.cs +System.ServiceModel.Channels/CustomBindingTest.cs +System.ServiceModel.Channels/CustomPolicyConversionContext.cs +System.ServiceModel.Channels/HandlerTransportBindingElement.cs +System.ServiceModel.Channels/HttpTransportBindingElementTest.cs +System.ServiceModel.Channels/HttpsTransportBindingElementTest.cs +System.ServiceModel.Channels/InterceptorBindingElement.cs +System.ServiceModel.Channels/LocalClientSecuritySettingsTest.cs +System.ServiceModel.Channels/MessageBufferTest.cs +System.ServiceModel.Channels/MessageEncoderTest.cs +System.ServiceModel.Channels/MsmqBindingElementBaseTest.cs +System.ServiceModel.Channels/MsmqTransportBindingElementTest.cs +System.ServiceModel.Channels/NamedPipeTransportBindingElementTest.cs +System.ServiceModel.Channels/OneWayBindingElementTest.cs +System.ServiceModel.Channels/PeerTransportBindingElementTest.cs +System.ServiceModel.Channels/ReplyChannelBase.cs +System.ServiceModel.Channels/SecurityAssert.cs +System.ServiceModel.Channels/SecurityBindingElementTest.cs +System.ServiceModel.Channels/SslStreamSecurityBindingElementTest.cs +System.ServiceModel.Channels/SymmetricSecurityBindingElementTest.cs +System.ServiceModel.Channels/TcpTransportBindingElementTest.cs +System.ServiceModel.Channels/TextMessageEncodingBindingElementTest.cs +System.ServiceModel.Channels/TransactionFlowBindingElementTest.cs +System.ServiceModel.Configuration/AddressHeaderCollectionElementTest.cs +System.ServiceModel.Configuration/BasicHttpBindingElementTest.cs +System.ServiceModel.Configuration/BehaviorsSectionTest.cs +System.ServiceModel.Configuration/BindingsSectionTest.cs +System.ServiceModel.Configuration/ChannelEndpointElementTest.cs +System.ServiceModel.Configuration/CustomBindingElementTest.cs +System.ServiceModel.Configuration/EndpointBehaviorElementTest.cs +System.ServiceModel.Configuration/ExtensionsSectionTest.cs +System.ServiceModel.Configuration/MetadataElementTest.cs +System.ServiceModel.Configuration/MexBindingElementTest.cs +System.ServiceModel.Configuration/NetNamedPipeBindingElementTest.cs +System.ServiceModel.Configuration/NetPeerTcpBindingElementTest.cs +System.ServiceModel.Configuration/NetTcpBindingElementTest.cs +System.ServiceModel.Configuration/ServiceBehaviorElementTest.cs +System.ServiceModel.Configuration/ServiceElementTest.cs +System.ServiceModel.Configuration/ServiceModelConfigurationElementCollectionTest.cs +System.ServiceModel.Configuration/ServiceModelSectionGroupTest.cs +System.ServiceModel.Configuration/StandardBindingCollectionElementTest.cs +System.ServiceModel.Configuration/StandardBindingElementCollectionTest.cs +System.ServiceModel.Configuration/StandardBindingElementTest.cs +System.ServiceModel.Configuration/StandardEndpointsSectionTest.cs +System.ServiceModel.Configuration/UserBinding.cs +System.ServiceModel.Description/ClientCredentialsTest.cs +System.ServiceModel.Description/ContractDescriptionTest.cs +System.ServiceModel.Description/MetadataExchangeBindingsTest.cs +System.ServiceModel.Description/MetadataResolverTest.cs +System.ServiceModel.Description/MetadataSetTest.cs +System.ServiceModel.Description/ServiceAuthorizationBehaviorTest.cs +System.ServiceModel.Description/ServiceContractGeneratorTest.cs +System.ServiceModel.Description/ServiceCredentialsTest.cs +System.ServiceModel.Description/ServiceDebugBehaviorTest.cs +System.ServiceModel.Description/ServiceMetadataBehaviorTest.cs +System.ServiceModel.Description/ServiceMetadataEndpointTest.cs +System.ServiceModel.Description/ServiceThrottlingBehaviorTest.cs +System.ServiceModel.Description/TypedMessageConverterTest.cs +System.ServiceModel.Description/WsdlExporterTest.cs +System.ServiceModel.Description/WsdlImporterTest.cs +System.ServiceModel.Dispatcher/ActionFilterTest.cs +System.ServiceModel.Dispatcher/Bug32886Test.cs +System.ServiceModel.Dispatcher/Bug46971Test.cs +System.ServiceModel.Dispatcher/Bug652331Test.cs +System.ServiceModel.Dispatcher/Bug652331_2Test.cs +System.ServiceModel.Dispatcher/ChannelDispatcherTest.cs +System.ServiceModel.Dispatcher/DispatchOperationTest.cs +System.ServiceModel.Dispatcher/DispatchRuntimeTest.cs +System.ServiceModel.Dispatcher/EndpointAddressMessageFilterTest.cs +System.ServiceModel.Dispatcher/EndpointDispatcherTest.cs +System.ServiceModel.Dispatcher/ExceptionHandlerTest.cs +System.ServiceModel.Dispatcher/FilterTableTest.cs +System.ServiceModel.Dispatcher/InvalidBodyAccessExceptionTest.cs +System.ServiceModel.Dispatcher/PrefixEndpointAddressMessageFilterTest.cs +System.ServiceModel.Dispatcher/XPathMessageContextTest.cs +System.ServiceModel.PeerResolvers/CustomPeerResolverServiceTest.cs +System.ServiceModel.PeerResolvers/PeerResolverSerializationTest.cs +System.ServiceModel.Security.Tokens/IssuedSecurityTokenParametersTest.cs +System.ServiceModel.Security.Tokens/IssuedSecurityTokenProviderTest.cs +System.ServiceModel.Security.Tokens/RsaSecurityTokenParametersTest.cs +System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParametersTest.cs +System.ServiceModel.Security.Tokens/SecurityContextSecurityTokenTest.cs +System.ServiceModel.Security.Tokens/SecurityTokenParametersTest.cs +System.ServiceModel.Security.Tokens/ServiceModelSecurityTokenTypesTest.cs +System.ServiceModel.Security.Tokens/UserNameSecurityTokenParametersTest.cs +System.ServiceModel.Security.Tokens/WrappedKeySecurityTokenTest.cs +System.ServiceModel.Security.Tokens/X509ListedCertificateValidator.cs +System.ServiceModel.Security.Tokens/X509SecurityTokenParametersTest.cs +System.ServiceModel.Security/ChannelProtectionRequirementsTest.cs +System.ServiceModel.Security/SecurityAlgorithmSuiteTest.cs +System.ServiceModel.Security/SecurityMessagePropertyTest.cs +System.ServiceModel.Security/SecurityTokenSpeficicationTest.cs +System.ServiceModel.Security/ServiceCredentialsSecurityTokenManagerTest.cs +System.ServiceModel.Security/ServiceSecurityContextTest.cs +System.ServiceModel.Security/SupportingTokenParametersTest.cs +System.ServiceModel.Security/TransportSecurityBindingElementTest.cs +System.ServiceModel.Security/WSSecurityTokenSerializerTest.cs +System.ServiceModel/BasicHttpBindingTest.cs +System.ServiceModel/CallbackBehaviorAttributeTest.cs +System.ServiceModel/ChannelFactoryTest.cs +System.ServiceModel/ChannelFactory_1Test.cs +System.ServiceModel/ClientBaseTest.cs +System.ServiceModel/ClientCredentialsSecurityTokenManagerTest.cs +System.ServiceModel/EndpointAddress10Test.cs +System.ServiceModel/EndpointAddressBuilderTest.cs +System.ServiceModel/EndpointAddressTest.cs +System.ServiceModel/EndpointIdentityTest.cs +System.ServiceModel/IntegratedConnectionTest.cs +System.ServiceModel/MessageSecurityVersionTest.cs +System.ServiceModel/MsmqTransportSecurityTest.cs +System.ServiceModel/NetMsmqBindingTest.cs +System.ServiceModel/NetPeerTcpBindingTest.cs +System.ServiceModel/NetTcpBindingTest.cs +System.ServiceModel/OperationContextTest.cs +System.ServiceModel/PeerNodeAddressTest.cs +System.ServiceModel/ServiceHostBaseTest.cs +System.ServiceModel/ServiceHostTest.cs +System.ServiceModel/TransactionProtocolTest.cs +System.ServiceModel/WSFederationHttpBindingTest.cs +System.ServiceModel/WSHttpBindingTest.cs diff --git a/mcs/class/System.Web.Services/win32_monodroid_System.Web.Services_test.dll.exclude.sources b/mcs/class/System.Web.Services/win32_monodroid_System.Web.Services_test.dll.exclude.sources new file mode 100644 index 0000000000..54e315b498 --- /dev/null +++ b/mcs/class/System.Web.Services/win32_monodroid_System.Web.Services_test.dll.exclude.sources @@ -0,0 +1,7 @@ +System.Web.Services.Configuration/DiagnosticsElementTest.cs +System.Web.Services.Configuration/ProtocolElementTest.cs +System.Web.Services.Configuration/SoapEnvelopeProcessingElementTest.cs +System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs +System.Web.Services.Configuration/TypeElementTest.cs +System.Web.Services.Configuration/WsdlHelpGeneratorElementTest.cs +System.Web.Services.Configuration/WsiProfilesElementTest.cs diff --git a/mcs/class/System/Mono.Net.Security/SystemCertificateValidator.cs b/mcs/class/System/Mono.Net.Security/SystemCertificateValidator.cs index 00c77a9f04..72eaa24524 100644 --- a/mcs/class/System/Mono.Net.Security/SystemCertificateValidator.cs +++ b/mcs/class/System/Mono.Net.Security/SystemCertificateValidator.cs @@ -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) { diff --git a/mcs/class/System/System.Diagnostics/TraceImpl.cs b/mcs/class/System/System.Diagnostics/TraceImpl.cs index f719c37d95..e6195ae6fc 100644 --- a/mcs/class/System/System.Diagnostics/TraceImpl.cs +++ b/mcs/class/System/System.Diagnostics/TraceImpl.cs @@ -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__."; diff --git a/mcs/class/System/System/MonoToolsLocator.cs b/mcs/class/System/System/MonoToolsLocator.cs index 7c1e9ab791..b5b75fcd82 100755 --- a/mcs/class/System/System/MonoToolsLocator.cs +++ b/mcs/class/System/System/MonoToolsLocator.cs @@ -1,4 +1,4 @@ -#if !MOBILE +#if !MOBILE || MOBILE_DESKTOP_HOST using System.Diagnostics; using System.IO; diff --git a/mcs/class/System/mono_fsw.sources b/mcs/class/System/mono_fsw.sources new file mode 100644 index 0000000000..4151fd2097 --- /dev/null +++ b/mcs/class/System/mono_fsw.sources @@ -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 diff --git a/mcs/class/System/net_4_x_System.dll.sources b/mcs/class/System/net_4_x_System.dll.sources index 0a0a9c493d..f2ee5601ee 100644 --- a/mcs/class/System/net_4_x_System.dll.sources +++ b/mcs/class/System/net_4_x_System.dll.sources @@ -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 diff --git a/mcs/class/System/win32_monodroid_System.dll.exclude.sources b/mcs/class/System/win32_monodroid_System.dll.exclude.sources new file mode 100644 index 0000000000..dda2e8f9e8 --- /dev/null +++ b/mcs/class/System/win32_monodroid_System.dll.exclude.sources @@ -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 diff --git a/mcs/class/System/win32_monodroid_System.dll.sources b/mcs/class/System/win32_monodroid_System.dll.sources new file mode 100644 index 0000000000..4c21b28658 --- /dev/null +++ b/mcs/class/System/win32_monodroid_System.dll.sources @@ -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 + diff --git a/mcs/class/System/win32_monodroid_System_test.dll.exclude.sources b/mcs/class/System/win32_monodroid_System_test.dll.exclude.sources new file mode 100644 index 0000000000..c2f4d70d80 --- /dev/null +++ b/mcs/class/System/win32_monodroid_System_test.dll.exclude.sources @@ -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 diff --git a/mcs/class/System/win32_monodroid_System_xtest.dll.exclude.sources b/mcs/class/System/win32_monodroid_System_xtest.dll.exclude.sources new file mode 100644 index 0000000000..50cc0f1d6c --- /dev/null +++ b/mcs/class/System/win32_monodroid_System_xtest.dll.exclude.sources @@ -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 diff --git a/mcs/class/corlib/System/Console.cs b/mcs/class/corlib/System/Console.cs index 361db81249..1cb266ad91 100644 --- a/mcs/class/corlib/System/Console.cs +++ b/mcs/class/corlib/System/Console.cs @@ -150,7 +150,7 @@ namespace System stdout = TextWriter.Synchronized (new UnexceptionalStreamWriter (OpenStandardOutput (0), outputEncoding) { AutoFlush = true }); stderr = TextWriter.Synchronized (new UnexceptionalStreamWriter (OpenStandardError (0), outputEncoding) { AutoFlush = true }); -#if MONODROID +#if MONODROID && !MOBILE_DESKTOP_HOST if (LogcatTextWriter.IsRunningOnAndroid ()) { stdout = TextWriter.Synchronized (new LogcatTextWriter ("mono-stdout", stdout)); stderr = TextWriter.Synchronized (new LogcatTextWriter ("mono-stderr", stderr)); diff --git a/mcs/class/corlib/System/Environment.cs b/mcs/class/corlib/System/Environment.cs index c4fdc6bb49..4bdfaec043 100644 --- a/mcs/class/corlib/System/Environment.cs +++ b/mcs/class/corlib/System/Environment.cs @@ -957,7 +957,7 @@ namespace System { } // private methods -#if (MONOTOUCH || MONODROID || XAMMAC) +#if (MONOTOUCH || MONODROID || XAMMAC) && !MOBILE_DESKTOP_HOST internal const bool IsRunningOnWindows = false; #else internal static bool IsRunningOnWindows { diff --git a/mcs/class/corlib/System/TimeZoneInfo.cs b/mcs/class/corlib/System/TimeZoneInfo.cs index 449b94136b..5f9cba0074 100644 --- a/mcs/class/corlib/System/TimeZoneInfo.cs +++ b/mcs/class/corlib/System/TimeZoneInfo.cs @@ -149,7 +149,7 @@ namespace System return true; } -#if !MONODROID && !MONOTOUCH && !XAMMAC && !WASM +#if (!MONODROID && !MONOTOUCH && !XAMMAC && !WASM) || MOBILE_DESKTOP_HOST static TimeZoneInfo CreateLocal () { #if WIN_PLATFORM diff --git a/mcs/class/corlib/win32_monodroid_corlib.dll.exclude.sources b/mcs/class/corlib/win32_monodroid_corlib.dll.exclude.sources new file mode 100644 index 0000000000..1883c19df8 --- /dev/null +++ b/mcs/class/corlib/win32_monodroid_corlib.dll.exclude.sources @@ -0,0 +1,28 @@ +#include System.IO.platformnotsupported.sources +corert/PreAllocatedOverlapped.platformnotsupported.cs +corert/ThreadPoolBoundHandle.platformnotsupported.cs +../../../external/corert/src/System.Private.CoreLib/src/System/Number.Unix.cs +../../../external/corert/src/Common/src/Interop/Unix/System.Private.CoreLib.Native/Interop.Number.cs + +corefx/Interop.GetRandomBytes.Mono.cs +corefx/Mono.SafePasswordHandle.Unix.cs +../../../external/corefx/src/System.Security.Cryptography.X509Certificates/src/Microsoft/Win32/SafeHandles/SafePasswordHandle.Unix.cs +Microsoft.Win32/IRegistryApi.cs +Microsoft.Win32/Registry.cs +Microsoft.Win32/RegistryKey.cs +Microsoft.Win32/Win32RegistryApi.cs +Microsoft.Win32/Win32ResultCode.cs +Microsoft.Win32/UnixRegistryApi.cs +System.Security.AccessControl/RegistryAccessRule.cs +System.Security.AccessControl/RegistryAuditRule.cs +System.Security.AccessControl/RegistrySecurity.cs +../referencesource/mscorlib/microsoft/win32/safehandles/saferegistryhandle.cs + +../referencesource/mscorlib/system/timezoneinfo.cs +corefx/TimeZoneInfo.cs +System/TimeZoneInfo.cs +System/TimeZoneInfo.Android.cs +System/TimeZoneInfo.MonoTouch.cs +System/TimeZoneInfo.Serialization.cs +System/TimeZoneInfo.WinRT.cs + diff --git a/mcs/class/corlib/win32_monodroid_corlib.dll.sources b/mcs/class/corlib/win32_monodroid_corlib.dll.sources new file mode 100644 index 0000000000..f1352900b7 --- /dev/null +++ b/mcs/class/corlib/win32_monodroid_corlib.dll.sources @@ -0,0 +1,67 @@ +#include corlib.dll.sources +#include win32_build_corlib.dll.sources + +../../../external/corert/src/Common/src/Interop/Windows/Interop.Libraries.cs +../../../external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.BCryptGenRandom.cs +../../../external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.BCryptGenRandom.GetRandomBytes.cs +../../../external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.NTSTATUS.cs + +../../../external/corert/src/Common/src/Interop/Windows/mincore/Interop.MemAllocFree.cs +../../../external/corert/src/Common/src/Interop/Windows/mincore/Interop.ThreadPoolIO.cs +../../../external/corefx/src/Common/src/Interop/Windows/Interop.Errors.cs + +../../../external/corert/src/System.Private.CoreLib/shared/System/Threading/DeferredDisposableLifetime.cs + +../../../external/corert/src/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeThreadPoolIOHandle.cs + +../../../external/corert/src/System.Private.CoreLib/src/System/Threading/ThreadPoolCallbackWrapper.cs + +../../../external/corert/src/System.Private.CoreLib/src/System/Threading/Win32ThreadPoolBoundHandle.cs +../../../external/corert/src/System.Private.CoreLib/src/System/Threading/Win32ThreadPoolNativeOverlapped.cs +../../../external/corert/src/System.Private.CoreLib/src/System/Threading/Win32ThreadPoolNativeOverlapped.ExecutionContextCallbackArgs.cs +../../../external/corert/src/System.Private.CoreLib/src/System/Threading/Win32ThreadPoolNativeOverlapped.OverlappedData.cs +../../../external/corert/src/System.Private.CoreLib/src/System/Threading/Win32ThreadPoolPreAllocatedOverlapped.cs + +../../../external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.TimeZone.cs +../../../external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.FreeLibrary.cs +../../../external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.TimeZone.Registry.cs +../../../external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.MUI.cs +../../../external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.LoadLibraryEx.cs +../../../external/corefx/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.MAX_PATH.cs +../../../external/corefx/src/Common/src/CoreLib/Interop/Windows/User32/Interop.LoadString.cs +../../../external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/SafeLibraryHandle.cs +../../../external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.AdjustmentRule.cs +../../../external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.StringSerializer.cs +../../../external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.TransitionTime.cs +../../../external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.Win32.cs +../../../external/corefx/src/Common/src/CoreLib/System/TimeZoneInfo.cs + +corert/RuntimeImports.cs +../../../external/corert/src/System.Private.CoreLib/src/System/Number.Windows.cs +../../../external/corert/src/Runtime.Base/src/System/Runtime/InteropServices/NativeCallableAttribute.cs + +../../../external/corefx/src/System.Security.Cryptography.X509Certificates/src/Microsoft/Win32/SafeHandles/SafePasswordHandle.Windows.cs +corefx/Mono.SafePasswordHandle.Windows.cs +../../../external/corefx/src/Microsoft.Win32.Registry/src/Microsoft/Win32/RegistryKey.cs +../../../external/corefx/src/Microsoft.Win32.Registry/src/Microsoft/Win32/SafeHandles/SafeRegistryHandle.cs +../../../external/corefx/src/Microsoft.Win32.Registry/src/System/Security/AccessControl/RegistrySecurity.cs +../../../external/corefx/src/Microsoft.Win32.Registry/src/System/Security/AccessControl/RegistrySecurity.Windows.cs +../../../external/corefx/src/Microsoft.Win32.Registry/src/Microsoft/Win32/SafeHandles/SafeRegistryHandle.Windows.cs +../../../external/corefx/src/Microsoft.Win32.Registry/src/Microsoft/Win32/RegistryKey.Windows.cs +../../../external/corefx/src/Microsoft.Win32.Registry/src/Microsoft/Win32/Registry.cs +corefx/Registry.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegCloseKey.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegConnectRegistry.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegCreateKeyEx.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegDeleteKeyEx.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegDeleteValue.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegEnumKeyEx.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegEnumValue.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegFlushKey.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegisterServiceCtrlHandler.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegisterServiceCtrlHandlerEx.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegistryOptions.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegOpenKeyEx.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegQueryInfoKey.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegQueryValueEx.cs +../../../external/corefx/src/Common/src/Interop/Windows/advapi32/Interop.RegSetValueEx.cs diff --git a/mcs/class/corlib/win32_monodroid_corlib_test.dll.exclude.sources b/mcs/class/corlib/win32_monodroid_corlib_test.dll.exclude.sources new file mode 100644 index 0000000000..1f55fd9018 --- /dev/null +++ b/mcs/class/corlib/win32_monodroid_corlib_test.dll.exclude.sources @@ -0,0 +1,52 @@ +Microsoft.Win32/RegistryKeyTest.cs +System/ActivatorCas.cs +System/AppDomainCas.cs +System/BadImageFormatExceptionCas.cs +System/ConsoleCas.cs +System.Diagnostics/StackFrameCas.cs +System.Diagnostics/StackTraceCas.cs +System/EnvironmentCas.cs +System/ExceptionCas.cs +System.IO/DirectoryCas.cs +System.IO/FileLoadExceptionCas.cs +System.IO/FileNotFoundExceptionCas.cs +System.IO/FileStreamCas.cs +System.IO.IsolatedStorage/IsolatedStorageFileCas.cs +System.IO.IsolatedStorage/IsolatedStorageFileStreamCas.cs +System.IO/PathCas.cs +System.IO/StreamCas.cs +System/MarshalByRefObjectCas.cs +System.Reflection/AssemblyCas.cs +System.Reflection/AssemblyNameCas.cs +System.Reflection.Emit/MethodRentalCas.cs +System.Reflection/ModuleCas.cs +System.Reflection/StrongNameKeyPairCas.cs +System.Reflection/VisibilityTest.cs +System.Resources/ResourceReaderCas.cs +System.Resources/ResourceSetCas.cs +System.Runtime.CompilerServices/RuntimeWrappedExceptionCas.cs +System.Runtime.InteropServices/RuntimeEnvironmentCas.cs +System/RuntimeMethodHandleCas.cs +System.Runtime.Serialization.Formatters.Binary/BinaryFormatterCas.cs +System.Runtime.Versioning/ResourceConsumptionAttributeCas.cs +System.Runtime.Versioning/ResourceExposureAttributeCas.cs +System.Runtime.Versioning/VersioningHelperCas.cs +System.Security.AccessControl/DirectorySecurityTest.cs +System.Security.AccessControl/EventWaitHandleSecurityTest.cs +System.Security.AccessControl/FileSecurityTest.cs +System.Security/CodeAccessPermissionCas.cs +System.Security.Cryptography/CryptoAPITransformCas.cs +System.Security.Cryptography/CryptoConfigCas.cs +System.Security.Cryptography.X509Certificates/X509CertificateCas.cs +System.Security/PermissionSetCas.cs +System.Security.Policy/ApplicationSecurityManagerCas.cs +System.Security/SecureStringCas.cs +System.Security/SecurityContextCas.cs +System.Security/SecurityExceptionCas.cs +System.Security/SecurityManagerCas.cs +System.Threading/CompressedStackCas.cs +System.Threading/ExecutionContextCas.cs +System.Threading/MutexCas.cs +System.Threading/ThreadCas.cs +System.Threading/WaitHandleCas.cs +System/TypedReferenceCas.cs diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index ea28acb220..79ba63cb7c 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -14d787933ad15dc36ee3efc0d3fae792f1114bf0 \ No newline at end of file +6f691a810c44556f6d3819ff36448333ac9cdfc1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index b639878e87..d94f516180 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -4e694108ab6ce31e0ff213923741724e2ca501e7 \ No newline at end of file +20d7780a6363d0658a5fe4025c73831c94d1dbdb \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 26bf0602e6..8ec67cdce5 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -14a8dbaadd0cfe44cefa667308fb88b0ab0cdcd7 \ No newline at end of file +e1b9a73d26689833996d7af80cd71cf4661cb904 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index 46ab1e4613eb45bde905084e1d97838652806cac..a7a29df0564510f2d744c15b0e970554f2c10b3e 100644 GIT binary patch delta 58 zcmZqZU~A}Lo6x}`zMpG)W6#zeMiU+ZaXqgb4<=FnJ(KOewq#gZY`?(6xRH(7j6rMq Of?7tc?dyaYg9-po5fh&P delta 58 zcmV-A0LA}+hz5X&29SsZuTy7^fsD0`0W=H{+uE{S)(r$htaT3t{!r%Ix6lj$u?7P( Q04kTDeE}-Bt`h-LaJ>x{#{d8T diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index 0a1b187986..6168c38d87 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -8430214dfd5236fe314c5883b589f884c52d0334 \ No newline at end of file +d00b85d6ba7c06c1275a595dec4b036954ab6fb7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index e2323c0fca..6015a71d19 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -f0df12ea11d13f03ddbb71d5700411d69ece6364 \ No newline at end of file +c337e11cb31be1dfbd12c38ef380f2dad5f1c291 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index c16adb5c0a..1cd5fe4ca6 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -20d701373f7adad80dc853f53cbf4b09570edc67 \ No newline at end of file +979f1900057452a63be86ef29dd9110a2f37aca0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index 33c62b3237..b2b2a3d214 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -d13f038c1a229acb3e3070edc26b5ce0a20d12a6 \ No newline at end of file +3864f11078b36c8d22a1da80d0145ebe94aa5da7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index ea28acb220..79ba63cb7c 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -14d787933ad15dc36ee3efc0d3fae792f1114bf0 \ No newline at end of file +6f691a810c44556f6d3819ff36448333ac9cdfc1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index b639878e87..d94f516180 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -4e694108ab6ce31e0ff213923741724e2ca501e7 \ No newline at end of file +20d7780a6363d0658a5fe4025c73831c94d1dbdb \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 26bf0602e6..8ec67cdce5 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -14a8dbaadd0cfe44cefa667308fb88b0ab0cdcd7 \ No newline at end of file +e1b9a73d26689833996d7af80cd71cf4661cb904 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index 46ab1e4613eb45bde905084e1d97838652806cac..a7a29df0564510f2d744c15b0e970554f2c10b3e 100644 GIT binary patch delta 58 zcmZqZU~A}Lo6x}`zMpG)W6#zeMiU+ZaXqgb4<=FnJ(KOewq#gZY`?(6xRH(7j6rMq Of?7tc?dyaYg9-po5fh&P delta 58 zcmV-A0LA}+hz5X&29SsZuTy7^fsD0`0W=H{+uE{S)(r$htaT3t{!r%Ix6lj$u?7P( Q04kTDeE}-Bt`h-LaJ>x{#{d8T diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index 0a1b187986..6168c38d87 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -8430214dfd5236fe314c5883b589f884c52d0334 \ No newline at end of file +d00b85d6ba7c06c1275a595dec4b036954ab6fb7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index e2323c0fca..6015a71d19 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -f0df12ea11d13f03ddbb71d5700411d69ece6364 \ No newline at end of file +c337e11cb31be1dfbd12c38ef380f2dad5f1c291 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index c16adb5c0a..1cd5fe4ca6 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -20d701373f7adad80dc853f53cbf4b09570edc67 \ No newline at end of file +979f1900057452a63be86ef29dd9110a2f37aca0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index 33c62b3237..b2b2a3d214 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -d13f038c1a229acb3e3070edc26b5ce0a20d12a6 \ No newline at end of file +3864f11078b36c8d22a1da80d0145ebe94aa5da7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index ea28acb220..79ba63cb7c 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -14d787933ad15dc36ee3efc0d3fae792f1114bf0 \ No newline at end of file +6f691a810c44556f6d3819ff36448333ac9cdfc1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index b639878e87..d94f516180 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -4e694108ab6ce31e0ff213923741724e2ca501e7 \ No newline at end of file +20d7780a6363d0658a5fe4025c73831c94d1dbdb \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 26bf0602e6..8ec67cdce5 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -14a8dbaadd0cfe44cefa667308fb88b0ab0cdcd7 \ No newline at end of file +e1b9a73d26689833996d7af80cd71cf4661cb904 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index 46ab1e4613eb45bde905084e1d97838652806cac..a7a29df0564510f2d744c15b0e970554f2c10b3e 100644 GIT binary patch delta 58 zcmZqZU~A}Lo6x}`zMpG)W6#zeMiU+ZaXqgb4<=FnJ(KOewq#gZY`?(6xRH(7j6rMq Of?7tc?dyaYg9-po5fh&P delta 58 zcmV-A0LA}+hz5X&29SsZuTy7^fsD0`0W=H{+uE{S)(r$htaT3t{!r%Ix6lj$u?7P( Q04kTDeE}-Bt`h-LaJ>x{#{d8T diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index 0a1b187986..6168c38d87 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -8430214dfd5236fe314c5883b589f884c52d0334 \ No newline at end of file +d00b85d6ba7c06c1275a595dec4b036954ab6fb7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index e2323c0fca..6015a71d19 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -f0df12ea11d13f03ddbb71d5700411d69ece6364 \ No newline at end of file +c337e11cb31be1dfbd12c38ef380f2dad5f1c291 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index c16adb5c0a..1cd5fe4ca6 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -20d701373f7adad80dc853f53cbf4b09570edc67 \ No newline at end of file +979f1900057452a63be86ef29dd9110a2f37aca0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index 33c62b3237..b2b2a3d214 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -d13f038c1a229acb3e3070edc26b5ce0a20d12a6 \ No newline at end of file +3864f11078b36c8d22a1da80d0145ebe94aa5da7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index ea28acb220..79ba63cb7c 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -14d787933ad15dc36ee3efc0d3fae792f1114bf0 \ No newline at end of file +6f691a810c44556f6d3819ff36448333ac9cdfc1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index b639878e87..d94f516180 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -4e694108ab6ce31e0ff213923741724e2ca501e7 \ No newline at end of file +20d7780a6363d0658a5fe4025c73831c94d1dbdb \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index ab2b6f0b3e..bd2e8fed66 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -6647725e8f8c13ff110f04020622646b960e8255 \ No newline at end of file +8bf09eefaca8f68b5f006adfde10597321c0f2ea \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index 46ab1e4613eb45bde905084e1d97838652806cac..a7a29df0564510f2d744c15b0e970554f2c10b3e 100644 GIT binary patch delta 58 zcmZqZU~A}Lo6x}`zMpG)W6#zeMiU+ZaXqgb4<=FnJ(KOewq#gZY`?(6xRH(7j6rMq Of?7tc?dyaYg9-po5fh&P delta 58 zcmV-A0LA}+hz5X&29SsZuTy7^fsD0`0W=H{+uE{S)(r$htaT3t{!r%Ix6lj$u?7P( Q04kTDeE}-Bt`h-LaJ>x{#{d8T diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index 0a1b187986..6168c38d87 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -8430214dfd5236fe314c5883b589f884c52d0334 \ No newline at end of file +d00b85d6ba7c06c1275a595dec4b036954ab6fb7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index e2323c0fca..6015a71d19 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -f0df12ea11d13f03ddbb71d5700411d69ece6364 \ No newline at end of file +c337e11cb31be1dfbd12c38ef380f2dad5f1c291 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index c16adb5c0a..1cd5fe4ca6 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -20d701373f7adad80dc853f53cbf4b09570edc67 \ No newline at end of file +979f1900057452a63be86ef29dd9110a2f37aca0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index 93ba51bced..ad495895f7 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -8fe0105db58518214b4f64b3156e12bb557c07d0 \ No newline at end of file +05142c973b13ab2880ae8807597bcb1af6e8f156 \ No newline at end of file diff --git a/mcs/class/referencesource/System/net/System/Net/webproxy.cs b/mcs/class/referencesource/System/net/System/Net/webproxy.cs index 0f874b3fa5..e117b84185 100644 --- a/mcs/class/referencesource/System/net/System/Net/webproxy.cs +++ b/mcs/class/referencesource/System/net/System/Net/webproxy.cs @@ -508,7 +508,7 @@ namespace System.Net { throw new PlatformNotSupportedException (); #elif MONOTOUCH return Mono.Net.CFNetwork.GetDefaultProxy (); -#elif MONODROID +#elif MONODROID && !MOBILE_DESKTOP_HOST // Return the system web proxy. This only works for ICS+. var data = AndroidPlatform.GetDefaultProxy (); if (data != null) diff --git a/mcs/class/referencesource/mscorlib/system/threading/synchronizationcontext.cs b/mcs/class/referencesource/mscorlib/system/threading/synchronizationcontext.cs index e1be5014b9..eba8d92af8 100644 --- a/mcs/class/referencesource/mscorlib/system/threading/synchronizationcontext.cs +++ b/mcs/class/referencesource/mscorlib/system/threading/synchronizationcontext.cs @@ -292,7 +292,7 @@ namespace System.Threading context = GetWinRTContext(); #endif -#if MONODROID +#if MONODROID && !MOBILE_DESKTOP_HOST if (context == null) context = AndroidPlatform.GetDefaultSyncContext (); #endif diff --git a/mono/mini/version.h b/mono/mini/version.h index 4a8e249fc7..ed39c41a97 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/c857c27" +#define FULL_VERSION "explicit/bb3c9db" diff --git a/mono/unit-tests/Makefile.in b/mono/unit-tests/Makefile.in index 4dc46b1f38..fa36c48fae 100644 --- a/mono/unit-tests/Makefile.in +++ b/mono/unit-tests/Makefile.in @@ -1442,10 +1442,10 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@CROSS_COMPILE_TRUE@test-local: -@HOST_WIN32_TRUE@test-local: @CROSS_COMPILE_TRUE@clean-local: @HOST_WIN32_TRUE@clean-local: +@CROSS_COMPILE_TRUE@test-local: +@HOST_WIN32_TRUE@test-local: clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index c9a7de500942d4acbd4623704574a9dc06b5577d..0dab3d285b7614262816b34b89937f08f39da6db 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aK31p^B!1B=aXxQw^}O2r0# delta 20 bcmbQIHBW29Q!aLM1p^B!L!-@axQw^}N}L9G diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 803f170dbc..8a2a73c001 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -c757d7a44db101a3b9c4885d7b52c81eb42e19d2 \ No newline at end of file +3a83891f3ec0915757a28705da1dec27a73a7b11 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 45b7c7c9820a79653c5e3e3e5ae78ee0df6c9607..bcc19a52eb8569867314607bbcf04e76a8146e15 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)2f`NsVfyHK1#VK+CQRN1- delta 20 bcmX?Ef3kjqo+7)sf`NsVq0wej#VK+CQM?AO diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 9b903ff322..d6fad46288 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -bb43cbb5b347d38d1864a06910b750d2de7c68ac \ No newline at end of file +145e6d888e716a826092864caa01fb0be24873b0 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index bba0af1f6a6121ad939f455bd8a962c8d444a8d8..d8567159d1f688088446a8d8fd1a42ba027677d9 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m>=p_J7FGrpoB7oXv;bi@2M_=N delta 22 dcmeyri1Gg-#tj_m?B)sv7FLEvoB7oXv;bia2MPcH diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 212ec9fd3a..c08587d0a3 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -0a026aeea84e8a8d426f1ca62e4a45bf05e7fe42 \ No newline at end of file +b6803a4c2d038bd2bf1ed42bc985a9597869d081 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index f796d35b30..95283b5d09 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.0.0.243\n" +"Project-Id-Version: mono 6.0.0.246\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-05-17 08:12+0000\n" +"POT-Creation-Date: 2019-05-18 08:08+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 7dbf5f61a0ffee1747c31d62fcf879266c654d49..906964ea6a6e0dc678e21de9b4421af4fbbe7799 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*)0?dEUXMHHm6QyYzF{tE(nGI delta 22 ecmaF1gXP%{mJM-J+07LUEUXNTHm6QyYzF{t1qgru diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index fe4d20d43c..4bc5aaaf27 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -e78fd09501fbb0a5ab66c1a7f806eb75066c14d5 \ No newline at end of file +7b0d39cfa1cd0031699f7c05e0ab09629b6c3b03 \ No newline at end of file