Skip to content
This repository has been archived by the owner on Mar 8, 2021. It is now read-only.

Commit

Permalink
Update Mono.Security & mscorlib for mono/2017-06 BCL changes (#6)
Browse files Browse the repository at this point in the history 
Context: dotnet/android#723

[`corefx` removed ``Dictionary`2.GetValueOrDefault()``][cfx17275] in
favor of using extension methods of the same name within
`System.Collections.Generic.CollectionExtensions`, and mono/2017-06
is using the updated corefx sources.

[cfx17275]: https://github.com/dotnet/corefx/issues/17275#issuecomment-291636863

@marek-safar [deems this as not a breaking change][1]:

[1]: dotnet/android#631 (comment)

>  It breaks at binary compatibility level but not sure we made such strong promise.

Update `reference/mscorlib.xml` to be consistent with mono/2017-06.

Additionally, synchronize `reference/Mono.Security.xml` with mono/2017-06.
We don't consider `Mono.Security.dll` to be part of our stable API.
  • Loading branch information
@lewurm @jonpryor
lewurm authored and jonpryor committed Aug 9, 2017
1 parent 6fe9b17 commit ed8d914
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 34 deletions.
22 changes: 0 additions & 22 deletions reference/Mono.Security.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4259,16 +4259,6 @@
<parameter name="settings" position="2" attrib="4112" type="Mono.Security.Interface.MonoTlsSettings" optional="true" defaultValue="NULL" />
</parameters>
</method>
<method name="GetDefaultProvider()" attrib="150" static="true" returntype="Mono.Security.Interface.MonoTlsProvider">
<attributes>
<attribute name="System.ObsoleteAttribute">
<properties>
<property name="Message" value="Use GetProvider() instead." />
</properties>
</attribute>
</attributes>
<parameters />
</method>
<method name="GetMonoSslStream(System.Net.Security.SslStream)" attrib="150" static="true" returntype="Mono.Security.Interface.IMonoSslStream">
<parameters>
<parameter name="stream" position="0" attrib="0" type="System.Net.Security.SslStream" />
Expand All @@ -4295,18 +4285,6 @@
<parameter name="provider" position="0" attrib="0" type="System.String" />
</parameters>
</method>
<method name="SetDefaultProvider(System.String)" attrib="150" static="true" returntype="System.Void">
<attributes>
<attribute name="System.ObsoleteAttribute">
<properties>
<property name="Message" value="Use Initialize(string provider) instead." />
</properties>
</attribute>
</attributes>
<parameters>
<parameter name="name" position="0" attrib="0" type="System.String" />
</parameters>
</method>
</methods>
</class>
<class name="MonoTlsSettings" type="class" base="System.Object" sealed="true" charset="Ansi" layout="Auto">
Expand Down
74 changes: 62 additions & 12 deletions reference/mscorlib.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29420,6 +29420,68 @@
</namespace>
<namespace name="System.Collections.Generic">
<classes>
<class name="CollectionExtensions" type="class" base="System.Object" sealed="true" abstract="true" charset="Ansi" layout="Auto">
<attributes>
<attribute name="System.Runtime.CompilerServices.ExtensionAttribute" />
</attributes>
<methods>
<method name="GetValueOrDefault(System.Collections.Generic.IReadOnlyDictionary`2[TKey,TValue], TKey)" attrib="150" static="true" returntype="TValue">
<attributes>
<attribute name="System.Runtime.CompilerServices.ExtensionAttribute" />
</attributes>
<parameters>
<parameter name="dictionary" position="0" attrib="0" type="System.Collections.Generic.IReadOnlyDictionary`2[TKey,TValue]" direction="this" />
<parameter name="key" position="1" attrib="0" type="TKey" />
</parameters>
<generic-parameters>
<generic-parameter name="TKey" attributes="0" />
<generic-parameter name="TValue" attributes="0" />
</generic-parameters>
</method>
<method name="GetValueOrDefault(System.Collections.Generic.IReadOnlyDictionary`2[TKey,TValue], TKey, TValue)" attrib="150" static="true" returntype="TValue">
<attributes>
<attribute name="System.Runtime.CompilerServices.ExtensionAttribute" />
</attributes>
<parameters>
<parameter name="dictionary" position="0" attrib="0" type="System.Collections.Generic.IReadOnlyDictionary`2[TKey,TValue]" direction="this" />
<parameter name="key" position="1" attrib="0" type="TKey" />
<parameter name="defaultValue" position="2" attrib="0" type="TValue" />
</parameters>
<generic-parameters>
<generic-parameter name="TKey" attributes="0" />
<generic-parameter name="TValue" attributes="0" />
</generic-parameters>
</method>
<method name="Remove(System.Collections.Generic.IDictionary`2[TKey,TValue], TKey, out TValue&amp;)" attrib="150" static="true" returntype="System.Boolean">
<attributes>
<attribute name="System.Runtime.CompilerServices.ExtensionAttribute" />
</attributes>
<parameters>
<parameter name="dictionary" position="0" attrib="0" type="System.Collections.Generic.IDictionary`2[TKey,TValue]" direction="this" />
<parameter name="key" position="1" attrib="0" type="TKey" />
<parameter name="value" position="2" attrib="2" type="TValue" direction="out" />
</parameters>
<generic-parameters>
<generic-parameter name="TKey" attributes="0" />
<generic-parameter name="TValue" attributes="0" />
</generic-parameters>
</method>
<method name="TryAdd(System.Collections.Generic.IDictionary`2[TKey,TValue], TKey, TValue)" attrib="150" static="true" returntype="System.Boolean">
<attributes>
<attribute name="System.Runtime.CompilerServices.ExtensionAttribute" />
</attributes>
<parameters>
<parameter name="dictionary" position="0" attrib="0" type="System.Collections.Generic.IDictionary`2[TKey,TValue]" direction="this" />
<parameter name="key" position="1" attrib="0" type="TKey" />
<parameter name="value" position="2" attrib="0" type="TValue" />
</parameters>
<generic-parameters>
<generic-parameter name="TKey" attributes="0" />
<generic-parameter name="TValue" attributes="0" />
</generic-parameters>
</method>
</methods>
</class>
<class name="Comparer`1" type="class" base="System.Object" abstract="true" serializable="true" charset="Ansi" layout="Auto">
<attributes />
<interfaces>
Expand Down Expand Up @@ -29614,17 +29676,6 @@
<parameter name="context" position="1" attrib="0" type="System.Runtime.Serialization.StreamingContext" />
</parameters>
</method>
<method name="GetValueOrDefault(TKey)" attrib="134" returntype="TValue">
<parameters>
<parameter name="key" position="0" attrib="0" type="TKey" />
</parameters>
</method>
<method name="GetValueOrDefault(TKey, TValue)" attrib="134" returntype="TValue">
<parameters>
<parameter name="key" position="0" attrib="0" type="TKey" />
<parameter name="defaultValue" position="1" attrib="0" type="TValue" />
</parameters>
</method>
<method name="OnDeserialization(System.Object)" attrib="454" virtual="true" returntype="System.Void">
<parameters>
<parameter name="sender" position="0" attrib="0" type="System.Object" />
Expand Down Expand Up @@ -100800,7 +100851,6 @@
</attribute>
</attributes>
<interfaces>
<interface name="System.Runtime.InteropServices._Exception" />
<interface name="System.Runtime.Serialization.ISerializable" />
</interfaces>
<constructors>
Expand Down

0 comments on commit ed8d914

Please sign in to comment.