diff options
author | monojenkins <jo.shields+jenkins@xamarin.com> | 2019-05-27 20:29:11 +0300 |
---|---|---|
committer | monojenkins <jo.shields+jenkins@xamarin.com> | 2019-05-27 20:29:11 +0300 |
commit | 1f4e9b8eae30012053149485fc499e1a37a6bc6b (patch) | |
tree | 1471521ce53d6b14db27f9682e7497e1c12a4190 | |
parent | ab4601eded43649d4854b07368f9a6c76d03b8a6 (diff) |
Apply changes from https://github.com/mono/mono/pull/14660 to API snapshot
-rw-r--r-- | profiles/monodroid/System.cs | 2 | ||||
-rw-r--r-- | profiles/monodroid/mscorlib.cs | 22 | ||||
-rw-r--r-- | profiles/monotouch/System.cs | 2 | ||||
-rw-r--r-- | profiles/monotouch/mscorlib.cs | 22 | ||||
-rw-r--r-- | profiles/net_4_x/System.cs | 2 | ||||
-rw-r--r-- | profiles/net_4_x/mscorlib.cs | 22 |
6 files changed, 36 insertions, 36 deletions
diff --git a/profiles/monodroid/System.cs b/profiles/monodroid/System.cs index d8995b6..39bee98 100644 --- a/profiles/monodroid/System.cs +++ b/profiles/monodroid/System.cs @@ -6063,6 +6063,7 @@ namespace System.Net Tls = 192, Tls11 = 768, Tls12 = 3072, + Tls13 = 12288, } public partial class ServicePoint { @@ -9082,6 +9083,7 @@ namespace System.Security.Authentication Tls11 = 768, [System.MonoTODOAttribute("unsupported")] Tls12 = 3072, + Tls13 = 12288, } } namespace System.Security.Authentication.ExtendedProtection diff --git a/profiles/monodroid/mscorlib.cs b/profiles/monodroid/mscorlib.cs index 79eb0d4..14a8e95 100644 --- a/profiles/monodroid/mscorlib.cs +++ b/profiles/monodroid/mscorlib.cs @@ -3603,7 +3603,7 @@ namespace System [System.Diagnostics.DebuggerDisplayAttribute("{ToString(),raw}")] [System.Diagnostics.DebuggerTypeProxyAttribute("System.MemoryDebugView<T>")] [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct Memory<T> + public readonly partial struct Memory<T> : System.IEquatable<System.Memory<T>> { private readonly object _dummy; private readonly int _dummyPrimitive; @@ -3975,18 +3975,9 @@ namespace System public override bool Equals(object value) { throw null; } public bool Equals(System.Range other) { throw null; } public override int GetHashCode() { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public System.Range.OffsetAndLength GetOffsetAndLength(int length) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public [System.Runtime.CompilerServices.TupleElementNamesAttribute(new string[]{ "Offset", "Length"})]System.ValueTuple<int, int> GetOffsetAndLength(int length) { throw null; } public static System.Range StartAt(System.Index start) { throw null; } public override string ToString() { throw null; } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct OffsetAndLength - { - private readonly int _dummyPrimitive; - public OffsetAndLength(int offset, int length) { throw null; } - public int Length { get { throw null; } } - public int Offset { get { throw null; } } - public void Deconstruct(out int offset, out int length) { throw null; } - } } [System.SerializableAttribute] public partial class RankException : System.SystemException @@ -3999,7 +3990,7 @@ namespace System [System.Diagnostics.DebuggerDisplayAttribute("{ToString(),raw}")] [System.Diagnostics.DebuggerTypeProxyAttribute("System.MemoryDebugView<T>")] [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct ReadOnlyMemory<T> + public readonly partial struct ReadOnlyMemory<T> : System.IEquatable<System.ReadOnlyMemory<T>> { private readonly object _dummy; private readonly int _dummyPrimitive; @@ -7142,6 +7133,7 @@ namespace System.Collections.ObjectModel bool System.Collections.IList.IsReadOnly { get { throw null; } } object System.Collections.IList.this[int index] { get { throw null; } set { } } public void Add(T item) { } + public void AddRange(System.Collections.Generic.IEnumerable<T> collection) { } public void Clear() { } protected virtual void ClearItems() { } public bool Contains(T item) { throw null; } @@ -7150,9 +7142,15 @@ namespace System.Collections.ObjectModel public int IndexOf(T item) { throw null; } public void Insert(int index, T item) { } protected virtual void InsertItem(int index, T item) { } + protected virtual void InsertItemsRange(int index, System.Collections.Generic.IEnumerable<T> collection) { } + public void InsertRange(int index, System.Collections.Generic.IEnumerable<T> collection) { } public bool Remove(T item) { throw null; } public void RemoveAt(int index) { } protected virtual void RemoveItem(int index) { } + protected virtual void RemoveItemsRange(int index, int count) { } + public void RemoveRange(int index, int count) { } + protected virtual void ReplaceItemsRange(int index, int count, System.Collections.Generic.IEnumerable<T> collection) { } + public void ReplaceRange(int index, int count, System.Collections.Generic.IEnumerable<T> collection) { } protected virtual void SetItem(int index, T item) { } void System.Collections.ICollection.CopyTo(System.Array array, int index) { } System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } diff --git a/profiles/monotouch/System.cs b/profiles/monotouch/System.cs index fa5158d..1cc25cb 100644 --- a/profiles/monotouch/System.cs +++ b/profiles/monotouch/System.cs @@ -6066,6 +6066,7 @@ namespace System.Net Tls = 192, Tls11 = 768, Tls12 = 3072, + Tls13 = 12288, } public partial class ServicePoint { @@ -9085,6 +9086,7 @@ namespace System.Security.Authentication Tls11 = 768, [System.MonoTODOAttribute("unsupported")] Tls12 = 3072, + Tls13 = 12288, } } namespace System.Security.Authentication.ExtendedProtection diff --git a/profiles/monotouch/mscorlib.cs b/profiles/monotouch/mscorlib.cs index e984880..61c5363 100644 --- a/profiles/monotouch/mscorlib.cs +++ b/profiles/monotouch/mscorlib.cs @@ -3583,7 +3583,7 @@ namespace System [System.Diagnostics.DebuggerDisplayAttribute("{ToString(),raw}")] [System.Diagnostics.DebuggerTypeProxyAttribute("System.MemoryDebugView<T>")] [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct Memory<T> + public readonly partial struct Memory<T> : System.IEquatable<System.Memory<T>> { private readonly object _dummy; private readonly int _dummyPrimitive; @@ -3955,18 +3955,9 @@ namespace System public override bool Equals(object value) { throw null; } public bool Equals(System.Range other) { throw null; } public override int GetHashCode() { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public System.Range.OffsetAndLength GetOffsetAndLength(int length) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public [System.Runtime.CompilerServices.TupleElementNamesAttribute(new string[]{ "Offset", "Length"})]System.ValueTuple<int, int> GetOffsetAndLength(int length) { throw null; } public static System.Range StartAt(System.Index start) { throw null; } public override string ToString() { throw null; } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct OffsetAndLength - { - private readonly int _dummyPrimitive; - public OffsetAndLength(int offset, int length) { throw null; } - public int Length { get { throw null; } } - public int Offset { get { throw null; } } - public void Deconstruct(out int offset, out int length) { throw null; } - } } [System.SerializableAttribute] public partial class RankException : System.SystemException @@ -3979,7 +3970,7 @@ namespace System [System.Diagnostics.DebuggerDisplayAttribute("{ToString(),raw}")] [System.Diagnostics.DebuggerTypeProxyAttribute("System.MemoryDebugView<T>")] [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct ReadOnlyMemory<T> + public readonly partial struct ReadOnlyMemory<T> : System.IEquatable<System.ReadOnlyMemory<T>> { private readonly object _dummy; private readonly int _dummyPrimitive; @@ -7113,6 +7104,7 @@ namespace System.Collections.ObjectModel bool System.Collections.IList.IsReadOnly { get { throw null; } } object System.Collections.IList.this[int index] { get { throw null; } set { } } public void Add(T item) { } + public void AddRange(System.Collections.Generic.IEnumerable<T> collection) { } public void Clear() { } protected virtual void ClearItems() { } public bool Contains(T item) { throw null; } @@ -7121,9 +7113,15 @@ namespace System.Collections.ObjectModel public int IndexOf(T item) { throw null; } public void Insert(int index, T item) { } protected virtual void InsertItem(int index, T item) { } + protected virtual void InsertItemsRange(int index, System.Collections.Generic.IEnumerable<T> collection) { } + public void InsertRange(int index, System.Collections.Generic.IEnumerable<T> collection) { } public bool Remove(T item) { throw null; } public void RemoveAt(int index) { } protected virtual void RemoveItem(int index) { } + protected virtual void RemoveItemsRange(int index, int count) { } + public void RemoveRange(int index, int count) { } + protected virtual void ReplaceItemsRange(int index, int count, System.Collections.Generic.IEnumerable<T> collection) { } + public void ReplaceRange(int index, int count, System.Collections.Generic.IEnumerable<T> collection) { } protected virtual void SetItem(int index, T item) { } void System.Collections.ICollection.CopyTo(System.Array array, int index) { } System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } diff --git a/profiles/net_4_x/System.cs b/profiles/net_4_x/System.cs index bcf98b9..faf5375 100644 --- a/profiles/net_4_x/System.cs +++ b/profiles/net_4_x/System.cs @@ -8767,6 +8767,7 @@ namespace System.Net Tls = 192, Tls11 = 768, Tls12 = 3072, + Tls13 = 12288, } public partial class ServicePoint { @@ -12224,6 +12225,7 @@ namespace System.Security.Authentication Tls11 = 768, [System.MonoTODOAttribute("unsupported")] Tls12 = 3072, + Tls13 = 12288, } } namespace System.Security.Authentication.ExtendedProtection diff --git a/profiles/net_4_x/mscorlib.cs b/profiles/net_4_x/mscorlib.cs index d437c71..363cfcb 100644 --- a/profiles/net_4_x/mscorlib.cs +++ b/profiles/net_4_x/mscorlib.cs @@ -3649,7 +3649,7 @@ namespace System [System.Diagnostics.DebuggerDisplayAttribute("{ToString(),raw}")] [System.Diagnostics.DebuggerTypeProxyAttribute("System.MemoryDebugView<T>")] [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct Memory<T> + public readonly partial struct Memory<T> : System.IEquatable<System.Memory<T>> { private readonly object _dummy; private readonly int _dummyPrimitive; @@ -4021,18 +4021,9 @@ namespace System public override bool Equals(object value) { throw null; } public bool Equals(System.Range other) { throw null; } public override int GetHashCode() { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public System.Range.OffsetAndLength GetOffsetAndLength(int length) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public [System.Runtime.CompilerServices.TupleElementNamesAttribute(new string[]{ "Offset", "Length"})]System.ValueTuple<int, int> GetOffsetAndLength(int length) { throw null; } public static System.Range StartAt(System.Index start) { throw null; } public override string ToString() { throw null; } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct OffsetAndLength - { - private readonly int _dummyPrimitive; - public OffsetAndLength(int offset, int length) { throw null; } - public int Length { get { throw null; } } - public int Offset { get { throw null; } } - public void Deconstruct(out int offset, out int length) { throw null; } - } } [System.SerializableAttribute] public partial class RankException : System.SystemException @@ -4045,7 +4036,7 @@ namespace System [System.Diagnostics.DebuggerDisplayAttribute("{ToString(),raw}")] [System.Diagnostics.DebuggerTypeProxyAttribute("System.MemoryDebugView<T>")] [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct ReadOnlyMemory<T> + public readonly partial struct ReadOnlyMemory<T> : System.IEquatable<System.ReadOnlyMemory<T>> { private readonly object _dummy; private readonly int _dummyPrimitive; @@ -7170,6 +7161,7 @@ namespace System.Collections.ObjectModel bool System.Collections.IList.IsReadOnly { get { throw null; } } object System.Collections.IList.this[int index] { get { throw null; } set { } } public void Add(T item) { } + public void AddRange(System.Collections.Generic.IEnumerable<T> collection) { } public void Clear() { } protected virtual void ClearItems() { } public bool Contains(T item) { throw null; } @@ -7178,9 +7170,15 @@ namespace System.Collections.ObjectModel public int IndexOf(T item) { throw null; } public void Insert(int index, T item) { } protected virtual void InsertItem(int index, T item) { } + protected virtual void InsertItemsRange(int index, System.Collections.Generic.IEnumerable<T> collection) { } + public void InsertRange(int index, System.Collections.Generic.IEnumerable<T> collection) { } public bool Remove(T item) { throw null; } public void RemoveAt(int index) { } protected virtual void RemoveItem(int index) { } + protected virtual void RemoveItemsRange(int index, int count) { } + public void RemoveRange(int index, int count) { } + protected virtual void ReplaceItemsRange(int index, int count, System.Collections.Generic.IEnumerable<T> collection) { } + public void ReplaceRange(int index, int count, System.Collections.Generic.IEnumerable<T> collection) { } protected virtual void SetItem(int index, T item) { } void System.Collections.ICollection.CopyTo(System.Array array, int index) { } System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } |