diff options
author | monojenkins <jo.shields+jenkins@xamarin.com> | 2019-02-20 13:40:46 +0300 |
---|---|---|
committer | monojenkins <jo.shields+jenkins@xamarin.com> | 2019-02-20 13:40:46 +0300 |
commit | 8ebbcd36189c91ed42ebcf3e747a44087091772b (patch) | |
tree | 82d822ac96797c596c74b4402bdbd3dab5e5a997 /profiles/monotouch | |
parent | 21cefb1e36bc20d718afdd0e2cf46dcaaebe0040 (diff) |
Apply changes from https://github.com/mono/mono/pull/13022 to API snapshot
Diffstat (limited to 'profiles/monotouch')
-rw-r--r-- | profiles/monotouch/System.Core.cs | 1 | ||||
-rw-r--r-- | profiles/monotouch/System.Data.cs | 1 | ||||
-rw-r--r-- | profiles/monotouch/System.cs | 31 | ||||
-rw-r--r-- | profiles/monotouch/mscorlib.cs | 19 |
4 files changed, 44 insertions, 8 deletions
diff --git a/profiles/monotouch/System.Core.cs b/profiles/monotouch/System.Core.cs index eadee20..c58c4cc 100644 --- a/profiles/monotouch/System.Core.cs +++ b/profiles/monotouch/System.Core.cs @@ -2974,6 +2974,7 @@ namespace System.Security.Cryptography.X509Certificates } public static partial class RSACertificateExtensions { + public static System.Security.Cryptography.X509Certificates.X509Certificate2 CopyWithPrivateKey(this System.Security.Cryptography.X509Certificates.X509Certificate2 certificate, System.Security.Cryptography.RSA privateKey) { throw null; } public static System.Security.Cryptography.RSA GetRSAPrivateKey(this System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { throw null; } public static System.Security.Cryptography.RSA GetRSAPublicKey(this System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { throw null; } } diff --git a/profiles/monotouch/System.Data.cs b/profiles/monotouch/System.Data.cs index 0df643f..c209da0 100644 --- a/profiles/monotouch/System.Data.cs +++ b/profiles/monotouch/System.Data.cs @@ -808,6 +808,7 @@ namespace System.Data object System.ComponentModel.ICustomTypeDescriptor.GetPropertyOwner(System.ComponentModel.PropertyDescriptor pd) { throw null; } } [System.ComponentModel.DefaultPropertyAttribute("DataSetName")] + [System.ComponentModel.ToolboxItemAttribute("Microsoft.VSDesigner.Data.VS.DataSetToolboxItem, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [System.Xml.Serialization.XmlRootAttribute("DataSet")] [System.Xml.Serialization.XmlSchemaProviderAttribute("GetDataSetSchema")] [System.SerializableAttribute] diff --git a/profiles/monotouch/System.cs b/profiles/monotouch/System.cs index 7739942..b49d71b 100644 --- a/profiles/monotouch/System.cs +++ b/profiles/monotouch/System.cs @@ -8474,6 +8474,7 @@ namespace System.Net.Sockets public static System.Threading.Tasks.Task ConnectAsync(this System.Net.Sockets.Socket socket, string host, int port) { throw null; } public static System.Threading.Tasks.Task<int> ReceiveAsync(this System.Net.Sockets.Socket socket, System.ArraySegment<byte> buffer, System.Net.Sockets.SocketFlags socketFlags) { throw null; } public static System.Threading.Tasks.Task<int> ReceiveAsync(this System.Net.Sockets.Socket socket, System.Collections.Generic.IList<System.ArraySegment<byte>> buffers, System.Net.Sockets.SocketFlags socketFlags) { throw null; } + public static System.Threading.Tasks.ValueTask<int> ReceiveAsync(this System.Net.Sockets.Socket socket, System.Memory<byte> memory, System.Net.Sockets.SocketFlags socketFlags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public static System.Threading.Tasks.Task<System.Net.Sockets.SocketReceiveFromResult> ReceiveFromAsync(this System.Net.Sockets.Socket socket, System.ArraySegment<byte> buffer, System.Net.Sockets.SocketFlags socketFlags, System.Net.EndPoint remoteEndPoint) { throw null; } public static System.Threading.Tasks.Task<System.Net.Sockets.SocketReceiveMessageFromResult> ReceiveMessageFromAsync(this System.Net.Sockets.Socket socket, System.ArraySegment<byte> buffer, System.Net.Sockets.SocketFlags socketFlags, System.Net.EndPoint remoteEndPoint) { throw null; } public static System.Threading.Tasks.Task<int> SendAsync(this System.Net.Sockets.Socket socket, System.ArraySegment<byte> buffer, System.Net.Sockets.SocketFlags socketFlags) { throw null; } @@ -9244,6 +9245,23 @@ namespace System.Security.Cryptography } namespace System.Security.Cryptography.X509Certificates { + public sealed partial class CertificateRequest + { + public CertificateRequest(System.Security.Cryptography.X509Certificates.X500DistinguishedName subjectName, System.Security.Cryptography.ECDsa key, System.Security.Cryptography.HashAlgorithmName hashAlgorithm) { } + public CertificateRequest(System.Security.Cryptography.X509Certificates.X500DistinguishedName subjectName, System.Security.Cryptography.RSA key, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, System.Security.Cryptography.RSASignaturePadding padding) { } + public CertificateRequest(System.Security.Cryptography.X509Certificates.X500DistinguishedName subjectName, System.Security.Cryptography.X509Certificates.PublicKey publicKey, System.Security.Cryptography.HashAlgorithmName hashAlgorithm) { } + public CertificateRequest(string subjectName, System.Security.Cryptography.ECDsa key, System.Security.Cryptography.HashAlgorithmName hashAlgorithm) { } + public CertificateRequest(string subjectName, System.Security.Cryptography.RSA key, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, System.Security.Cryptography.RSASignaturePadding padding) { } + public System.Collections.ObjectModel.Collection<System.Security.Cryptography.X509Certificates.X509Extension> CertificateExtensions { get { throw null; } } + public System.Security.Cryptography.HashAlgorithmName HashAlgorithm { get { throw null; } } + public System.Security.Cryptography.X509Certificates.PublicKey PublicKey { get { throw null; } } + public System.Security.Cryptography.X509Certificates.X500DistinguishedName SubjectName { get { throw null; } } + public System.Security.Cryptography.X509Certificates.X509Certificate2 Create(System.Security.Cryptography.X509Certificates.X500DistinguishedName issuerName, System.Security.Cryptography.X509Certificates.X509SignatureGenerator generator, System.DateTimeOffset notBefore, System.DateTimeOffset notAfter, byte[] serialNumber) { throw null; } + public System.Security.Cryptography.X509Certificates.X509Certificate2 Create(System.Security.Cryptography.X509Certificates.X509Certificate2 issuerCertificate, System.DateTimeOffset notBefore, System.DateTimeOffset notAfter, byte[] serialNumber) { throw null; } + public System.Security.Cryptography.X509Certificates.X509Certificate2 CreateSelfSigned(System.DateTimeOffset notBefore, System.DateTimeOffset notAfter) { throw null; } + public byte[] CreateSigningRequest() { throw null; } + public byte[] CreateSigningRequest(System.Security.Cryptography.X509Certificates.X509SignatureGenerator signatureGenerator) { throw null; } + } [System.FlagsAttribute] public enum OpenFlags { @@ -9651,6 +9669,16 @@ namespace System.Security.Cryptography.X509Certificates Offline = 2, Online = 1, } + public abstract partial class X509SignatureGenerator + { + protected X509SignatureGenerator() { } + public System.Security.Cryptography.X509Certificates.PublicKey PublicKey { get { throw null; } } + protected abstract System.Security.Cryptography.X509Certificates.PublicKey BuildPublicKey(); + public static System.Security.Cryptography.X509Certificates.X509SignatureGenerator CreateForECDsa(System.Security.Cryptography.ECDsa key) { throw null; } + public static System.Security.Cryptography.X509Certificates.X509SignatureGenerator CreateForRSA(System.Security.Cryptography.RSA key, System.Security.Cryptography.RSASignaturePadding signaturePadding) { throw null; } + public abstract byte[] GetSignatureAlgorithmIdentifier(System.Security.Cryptography.HashAlgorithmName hashAlgorithm); + public abstract byte[] SignData(byte[] data, System.Security.Cryptography.HashAlgorithmName hashAlgorithm); + } public sealed partial class X509Store : System.IDisposable { public X509Store() { } @@ -9660,9 +9688,12 @@ namespace System.Security.Cryptography.X509Certificates public X509Store(System.Security.Cryptography.X509Certificates.StoreLocation storeLocation) { } public X509Store(System.Security.Cryptography.X509Certificates.StoreName storeName) { } public X509Store(System.Security.Cryptography.X509Certificates.StoreName storeName, System.Security.Cryptography.X509Certificates.StoreLocation storeLocation) { } + public X509Store(System.Security.Cryptography.X509Certificates.StoreName storeName, System.Security.Cryptography.X509Certificates.StoreLocation storeLocation, System.Security.Cryptography.X509Certificates.OpenFlags openFlags) { } public X509Store(string storeName) { } public X509Store(string storeName, System.Security.Cryptography.X509Certificates.StoreLocation storeLocation) { } + public X509Store(string storeName, System.Security.Cryptography.X509Certificates.StoreLocation storeLocation, System.Security.Cryptography.X509Certificates.OpenFlags openFlags) { } public System.Security.Cryptography.X509Certificates.X509Certificate2Collection Certificates { get { throw null; } } + public bool IsOpen { get { throw null; } } public System.Security.Cryptography.X509Certificates.StoreLocation Location { get { throw null; } } public string Name { get { throw null; } } [System.MonoTODOAttribute("Mono's stores are fully managed. Always returns IntPtr.Zero.")] diff --git a/profiles/monotouch/mscorlib.cs b/profiles/monotouch/mscorlib.cs index 4dd347d..ff36a36 100644 --- a/profiles/monotouch/mscorlib.cs +++ b/profiles/monotouch/mscorlib.cs @@ -2124,9 +2124,9 @@ namespace System Utc = 1, } [System.SerializableAttribute] - public partial struct DateTimeOffset : System.IComparable, System.IComparable<System.DateTimeOffset>, System.IEquatable<System.DateTimeOffset>, System.IFormattable, System.Runtime.Serialization.IDeserializationCallback, System.Runtime.Serialization.ISerializable + public readonly partial struct DateTimeOffset : System.IComparable, System.IComparable<System.DateTimeOffset>, System.IEquatable<System.DateTimeOffset>, System.IFormattable, System.Runtime.Serialization.IDeserializationCallback, System.Runtime.Serialization.ISerializable { - private int _dummyPrimitive; + private readonly int _dummyPrimitive; public static readonly System.DateTimeOffset MaxValue; public static readonly System.DateTimeOffset MinValue; public static readonly System.DateTimeOffset UnixEpoch; @@ -2447,9 +2447,9 @@ namespace System } [System.SerializableAttribute] [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct Double : System.IComparable, System.IComparable<double>, System.IConvertible, System.IEquatable<double>, System.IFormattable + public readonly partial struct Double : System.IComparable, System.IComparable<double>, System.IConvertible, System.IEquatable<double>, System.IFormattable { - private double _dummyPrimitive; + private readonly double _dummyPrimitive; public const double Epsilon = 4.94065645841247E-324; public const double MaxValue = 1.7976931348623157E+308; public const double MinValue = -1.7976931348623157E+308; @@ -4185,9 +4185,9 @@ namespace System } [System.SerializableAttribute] [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct Single : System.IComparable, System.IComparable<float>, System.IConvertible, System.IEquatable<float>, System.IFormattable + public readonly partial struct Single : System.IComparable, System.IComparable<float>, System.IConvertible, System.IEquatable<float>, System.IFormattable { - private float _dummyPrimitive; + private readonly float _dummyPrimitive; public const float Epsilon = 1.401298E-45f; public const float MaxValue = 3.40282347E+38f; public const float MinValue = -3.40282347E+38f; @@ -4553,9 +4553,9 @@ namespace System } [System.SerializableAttribute] [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct TimeSpan : System.IComparable, System.IComparable<System.TimeSpan>, System.IEquatable<System.TimeSpan>, System.IFormattable + public readonly partial struct TimeSpan : System.IComparable, System.IComparable<System.TimeSpan>, System.IEquatable<System.TimeSpan>, System.IFormattable { - private int _dummyPrimitive; + private readonly int _dummyPrimitive; public static readonly System.TimeSpan MaxValue; public static readonly System.TimeSpan MinValue; public const long TicksPerDay = (long)864000000000; @@ -20619,6 +20619,7 @@ namespace System.Security.Cryptography public virtual bool TryDecrypt(System.ReadOnlySpan<byte> data, System.Span<byte> destination, System.Security.Cryptography.RSAEncryptionPadding padding, out int bytesWritten) { throw null; } public virtual bool TryEncrypt(System.ReadOnlySpan<byte> data, System.Span<byte> destination, System.Security.Cryptography.RSAEncryptionPadding padding, out int bytesWritten) { throw null; } protected virtual bool TryHashData(System.ReadOnlySpan<byte> data, System.Span<byte> destination, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, out int bytesWritten) { throw null; } + public virtual bool TrySignData(System.ReadOnlySpan<byte> data, System.Span<byte> destination, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, System.Security.Cryptography.RSASignaturePadding padding, out int bytesWritten) { throw null; } public virtual bool TrySignHash(System.ReadOnlySpan<byte> hash, System.Span<byte> destination, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, System.Security.Cryptography.RSASignaturePadding padding, out int bytesWritten) { throw null; } public bool VerifyData(byte[] data, byte[] signature, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, System.Security.Cryptography.RSASignaturePadding padding) { throw null; } public virtual bool VerifyData(byte[] data, int offset, int count, byte[] signature, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, System.Security.Cryptography.RSASignaturePadding padding) { throw null; } @@ -23366,6 +23367,7 @@ namespace System.Threading private readonly object _dummy; public System.Threading.CancellationToken Token { get { throw null; } } public void Dispose() { } + public System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } public override bool Equals(object obj) { throw null; } public bool Equals(System.Threading.CancellationTokenRegistration other) { throw null; } public override int GetHashCode() { throw null; } @@ -24114,6 +24116,7 @@ namespace System.Threading public bool Change(uint dueTime, uint period) { throw null; } public void Dispose() { } public bool Dispose(System.Threading.WaitHandle notifyObject) { throw null; } + public System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } } [System.Runtime.InteropServices.ComVisibleAttribute(true)] public delegate void TimerCallback(object state); |