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

Commit

Permalink
Update assemblies for mono/mono:2018-10@5ee0e28b breakage
Browse files Browse the repository at this point in the history
Context: dotnet/android#2253
Context: https://jenkins.mono-project.com/job/xamarin-android-pr-builder-release/840/API_20Compatibility_20Checks/

The mono/mono@5ee0e28b bump introduces breaking changes across
multiple assemblies.  Time to review and approve these changes. :-)

The `mscorlib.dll` and `System.Core.dll` assemblies removed the
`System.Runtime.InteropServices._MemberInfo` interface type, which we
are [told][0] is OK:

	<h3>Type Changed: System.Type</h3>
	<p>Removed interface:</p>
	<pre>
		<span class='removed removed-interface breaking' data-is-breaking>Runtime.InteropServices._MemberInfo</span>
	</pre>
	<!-- Plus many many others... -->

`System.ServiceModel.dll` was [updated to use referencesource][1]
which caused the remove of undocumented constructors on the
`SynchronizedCollection<T>` and `SynchronizedReadOnlyCollection<T>`
types:

	<h3>Type Changed: System.Collections.Generic.SynchronizedCollection`1</h3>
	<p>Removed constructor:</p>
	<pre>
		<span class='removed removed-constructor breaking' data-is-breaking>public SynchronizedCollection`1 (object, System.Collections.Generic.List&lt;T&gt;, bool);</span>
	</pre>

	<h3>Type Changed: System.Collections.Generic.SynchronizedReadOnlyCollection`1</h3>
	<p>Removed constructor:</p>
	<pre>
		<span class='removed removed-constructor breaking' data-is-breaking>public SynchronizedReadOnlyCollection`1 (object, System.Collections.Generic.List&lt;T&gt;, bool);</span>
	</pre>

The various `System.Drawing` types located within
`Mono.Android.dll` were *moved* into the new
`System.Drawing.Common.dll` facade assembly:

	<h2>Namespace System.Drawing</h2>
	<h3>Removed Type <span class='breaking' data-is-breaking>System.Drawing.Color</span></h3>
	<h3>Removed Type <span class='breaking' data-is-breaking>System.Drawing.ColorConverter</span></h3>
	<h3>Removed Type <span class='breaking' data-is-breaking>System.Drawing.KnownColor</span></h3>
	<h3>Removed Type <span class='breaking' data-is-breaking>System.Drawing.Point</span></h3>
	<h3>Removed Type <span class='breaking' data-is-breaking>System.Drawing.PointF</span></h3>
	<h3>Removed Type <span class='breaking' data-is-breaking>System.Drawing.Rectangle</span></h3>
	<h3>Removed Type <span class='breaking' data-is-breaking>System.Drawing.RectangleF</span></h3>
	<h3>Removed Type <span class='breaking' data-is-breaking>System.Drawing.Size</span></h3>
	<h3>Removed Type <span class='breaking' data-is-breaking>System.Drawing.SizeF</span></h3>
	<h3>Removed Type <span class='breaking' data-is-breaking>System.Drawing.SystemColors</span></h3>

Update and flush the reference API based on mono/mono@5ee0e28b
and xamarin/xamarin-android/master@dad7be94.

[0]: https://xamarinhq.slack.com/archives/C03CEGRUW/p1550259372788900
[1]: mono/mono#10021
  • Loading branch information
