From 95d5d1e053e6d1c7cad9abbf4071316aab76f28e Mon Sep 17 00:00:00 2001
From: Bernhard Urban <bernhard.urban@xamarin.com>
Date: Wed, 9 Aug 2017 19:42:39 +0200
Subject: [PATCH] update Mono.Security and mscorlib to match BCL changes

GetValueOrDefault () got removed from
System.Collections.Generic.Dictionary`2, but is now available via
CollectionExtensions.

For more context, see:
https://github.com/xamarin/xamarin-android/pull/631#issuecomment-321101620
---
 reference/Mono.Security.xml | 22 -----------
 reference/mscorlib.xml      | 74 +++++++++++++++++++++++++++++++------
 2 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/reference/Mono.Security.xml b/reference/Mono.Security.xml
index dfb8df6..80fe45b 100644
--- a/reference/Mono.Security.xml
+++ b/reference/Mono.Security.xml
@@ -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" />
@@ -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">
diff --git a/reference/mscorlib.xml b/reference/mscorlib.xml
index 21bac61..ae2f3a4 100644
--- a/reference/mscorlib.xml
+++ b/reference/mscorlib.xml
@@ -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>
@@ -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" />
@@ -100800,7 +100851,6 @@
               </attribute>
             </attributes>
             <interfaces>
-              <interface name="System.Runtime.InteropServices._Exception" />
               <interface name="System.Runtime.Serialization.ISerializable" />
             </interfaces>
             <constructors>