From 76c6505a64eff5098d325d57a21b25f0bc3742f8 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Sat, 8 Jun 2019 08:45:03 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.293 Former-commit-id: c73c6d59ea27405c8ec2975fc933d2a9a447e603 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- .../monodroid/System.Core.cs.REMOVED.git-id | 2 +- .../monodroid/mscorlib.cs.REMOVED.git-id | 2 +- .../monotouch/System.Core.cs.REMOVED.git-id | 2 +- .../monotouch/mscorlib.cs.REMOVED.git-id | 2 +- .../net_4_x/System.Core.cs.REMOVED.git-id | 2 +- .../net_4_x/mscorlib.cs.REMOVED.git-id | 2 +- .../src/System/Net/Http/HttpClient.cs | 2 +- mcs/build/common/Consts.cs | 2 +- .../RSACertificateExtensions.cs | 16 ++++++++++--- .../System/System.Net/HttpListener.Mono.cs | 4 ++-- .../X509Certificate2Impl.cs | 12 ++++++++++ .../corlib/ReferenceSources/MethodBase.cs | 1 + .../X509CertificateImpl.cs | 4 ++++ .../System/AppDomainTest.cs.REMOVED.git-id | 2 +- mcs/class/corlib/corefx/MethodInfo.cs | 1 + .../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 +- .../System.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 +- .../System.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 +- .../System.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 +- .../System.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mcs/tools/security/Makefile | 4 ++-- mcs/tools/security/httpcfg.cs | 3 ++- mono/metadata/remoting.c | 21 +++++++++++++++++ mono/mini/objects.cs | 7 ++++++ mono/mini/ssa.c | 4 ++++ mono/mini/version.h | 2 +- mono/utils/mono-threads-mach-helper.c | 22 ++++++++++-------- msvc/Makefile.in | 2 +- 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 +- 70 files changed, 132 insertions(+), 69 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 3d06a15f74..e8a9d75988 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -e4dbd55a6935d98c1061117e8bc216643726030d \ No newline at end of file +8a367a10d831ba50730c5291b24e29d1f4d445d3 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 0393943aae..b67fc0fa57 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -662a404734cf8813c639a09f84523e7ab398aaf0 \ No newline at end of file +a04bb48f853b87c4bc402467b1ac180fd2ca01ce \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/System.Core.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/System.Core.cs.REMOVED.git-id index d0a5ac2bfd..76a23a64db 100644 --- a/external/api-snapshot/profiles/monodroid/System.Core.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/System.Core.cs.REMOVED.git-id @@ -1 +1 @@ -cd6b4d3f8c136b6d4635b6d9e4ee3fb53317ad1f \ No newline at end of file +0f27d5dca93a66ef6d5377c8ded4782c7bddc1e6 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id index 8632f558be..f045e64a87 100644 --- a/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -44384220745bdb3ead5e68f414891ec50eec5569 \ No newline at end of file +505ae17b8dc98c3bbf1edd670f5bcc78ed694c38 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/System.Core.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/System.Core.cs.REMOVED.git-id index dfa284160d..babb75b265 100644 --- a/external/api-snapshot/profiles/monotouch/System.Core.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/System.Core.cs.REMOVED.git-id @@ -1 +1 @@ -44f13ddec9a8d9c04a955ae30eeba3a40f62c228 \ No newline at end of file +7778ed32622d805dcf7b92ebc3cb615205382a38 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id index 7c002e6c0c..e36364e141 100644 --- a/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -e1a3482dd9bf1a8d93cbd3aa5d470cfbc6f3ad69 \ No newline at end of file +ad43bd0bc249bd936072912d1338451bbadf2f3c \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Core.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Core.cs.REMOVED.git-id index 18def9d608..ea0c02d3aa 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Core.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Core.cs.REMOVED.git-id @@ -1 +1 @@ -85e53fa31ae86cfa7512a7e8078a02f4174f02ec \ No newline at end of file +1d07f529e45ff235d033ff3e01d19d8866105451 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id index 5deaebee91..ec32dcdb2f 100644 --- a/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -75f7be33bba50e7c6162cc7a0d1340853e6959f9 \ No newline at end of file +c1b96e23e4f3169d32fd0b3e2e81f63a56107ccc \ No newline at end of file diff --git a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs index 6f199b2b74..a2ae670a93 100644 --- a/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs +++ b/external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs @@ -464,7 +464,7 @@ namespace System.Net.Http throw; } - return completionOption == HttpCompletionOption.ResponseContentRead ? + return completionOption == HttpCompletionOption.ResponseContentRead && !string.Equals(request.Method.Method, "HEAD", StringComparison.OrdinalIgnoreCase) ? FinishSendAsyncBuffered(sendTask, request, cts, disposeCts) : FinishSendAsyncUnbuffered(sendTask, request, cts, disposeCts); } diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index dd76175670..98dc233de8 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.284"; + public const string MonoVersion = "6.0.0.293"; 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/class/System.Core/System.Security.Cryptography.X509Certificates/RSACertificateExtensions.cs b/mcs/class/System.Core/System.Security.Cryptography.X509Certificates/RSACertificateExtensions.cs index 3c04744198..fd4092414e 100644 --- a/mcs/class/System.Core/System.Security.Cryptography.X509Certificates/RSACertificateExtensions.cs +++ b/mcs/class/System.Core/System.Security.Cryptography.X509Certificates/RSACertificateExtensions.cs @@ -30,7 +30,7 @@ namespace System.Security.Cryptography.X509Certificates { public static class RSACertificateExtensions { - public static RSA GetRSAPrivateKey(this X509Certificate2 certificate) + public static RSA GetRSAPrivateKey (this X509Certificate2 certificate) { if (certificate == null) throw new ArgumentNullException (nameof (certificate)); @@ -41,11 +41,21 @@ namespace System.Security.Cryptography.X509Certificates return certificate.Impl.GetRSAPrivateKey (); } - public static RSA GetRSAPublicKey(this X509Certificate2 certificate) + public static RSA GetRSAPublicKey (this X509Certificate2 certificate) { if (certificate == null) - throw new ArgumentNullException("certificate"); + throw new ArgumentNullException (nameof (certificate)); return certificate.PublicKey.Key as RSA; } + + public static X509Certificate2 CopyWithPrivateKey (this X509Certificate2 certificate, RSA privateKey) + { + if (certificate == null) + throw new ArgumentNullException (nameof (certificate)); + if (privateKey == null) + throw new ArgumentNullException (nameof (privateKey)); + var impl = certificate.Impl.CopyWithPrivateKey (privateKey); + return (X509Certificate2)impl.CreateCertificate (); + } } } diff --git a/mcs/class/System/System.Net/HttpListener.Mono.cs b/mcs/class/System/System.Net/HttpListener.Mono.cs index 5e673b9d5f..c95c725ade 100644 --- a/mcs/class/System/System.Net/HttpListener.Mono.cs +++ b/mcs/class/System/System.Net/HttpListener.Mono.cs @@ -80,8 +80,8 @@ namespace System.Net { if (!File.Exists (pvk_file)) return null; var cert = new X509Certificate2 (cert_file); - cert.PrivateKey = PrivateKey.CreateFromFile (pvk_file).RSA; - certificate = cert; + var privateKey = PrivateKey.CreateFromFile (pvk_file).RSA; + certificate = new X509Certificate2 ((X509Certificate2Impl)cert.Impl.CopyWithPrivateKey (privateKey)); return certificate; } catch { // ignore errors diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Impl.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Impl.cs index a454ea07ad..6c6ad684a3 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Impl.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Impl.cs @@ -83,6 +83,18 @@ namespace System.Security.Cryptography.X509Certificates public abstract void AppendPrivateKeyInfo (StringBuilder sb); + public sealed override X509CertificateImpl CopyWithPrivateKey (RSA privateKey) + { + var impl = (X509Certificate2Impl)Clone (); + impl.PrivateKey = privateKey; + return impl; + } + + public sealed override X509Certificate CreateCertificate () + { + return new X509Certificate2 (this); + } + public abstract void Reset (); } } diff --git a/mcs/class/corlib/ReferenceSources/MethodBase.cs b/mcs/class/corlib/ReferenceSources/MethodBase.cs index 64059ecede..71ca1d3330 100644 --- a/mcs/class/corlib/ReferenceSources/MethodBase.cs +++ b/mcs/class/corlib/ReferenceSources/MethodBase.cs @@ -8,6 +8,7 @@ using System.Text; namespace System.Reflection { + [Serializable] partial class MethodBase { // diff --git a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509CertificateImpl.cs b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509CertificateImpl.cs index 2f9e2033fb..9548a0142d 100644 --- a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509CertificateImpl.cs +++ b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509CertificateImpl.cs @@ -123,6 +123,10 @@ namespace System.Security.Cryptography.X509Certificates public abstract byte[] Export (X509ContentType contentType, SafePasswordHandle password); + public abstract X509CertificateImpl CopyWithPrivateKey (RSA privateKey); + + public abstract X509Certificate CreateCertificate (); + public sealed override bool Equals (object obj) { var other = obj as X509CertificateImpl; diff --git a/mcs/class/corlib/Test/System/AppDomainTest.cs.REMOVED.git-id b/mcs/class/corlib/Test/System/AppDomainTest.cs.REMOVED.git-id index c6383a025b..29c90b9bd7 100644 --- a/mcs/class/corlib/Test/System/AppDomainTest.cs.REMOVED.git-id +++ b/mcs/class/corlib/Test/System/AppDomainTest.cs.REMOVED.git-id @@ -1 +1 @@ -7cd8184c6e906e7804425471eda17f75ade7c29f \ No newline at end of file +581faec1da3d53a1134ed7c388537cfe101e007a \ No newline at end of file diff --git a/mcs/class/corlib/corefx/MethodInfo.cs b/mcs/class/corlib/corefx/MethodInfo.cs index 21ccdccdf4..cbef004385 100644 --- a/mcs/class/corlib/corefx/MethodInfo.cs +++ b/mcs/class/corlib/corefx/MethodInfo.cs @@ -1,4 +1,5 @@ namespace System.Reflection { + [Serializable] partial class MethodInfo { internal virtual int GenericParameterCount => GetGenericArguments ().Length; } diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 386209c939..afcda243b5 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -0081ae35dbce9a10dcfd0a9a0a22e9690e19da56 \ No newline at end of file +8644f424bdc6234783527808eaf364fc4de93589 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 1677242669..e9210192d8 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -1cbed502c7bc7f3ee585f5a992af3439588908ee \ No newline at end of file +04ac9ca261d369e0152cd185f329179981ae261c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 1a4c8d4e55..bce9d7e93a 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -de4610d6ed476d486c45dcda2a88ff584d1ff1c3 \ No newline at end of file +7f0002af7c012f940b77ef4faad9c0c76bbcd769 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index a75755722fbd0d98fab8d843ee06d5d808dab970..21675a6cf0010ac7e5108ec39b45097e5e4aed1b 100644 GIT binary patch delta 60 zcmZqZU~A}Lo6x}`W~05hv1e-!qYjUNc8s;v_SZsQvy}VvMCO#)Za=}pxQUI`lEIik QYx;s(My>5Dg&D&O0Bvg%zW@LL delta 60 zcmV-C0K@-)hz5X&29SsZgd0MtfsD0`0W1s<)alI|8@QH1sxH-}Z S05kw9m!N$CDz~W<0atL_*cRdd diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index 53354f763b..2e56969d48 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -489d7ee861c287503c007ef4054371bb2650a61f \ No newline at end of file +7b3eabaa8fc825740de557145177ada3805fa15c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index 3692ca2a95..b2a1c12d54 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -0755b77099541d721dba6c265a09c09e9cc9d9be \ No newline at end of file +aa3f20f4223ee894f821c81b5144d56c827dd529 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id index 3654cd8af4..1f6d95d7ee 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id @@ -1 +1 @@ -ef2e4304281563bd8360933f8a58371f6e4dba90 \ No newline at end of file +67f564c659e3a210e285f362896772324d9c53d2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index 9b6a4ac31a..5469722ac5 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -8a04fc03dae997ce5a67c88ff36d45e62465988c \ No newline at end of file +bd292a0970d5b63a9eac50da950d1e21060bf470 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index 5ffc9e36bd..af2823222e 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -13da60b713ea88aa40dfb5cac5b123260ecbe2b1 \ No newline at end of file +ca30e2abba5df571106821a1f43c06751ef65a0f \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 386209c939..afcda243b5 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -0081ae35dbce9a10dcfd0a9a0a22e9690e19da56 \ No newline at end of file +8644f424bdc6234783527808eaf364fc4de93589 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 1677242669..e9210192d8 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -1cbed502c7bc7f3ee585f5a992af3439588908ee \ No newline at end of file +04ac9ca261d369e0152cd185f329179981ae261c \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 1a4c8d4e55..bce9d7e93a 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -de4610d6ed476d486c45dcda2a88ff584d1ff1c3 \ No newline at end of file +7f0002af7c012f940b77ef4faad9c0c76bbcd769 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index a75755722fbd0d98fab8d843ee06d5d808dab970..21675a6cf0010ac7e5108ec39b45097e5e4aed1b 100644 GIT binary patch delta 60 zcmZqZU~A}Lo6x}`W~05hv1e-!qYjUNc8s;v_SZsQvy}VvMCO#)Za=}pxQUI`lEIik QYx;s(My>5Dg&D&O0Bvg%zW@LL delta 60 zcmV-C0K@-)hz5X&29SsZgd0MtfsD0`0W1s<)alI|8@QH1sxH-}Z S05kw9m!N$CDz~W<0atL_*cRdd diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index 53354f763b..2e56969d48 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -489d7ee861c287503c007ef4054371bb2650a61f \ No newline at end of file +7b3eabaa8fc825740de557145177ada3805fa15c \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index 3692ca2a95..b2a1c12d54 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -0755b77099541d721dba6c265a09c09e9cc9d9be \ No newline at end of file +aa3f20f4223ee894f821c81b5144d56c827dd529 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id index 3654cd8af4..1f6d95d7ee 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id @@ -1 +1 @@ -ef2e4304281563bd8360933f8a58371f6e4dba90 \ No newline at end of file +67f564c659e3a210e285f362896772324d9c53d2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index 9b6a4ac31a..5469722ac5 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -8a04fc03dae997ce5a67c88ff36d45e62465988c \ No newline at end of file +bd292a0970d5b63a9eac50da950d1e21060bf470 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index 5ffc9e36bd..af2823222e 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -13da60b713ea88aa40dfb5cac5b123260ecbe2b1 \ No newline at end of file +ca30e2abba5df571106821a1f43c06751ef65a0f \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 386209c939..afcda243b5 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -0081ae35dbce9a10dcfd0a9a0a22e9690e19da56 \ No newline at end of file +8644f424bdc6234783527808eaf364fc4de93589 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 1677242669..e9210192d8 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -1cbed502c7bc7f3ee585f5a992af3439588908ee \ No newline at end of file +04ac9ca261d369e0152cd185f329179981ae261c \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 1a4c8d4e55..bce9d7e93a 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -de4610d6ed476d486c45dcda2a88ff584d1ff1c3 \ No newline at end of file +7f0002af7c012f940b77ef4faad9c0c76bbcd769 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index a75755722fbd0d98fab8d843ee06d5d808dab970..21675a6cf0010ac7e5108ec39b45097e5e4aed1b 100644 GIT binary patch delta 60 zcmZqZU~A}Lo6x}`W~05hv1e-!qYjUNc8s;v_SZsQvy}VvMCO#)Za=}pxQUI`lEIik QYx;s(My>5Dg&D&O0Bvg%zW@LL delta 60 zcmV-C0K@-)hz5X&29SsZgd0MtfsD0`0W1s<)alI|8@QH1sxH-}Z S05kw9m!N$CDz~W<0atL_*cRdd diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index 53354f763b..2e56969d48 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -489d7ee861c287503c007ef4054371bb2650a61f \ No newline at end of file +7b3eabaa8fc825740de557145177ada3805fa15c \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index 3692ca2a95..b2a1c12d54 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -0755b77099541d721dba6c265a09c09e9cc9d9be \ No newline at end of file +aa3f20f4223ee894f821c81b5144d56c827dd529 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id index 3654cd8af4..1f6d95d7ee 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id @@ -1 +1 @@ -ef2e4304281563bd8360933f8a58371f6e4dba90 \ No newline at end of file +67f564c659e3a210e285f362896772324d9c53d2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index 9b6a4ac31a..5469722ac5 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -8a04fc03dae997ce5a67c88ff36d45e62465988c \ No newline at end of file +bd292a0970d5b63a9eac50da950d1e21060bf470 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index 5ffc9e36bd..af2823222e 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -13da60b713ea88aa40dfb5cac5b123260ecbe2b1 \ No newline at end of file +ca30e2abba5df571106821a1f43c06751ef65a0f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 386209c939..afcda243b5 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -0081ae35dbce9a10dcfd0a9a0a22e9690e19da56 \ No newline at end of file +8644f424bdc6234783527808eaf364fc4de93589 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 1677242669..e9210192d8 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -1cbed502c7bc7f3ee585f5a992af3439588908ee \ No newline at end of file +04ac9ca261d369e0152cd185f329179981ae261c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 1e893733e6..45c085a4f7 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -029790984b39c5f269604dd5b23d09490714e01e \ No newline at end of file +31be7f777cf33257396b04d219664d710be1adf0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index a75755722fbd0d98fab8d843ee06d5d808dab970..21675a6cf0010ac7e5108ec39b45097e5e4aed1b 100644 GIT binary patch delta 60 zcmZqZU~A}Lo6x}`W~05hv1e-!qYjUNc8s;v_SZsQvy}VvMCO#)Za=}pxQUI`lEIik QYx;s(My>5Dg&D&O0Bvg%zW@LL delta 60 zcmV-C0K@-)hz5X&29SsZgd0MtfsD0`0W1s<)alI|8@QH1sxH-}Z S05kw9m!N$CDz~W<0atL_*cRdd diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index 53354f763b..2e56969d48 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -489d7ee861c287503c007ef4054371bb2650a61f \ No newline at end of file +7b3eabaa8fc825740de557145177ada3805fa15c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index 3692ca2a95..b2a1c12d54 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -0755b77099541d721dba6c265a09c09e9cc9d9be \ No newline at end of file +aa3f20f4223ee894f821c81b5144d56c827dd529 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id index 3654cd8af4..1f6d95d7ee 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id @@ -1 +1 @@ -ef2e4304281563bd8360933f8a58371f6e4dba90 \ No newline at end of file +67f564c659e3a210e285f362896772324d9c53d2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index 9b6a4ac31a..5469722ac5 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -8a04fc03dae997ce5a67c88ff36d45e62465988c \ No newline at end of file +bd292a0970d5b63a9eac50da950d1e21060bf470 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index 346babcead..4c6e0a156e 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -2b47191e993569bb9dfb2ab9b483f0337516a99e \ No newline at end of file +d10e802bc7866004ad9dce52c6f396a028f1d43e \ No newline at end of file diff --git a/mcs/tools/security/Makefile b/mcs/tools/security/Makefile index b01c75796b..83d97ac819 100644 --- a/mcs/tools/security/Makefile +++ b/mcs/tools/security/Makefile @@ -4,7 +4,7 @@ DIST_ONLY_SUBDIRS = certview include ../../build/rules.make LOCAL_MCS_FLAGS = -LIB_REFS = Mono.Security System +LIB_REFS = Mono.Security System System.Core SECURITY_PROGRAMS = secutil.exe cert2spc.exe sn.exe makecert.exe chktrust.exe crlupdate.exe \ signcode.exe setreg.exe certmgr.exe caspol.exe permview.exe mozroots.exe cert-sync.exe @@ -66,4 +66,4 @@ permview.exe: permview.cs $(CSCOMPILE) $^ $(HELPER_SOURCES) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/Mono.Cecil.dll %.exe: %.cs $(HELPER_SOURCES) - $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/Mono.Security.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll $^ + $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/Mono.Security.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll $^ diff --git a/mcs/tools/security/httpcfg.cs b/mcs/tools/security/httpcfg.cs index 19dd00fded..8a7df877da 100644 --- a/mcs/tools/security/httpcfg.cs +++ b/mcs/tools/security/httpcfg.cs @@ -202,7 +202,8 @@ namespace Mono.Tools { { try { X509Certificate2 x509 = new X509Certificate2 (cert); - x509.PrivateKey = PrivateKey.CreateFromFile (pvk).RSA; + var privateKey = PrivateKey.CreateFromFile (pvk).RSA; + x509 = x509.CopyWithPrivateKey ((RSA)privateKey); } catch (Exception e) { Console.Error.WriteLine ("error loading certificate or private key [{0}]", e.Message); Help (true); diff --git a/mono/metadata/remoting.c b/mono/metadata/remoting.c index f6db37e520..769f3556ee 100644 --- a/mono/metadata/remoting.c +++ b/mono/metadata/remoting.c @@ -1009,6 +1009,7 @@ mono_marshal_get_xappdomain_invoke (MonoMethod *method, MonoError *error) marshal_types = g_newa (int, sig->param_count); complex_count = complex_out_count = 0; + gboolean has_byreflike = FALSE; for (i = 0; i < sig->param_count; i++) { MonoType *ptype = sig->params[i]; int mt = mono_get_xdomain_marshal_type (ptype); @@ -1023,6 +1024,10 @@ mono_marshal_get_xappdomain_invoke (MonoMethod *method, MonoError *error) if (ptype->byref) complex_out_count++; } marshal_types [i] = mt; + /* Can't make a xdomain wrapper for a method with an IsByRefLike result */ + if (!ptype->byref && m_class_is_byreflike (mono_class_from_mono_type_internal (ptype))) { + has_byreflike = TRUE; + } } if (sig->ret->type != MONO_TYPE_VOID) { @@ -1031,9 +1036,25 @@ mono_marshal_get_xappdomain_invoke (MonoMethod *method, MonoError *error) copy_return = ret_marshal_type != MONO_MARSHAL_SERIALIZE; } + /* Can't make a xdomain wrapper for a method with an IsByRefLike result */ + if (!sig->ret->byref && m_class_is_byreflike (mono_class_from_mono_type_internal (sig->ret))) { + has_byreflike = TRUE; + } + /* Locals */ #ifndef DISABLE_JIT + if (has_byreflike) { + /* Make a wrapper that throws a NotImplementedException if it's ever called */ + mono_mb_emit_exception (mb, "NotImplementedException", "Cross AppDomain calls with IsByRefLike parameter or return types are not implemented"); + info = mono_wrapper_info_create (mb, WRAPPER_SUBTYPE_NONE); + info->d.remoting.method = method; + res = mono_remoting_mb_create_and_cache (method, mb, sig, sig->param_count + 16, info); + mono_mb_free (mb); + return res; + } + + MonoType *object_type = mono_get_object_type (); MonoType *byte_array_type = m_class_get_byval_arg (byte_array_class); MonoType *int32_type = mono_get_int32_type (); diff --git a/mono/mini/objects.cs b/mono/mini/objects.cs index 6477ee96e6..ed72ec7fe0 100644 --- a/mono/mini/objects.cs +++ b/mono/mini/objects.cs @@ -2001,6 +2001,13 @@ ncells ) { return gh_11378_inner_3 (new Vec3(0, 2, -20)); } + static int variable_with_constant_address; + + public static int test_0_cfold_with_non_constant_ternary_op () { + variable_with_constant_address = 0; + var old = System.Threading.Interlocked.CompareExchange(ref variable_with_constant_address, 1, 0); + return old == 0 && variable_with_constant_address == 1 ? 0 : 1; + } } #if __MOBILE__ diff --git a/mono/mini/ssa.c b/mono/mini/ssa.c index a6b0477e30..b54be56d02 100644 --- a/mono/mini/ssa.c +++ b/mono/mini/ssa.c @@ -826,6 +826,10 @@ evaluate_ins (MonoCompile *cfg, MonoInst *ins, MonoInst **res, MonoInst **carray return 2; num_sregs = mono_inst_get_src_registers (ins, sregs); + + if (num_sregs > 2) + return 2; + for (i = 0; i < MONO_MAX_SRC_REGS; ++i) args [i] = NULL; for (i = 0; i < num_sregs; ++i) { diff --git a/mono/mini/version.h b/mono/mini/version.h index a0cedba733..5fa7aef79e 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/0349bbe" +#define FULL_VERSION "explicit/d572acd" diff --git a/mono/utils/mono-threads-mach-helper.c b/mono/utils/mono-threads-mach-helper.c index 8dbe8becac..975bfa90a0 100644 --- a/mono/utils/mono-threads-mach-helper.c +++ b/mono/utils/mono-threads-mach-helper.c @@ -10,8 +10,6 @@ #if defined(__MACH__) -#define OBJC_OLD_DISPATCH_PROTOTYPES 1 // TODO remove once https://github.com/mono/mono/issues/14792 is fixed - #include "config.h" #include #include @@ -66,7 +64,8 @@ mono_dead_letter_dealloc (id self, SEL _cmd) #else super.super_class = nsobject; #endif - objc_msgSendSuper (&super, dealloc); + void (*objc_msgSendSuper_op)(struct objc_super *, SEL) = (void (*)(struct objc_super *, SEL)) objc_msgSendSuper; + objc_msgSendSuper_op (&super, dealloc); mono_thread_info_detach (); } @@ -83,19 +82,20 @@ mono_threads_install_dead_letter (void) * It doesn't hurt on other architectures either, so no need to #ifdef it only for ARM64. */ + id (*id_objc_msgSend)(id, SEL) = (id (*)(id, SEL)) objc_msgSend; id (*id_objc_msgSend_id)(id, SEL, id) = (id (*)(id, SEL, id)) objc_msgSend; void (*objc_msgSend_id_id)(id, SEL, id, id) = (void (*)(id, SEL, id, id)) objc_msgSend; - cur = objc_msgSend ((id)nsthread, currentThread); + cur = id_objc_msgSend ((id)nsthread, currentThread); if (!cur) return; - dict = objc_msgSend (cur, threadDictionary); + dict = id_objc_msgSend (cur, threadDictionary); if (dict && id_objc_msgSend_id (dict, objectForKey, mono_dead_letter_key) == nil) { - id value = objc_msgSend (objc_msgSend ((id)mono_dead_letter_class, alloc), init); + id value = id_objc_msgSend (id_objc_msgSend ((id)mono_dead_letter_class, alloc), init); objc_msgSend_id_id (dict, setObjectForKey, value, mono_dead_letter_key); - objc_msgSend (value, release); + id_objc_msgSend (value, release); } } @@ -127,13 +127,15 @@ mono_threads_init_dead_letter (void) class_addMethod (mono_dead_letter_class, dealloc, (IMP)mono_dead_letter_dealloc, "v@:"); objc_registerClassPair (mono_dead_letter_class); + id (*id_objc_msgSend)(id, SEL) = (id (*)(id, SEL)) objc_msgSend; + // create the dict key - pool = objc_msgSend (objc_msgSend (nsautoreleasepool, alloc), init); + pool = id_objc_msgSend (id_objc_msgSend (nsautoreleasepool, alloc), init); id (*objc_msgSend_char)(id, SEL, const char*) = (id (*)(id, SEL, const char*)) objc_msgSend; mono_dead_letter_key = objc_msgSend_char (nsstring, stringWithUTF8String, "mono-dead-letter"); - objc_msgSend (mono_dead_letter_key, retain); - objc_msgSend (pool, release); + id_objc_msgSend (mono_dead_letter_key, retain); + id_objc_msgSend (pool, release); } #endif diff --git a/msvc/Makefile.in b/msvc/Makefile.in index d089466949..455a459bbf 100644 --- a/msvc/Makefile.in +++ b/msvc/Makefile.in @@ -516,8 +516,8 @@ 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." -@ENABLE_MSVC_FALSE@install-exec-local: @ENABLE_MSVC_FALSE@clean-local: +@ENABLE_MSVC_FALSE@install-exec-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index c2e37e5b4dece5518857dcd546a6f5e1a5723748..997712e35bcd5688405f0be458d264b43fc614a5 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aK31p^B!1GCL=p_J7FGskoB7oXv;bi%2Mz!L delta 22 dcmeyri1Gg-#tj_m>}CoE7FGrpoB7oXv;bir2Mz!L diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 4b5853c1d7..490b7dc7f5 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -9b10e2f843290ba167a32db005fdd532e1ef8e1f \ No newline at end of file +bc994db68ef75d297a12d7754b17f8a0a0c6f9c3 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index a7f2798e9e..37401a2680 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.284\n" +"Project-Id-Version: mono 6.0.0.293\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-06-06 08:08+0000\n" +"POT-Creation-Date: 2019-06-08 08:06+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 1bcd38c00abb01c1cc1422ec38a3092f14d90f05..21912c63d2bc0d26a57bb5e5f40ab51af00add1b 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*)0?dEUXO7Hm6QyYzF{tA_#;4 delta 22 ecmaF1gXP%{mJM-J+07ITEUXMHHm6QyYzF{t76^m@ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 7d08cc7f90..9cb47aa238 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -a94486f75e80f406755249a0bcb76d7590076261 \ No newline at end of file +8984b60408acd86d498dda237d9ba800795c3c17 \ No newline at end of file