jonpryor committed Feb 19, 2019
1 parent 3fe4561 commit c704b2a
Show file tree
Hide file tree
Showing 7 changed files with 940 additions and 4,284 deletions.
6 changes: 3 additions & 3 deletions reference/Java.Interop.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</attribute>
<attribute name="System.Reflection.AssemblyCompanyAttribute">
<properties>
<property name="Company" value="Xamarin Inc." />
<property name="Company" value="Microsoft Corporation" />
</properties>
</attribute>
<attribute name="System.Reflection.AssemblyConfigurationAttribute">
Expand All @@ -21,7 +21,7 @@
</attribute>
<attribute name="System.Reflection.AssemblyCopyrightAttribute">
<properties>
<property name="Copyright" value="Xamarin Inc." />
<property name="Copyright" value="Microsoft Corporation" />
</properties>
</attribute>
<attribute name="System.Reflection.AssemblyDescriptionAttribute">
Expand All @@ -41,7 +41,7 @@
</attribute>
<attribute name="System.Reflection.AssemblyTrademarkAttribute">
<properties>
<property name="Trademark" value="Xamarin" />
<property name="Trademark" value="Microsoft Corporation" />
</properties>
</attribute>
<attribute name="System.Runtime.CompilerServices.CompilationRelaxationsAttribute">
Expand Down
2,859 changes: 62 additions & 2,797 deletions reference/Mono.Android.xml

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions reference/Mono.Data.Sqlite.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<assemblies>
<assembly name="Mono.Data.Sqlite" version="4.0.0.0">
<assembly name="Mono.Data.Sqlite" version="2.0.5.0">
<attributes>
<attribute name="System.CLSCompliantAttribute">
<properties>
Expand Down Expand Up @@ -80,12 +80,6 @@
<property name="Value" value="False" />
</properties>
</attribute>
<attribute name="System.Runtime.Versioning.TargetFrameworkAttribute">
<properties>
<property name="FrameworkDisplayName" value="Xamarin.Android v9.0 Support" />
<property name="FrameworkName" value="MonoAndroid,Version=v9.0" />
</properties>
</attribute>
<attribute name="System.Security.AllowPartiallyTrustedCallersAttribute" />
<attribute name="System.Security.SecurityRulesAttribute">
<properties>
Expand Down
1 change: 0 additions & 1 deletion reference/System.Core.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16199,7 +16199,6 @@
<class name="ComAwareEventInfo" type="class" base="System.Reflection.EventInfo" charset="Ansi" layout="Auto">
<interfaces>
<interface name="System.Reflection.ICustomAttributeProvider" />
<interface name="System.Runtime.InteropServices._MemberInfo" />
</interfaces>
<constructors>
<constructor name=".ctor(System.Type, System.String)" attrib="6278">
Expand Down
19 changes: 0 additions & 19 deletions reference/System.ServiceModel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3027,13 +3027,6 @@
</parameter>
</parameters>
</constructor>
<constructor name=".ctor(System.Object, System.Collections.Generic.List`1[T], System.Boolean)" attrib="6278">
<parameters>
<parameter name="syncRoot" position="0" attrib="0" type="System.Object" />
<parameter name="list" position="1" attrib="0" type="System.Collections.Generic.List`1[T]" />
<parameter name="makeCopy" position="2" attrib="0" type="System.Boolean" />
</parameters>
</constructor>
</constructors>
<properties>
<property name="Count" attrib="0" ptype="System.Int32">
Expand Down Expand Up @@ -3097,7 +3090,6 @@
</parameters>
</method>
<method name="GetEnumerator()" attrib="486" virtual="true" returntype="System.Collections.Generic.IEnumerator`1[T]">
<attributes />
<parameters />
</method>
<method name="IndexOf(T)" attrib="486" virtual="true" returntype="System.Int32">
Expand Down Expand Up @@ -3214,7 +3206,6 @@
</parameters>
</method>
<method name="ClearItems()" attrib="196" virtual="true" is-override="true" returntype="System.Void">
<attributes />
<parameters />
</method>
<method name="Contains(K)" attrib="134" returntype="System.Boolean">
Expand All @@ -3228,7 +3219,6 @@
</parameters>
</method>
<method name="InsertItem(System.Int32, T)" attrib="196" virtual="true" is-override="true" returntype="System.Void">
<attributes />
<parameters>
<parameter name="index" position="0" attrib="0" type="System.Int32" />
<parameter name="item" position="1" attrib="0" type="T" />
Expand All @@ -3240,13 +3230,11 @@
</parameters>
</method>
<method name="RemoveItem(System.Int32)" attrib="196" virtual="true" is-override="true" returntype="System.Void">
<attributes />
<parameters>
<parameter name="index" position="0" attrib="0" type="System.Int32" />
</parameters>
</method>
<method name="SetItem(System.Int32, T)" attrib="196" virtual="true" is-override="true" returntype="System.Void">
<attributes />
<parameters>
<parameter name="index" position="0" attrib="0" type="System.Int32" />
<parameter name="item" position="1" attrib="0" type="T" />
Expand Down Expand Up @@ -3303,13 +3291,6 @@
</parameter>
</parameters>
</constructor>
<constructor name=".ctor(System.Object, System.Collections.Generic.List`1[T], System.Boolean)" attrib="6278">
<parameters>
<parameter name="sync_root" position="0" attrib="0" type="System.Object" />
<parameter name="list" position="1" attrib="0" type="System.Collections.Generic.List`1[T]" />
<parameter name="make_copy" position="2" attrib="0" type="System.Boolean" />
</parameters>
</constructor>
</constructors>
<properties>
<property name="Count" attrib="0" ptype="System.Int32">
Expand Down
26 changes: 23 additions & 3 deletions reference/System.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2105,6 +2105,11 @@
<property name="ProxyTypeName" value="System.Collections.Generic.QueueDebugView`1" />
</properties>
</attribute>
<attribute name="System.Runtime.CompilerServices.TypeForwardedFromAttribute">
<properties>
<property name="AssemblyFullName" value="System, Version=2.0.5.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</properties>
</attribute>
</attributes>
<interfaces>
<interface name="System.Collections.Generic.IEnumerable`1[T]" />
Expand Down Expand Up @@ -2985,6 +2990,11 @@
<property name="ProxyTypeName" value="System.Collections.Generic.StackDebugView`1" />
</properties>
</attribute>
<attribute name="System.Runtime.CompilerServices.TypeForwardedFromAttribute">
<properties>
<property name="AssemblyFullName" value="System, Version=2.0.5.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</properties>
</attribute>
</attributes>
<interfaces>
<interface name="System.Collections.Generic.IEnumerable`1[T]" />
Expand Down Expand Up @@ -23248,6 +23258,13 @@
</method>
</methods>
</property>
<property name="Filters" attrib="0" ptype="System.Collections.ObjectModel.Collection`1[System.String]">
<methods>
<method name="get_Filters()" attrib="2182" returntype="System.Collections.ObjectModel.Collection`1[System.String]">
<parameters />
</method>
</methods>
</property>
<property name="IncludeSubdirectories" attrib="0" ptype="System.Boolean">
<methods>
<method name="get_IncludeSubdirectories()" attrib="2182" returntype="System.Boolean">
Expand Down Expand Up @@ -23311,9 +23328,15 @@
<property name="SynchronizingObject" attrib="0" ptype="System.ComponentModel.ISynchronizeInvoke">
<methods>
<method name="get_SynchronizingObject()" attrib="2182" returntype="System.ComponentModel.ISynchronizeInvoke">
<attributes>
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
</attributes>
<parameters />
</method>
<method name="set_SynchronizingObject(System.ComponentModel.ISynchronizeInvoke)" attrib="2182" returntype="System.Void">
<attributes>
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
</attributes>
<parameters>
<parameter name="value" position="0" attrib="0" type="System.ComponentModel.ISynchronizeInvoke" />
</parameters>
Expand Down Expand Up @@ -43282,23 +43305,20 @@
</parameters>
</method>
<method name="Import(System.Byte[], System.String, System.Security.Cryptography.X509Certificates.X509KeyStorageFlags)" attrib="198" virtual="true" is-override="true" returntype="System.Void">
<attributes />
<parameters>
<parameter name="rawData" position="0" attrib="0" type="System.Byte[]" />
<parameter name="password" position="1" attrib="0" type="System.String" />
<parameter name="keyStorageFlags" position="2" attrib="0" type="System.Security.Cryptography.X509Certificates.X509KeyStorageFlags" />
</parameters>
</method>
<method name="Import(System.String, System.Security.SecureString, System.Security.Cryptography.X509Certificates.X509KeyStorageFlags)" attrib="198" virtual="true" is-override="true" returntype="System.Void">
<attributes />
<parameters>
<parameter name="fileName" position="0" attrib="0" type="System.String" />
<parameter name="password" position="1" attrib="0" type="System.Security.SecureString" />
<parameter name="keyStorageFlags" position="2" attrib="0" type="System.Security.Cryptography.X509Certificates.X509KeyStorageFlags" />
</parameters>
</method>
<method name="Import(System.String, System.String, System.Security.Cryptography.X509Certificates.X509KeyStorageFlags)" attrib="198" virtual="true" is-override="true" returntype="System.Void">
<attributes />
<parameters>
<parameter name="fileName" position="0" attrib="0" type="System.String" />
<parameter name="password" position="1" attrib="0" type="System.String" />
Expand Down
Loading

0 comments on commit c704b2a

Please sign in to comment.