mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.0.0.293

Browse Source 
Former-commit-id: c73c6d59ea27405c8ec2975fc933d2a9a447e603
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-06-08 08:45:03 +00:00
parent 7de0679779
commit 76c6505a64
70 changed files with 132 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
e4dbd55a6935d98c1061117e8bc216643726030d 8a367a10d831ba50730c5291b24e29d1f4d445d3

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
662a404734cf8813c639a09f84523e7ab398aaf0 a04bb48f853b87c4bc402467b1ac180fd2ca01ce

2
external/api-snapshot/profiles/monodroid/System.Core.cs.REMOVED.git-id vendored
View File

@ -1 +1 @@
cd6b4d3f8c136b6d4635b6d9e4ee3fb53317ad1f 0f27d5dca93a66ef6d5377c8ded4782c7bddc1e6

2
external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id vendored
View File

@ -1 +1 @@
44384220745bdb3ead5e68f414891ec50eec5569 505ae17b8dc98c3bbf1edd670f5bcc78ed694c38

2
external/api-snapshot/profiles/monotouch/System.Core.cs.REMOVED.git-id vendored
View File

@ -1 +1 @@
44f13ddec9a8d9c04a955ae30eeba3a40f62c228 7778ed32622d805dcf7b92ebc3cb615205382a38

2
external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id vendored
View File

@ -1 +1 @@
e1a3482dd9bf1a8d93cbd3aa5d470cfbc6f3ad69 ad43bd0bc249bd936072912d1338451bbadf2f3c

2
external/api-snapshot/profiles/net_4_x/System.Core.cs.REMOVED.git-id vendored
View File

@ -1 +1 @@
85e53fa31ae86cfa7512a7e8078a02f4174f02ec 1d07f529e45ff235d033ff3e01d19d8866105451

2
external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id vendored
View File

@ -1 +1 @@
75f7be33bba50e7c6162cc7a0d1340853e6959f9 c1b96e23e4f3169d32fd0b3e2e81f63a56107ccc

2
external/corefx/src/System.Net.Http/src/System/Net/Http/HttpClient.cs vendored
View File

@ -464,7 +464,7 @@ namespace System.Net.Http
throw; throw;
} }
return completionOption == HttpCompletionOption.ResponseContentRead ? return completionOption == HttpCompletionOption.ResponseContentRead && !string.Equals(request.Method.Method, "HEAD", StringComparison.OrdinalIgnoreCase) ?
FinishSendAsyncBuffered(sendTask, request, cts, disposeCts) : FinishSendAsyncBuffered(sendTask, request, cts, disposeCts) :
FinishSendAsyncUnbuffered(sendTask, request, cts, disposeCts); FinishSendAsyncUnbuffered(sendTask, request, cts, disposeCts);
} }

2
mcs/build/common/Consts.cs
View File

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

16
mcs/class/System.Core/System.Security.Cryptography.X509Certificates/RSACertificateExtensions.cs
View File

@ -30,7 +30,7 @@ namespace System.Security.Cryptography.X509Certificates
{ {
public static class RSACertificateExtensions public static class RSACertificateExtensions
{ {
public static RSA GetRSAPrivateKey(this X509Certificate2 certificate) public static RSA GetRSAPrivateKey (this X509Certificate2 certificate)
{ {
if (certificate == null) if (certificate == null)
throw new ArgumentNullException (nameof (certificate)); throw new ArgumentNullException (nameof (certificate));
@ -41,11 +41,21 @@ namespace System.Security.Cryptography.X509Certificates
return certificate.Impl.GetRSAPrivateKey (); return certificate.Impl.GetRSAPrivateKey ();
} }
public static RSA GetRSAPublicKey(this X509Certificate2 certificate) public static RSA GetRSAPublicKey (this X509Certificate2 certificate)
{ {
if (certificate == null) if (certificate == null)
throw new ArgumentNullException("certificate"); throw new ArgumentNullException (nameof (certificate));
return certificate.PublicKey.Key as RSA; 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 ();
}
} }
} }

4
mcs/class/System/System.Net/HttpListener.Mono.cs
View File

@ -80,8 +80,8 @@ namespace System.Net {
if (!File.Exists (pvk_file)) if (!File.Exists (pvk_file))
return null; return null;
var cert = new X509Certificate2 (cert_file); var cert = new X509Certificate2 (cert_file);
cert.PrivateKey = PrivateKey.CreateFromFile (pvk_file).RSA; var privateKey = PrivateKey.CreateFromFile (pvk_file).RSA;
certificate = cert; certificate = new X509Certificate2 ((X509Certificate2Impl)cert.Impl.CopyWithPrivateKey (privateKey));
return certificate; return certificate;
} catch { } catch {
// ignore errors // ignore errors

12
mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Impl.cs
View File

@ -83,6 +83,18 @@ namespace System.Security.Cryptography.X509Certificates
public abstract void AppendPrivateKeyInfo (StringBuilder sb); 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 (); public abstract void Reset ();
} }
} }

1
mcs/class/corlib/ReferenceSources/MethodBase.cs
View File

@ -8,6 +8,7 @@ using System.Text;
namespace System.Reflection namespace System.Reflection
{ {
[Serializable]
partial class MethodBase partial class MethodBase
{ {
// //

4
mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509CertificateImpl.cs
View File

@ -123,6 +123,10 @@ namespace System.Security.Cryptography.X509Certificates
public abstract byte[] Export (X509ContentType contentType, SafePasswordHandle password); 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) public sealed override bool Equals (object obj)
{ {
var other = obj as X509CertificateImpl; var other = obj as X509CertificateImpl;

2
mcs/class/corlib/Test/System/AppDomainTest.cs.REMOVED.git-id
View File

@ -1 +1 @@
7cd8184c6e906e7804425471eda17f75ade7c29f 581faec1da3d53a1134ed7c388537cfe101e007a

1
mcs/class/corlib/corefx/MethodInfo.cs
View File

@ -1,4 +1,5 @@
namespace System.Reflection { namespace System.Reflection {
[Serializable]
partial class MethodInfo { partial class MethodInfo {
internal virtual int GenericParameterCount => GetGenericArguments ().Length; internal virtual int GenericParameterCount => GetGenericArguments ().Length;
} }

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
0081ae35dbce9a10dcfd0a9a0a22e9690e19da56 8644f424bdc6234783527808eaf364fc4de93589

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
1cbed502c7bc7f3ee585f5a992af3439588908ee 04ac9ca261d369e0152cd185f329179981ae261c

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
de4610d6ed476d486c45dcda2a88ff584d1ff1c3 7f0002af7c012f940b77ef4faad9c0c76bbcd769

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