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

Commit c704b2a

Browse files
jonpryorjonpryor
committed
Update assemblies for mono/mono:2018-10@5ee0e28b breakage
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
1 parent 3fe4561 commit c704b2a

File tree

7 files changed

+940
-4284
lines changed

7 files changed

+940
-4284
lines changed

‎reference/Java.Interop.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</attribute>
1212
<attribute name="System.Reflection.AssemblyCompanyAttribute">
1313
<properties>
14-
<property name="Company" value="Xamarin Inc." />
14+
<property name="Company" value="Microsoft Corporation" />
1515
</properties>
1616
</attribute>
1717
<attribute name="System.Reflection.AssemblyConfigurationAttribute">
@@ -21,7 +21,7 @@
2121
</attribute>
2222
<attribute name="System.Reflection.AssemblyCopyrightAttribute">
2323
<properties>
24-
<property name="Copyright" value="Xamarin Inc." />
24+
<property name="Copyright" value="Microsoft Corporation" />
2525
</properties>
2626
</attribute>
2727
<attribute name="System.Reflection.AssemblyDescriptionAttribute">
@@ -41,7 +41,7 @@
4141
</attribute>
4242
<attribute name="System.Reflection.AssemblyTrademarkAttribute">
4343
<properties>
44-
<property name="Trademark" value="Xamarin" />
44+
<property name="Trademark" value="Microsoft Corporation" />
4545
</properties>
4646
</attribute>
4747
<attribute name="System.Runtime.CompilerServices.CompilationRelaxationsAttribute">

‎reference/Mono.Android.xml

Lines changed: 62 additions & 2797 deletions
Large diffs are not rendered by default.

‎reference/Mono.Data.Sqlite.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<assemblies>
3-
<assembly name="Mono.Data.Sqlite" version="4.0.0.0">
3+
<assembly name="Mono.Data.Sqlite" version="2.0.5.0">
44
<attributes>
55
<attribute name="System.CLSCompliantAttribute">
66
<properties>
@@ -80,12 +80,6 @@
8080
<property name="Value" value="False" />
8181
</properties>
8282
</attribute>
83-
<attribute name="System.Runtime.Versioning.TargetFrameworkAttribute">
84-
<properties>
85-
<property name="FrameworkDisplayName" value="Xamarin.Android v9.0 Support" />
86-
<property name="FrameworkName" value="MonoAndroid,Version=v9.0" />
87-
</properties>
88-
</attribute>
8983
<attribute name="System.Security.AllowPartiallyTrustedCallersAttribute" />
9084
<attribute name="System.Security.SecurityRulesAttribute">
9185
<properties>

‎reference/System.Core.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16199,7 +16199,6 @@
1619916199
<class name="ComAwareEventInfo" type="class" base="System.Reflection.EventInfo" charset="Ansi" layout="Auto">
1620016200
<interfaces>
1620116201
<interface name="System.Reflection.ICustomAttributeProvider" />
16202-
<interface name="System.Runtime.InteropServices._MemberInfo" />
1620316202
</interfaces>
1620416203
<constructors>
1620516204
<constructor name=".ctor(System.Type, System.String)" attrib="6278">

‎reference/System.ServiceModel.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3027,13 +3027,6 @@
30273027
</parameter>
30283028
</parameters>
30293029
</constructor>
3030-
<constructor name=".ctor(System.Object, System.Collections.Generic.List`1[T], System.Boolean)" attrib="6278">
3031-
<parameters>
3032-
<parameter name="syncRoot" position="0" attrib="0" type="System.Object" />
3033-
<parameter name="list" position="1" attrib="0" type="System.Collections.Generic.List`1[T]" />
3034-
<parameter name="makeCopy" position="2" attrib="0" type="System.Boolean" />
3035-
</parameters>
3036-
</constructor>
30373030
</constructors>
30383031
<properties>
30393032
<property name="Count" attrib="0" ptype="System.Int32">
@@ -3097,7 +3090,6 @@
30973090
</parameters>
30983091
</method>
30993092
<method name="GetEnumerator()" attrib="486" virtual="true" returntype="System.Collections.Generic.IEnumerator`1[T]">
3100-
<attributes />
31013093
<parameters />
31023094
</method>
31033095
<method name="IndexOf(T)" attrib="486" virtual="true" returntype="System.Int32">
@@ -3214,7 +3206,6 @@
32143206
</parameters>
32153207
</method>
32163208
<method name="ClearItems()" attrib="196" virtual="true" is-override="true" returntype="System.Void">
3217-
<attributes />
32183209
<parameters />
32193210
</method>
32203211
<method name="Contains(K)" attrib="134" returntype="System.Boolean">
@@ -3228,7 +3219,6 @@
32283219
</parameters>
32293220
</method>
32303221
<method name="InsertItem(System.Int32, T)" attrib="196" virtual="true" is-override="true" returntype="System.Void">
3231-
<attributes />
32323222
<parameters>
32333223
<parameter name="index" position="0" attrib="0" type="System.Int32" />
32343224
<parameter name="item" position="1" attrib="0" type="T" />
@@ -3240,13 +3230,11 @@
32403230
</parameters>
32413231
</method>
32423232
<method name="RemoveItem(System.Int32)" attrib="196" virtual="true" is-override="true" returntype="System.Void">
3243-
<attributes />
32443233
<parameters>
32453234
<parameter name="index" position="0" attrib="0" type="System.Int32" />
32463235
</parameters>
32473236
</method>
32483237
<method name="SetItem(System.Int32, T)" attrib="196" virtual="true" is-override="true" returntype="System.Void">
3249-
<attributes />
32503238
<parameters>
32513239
<parameter name="index" position="0" attrib="0" type="System.Int32" />
32523240
<parameter name="item" position="1" attrib="0" type="T" />
@@ -3303,13 +3291,6 @@
33033291
</parameter>
33043292
</parameters>
33053293
</constructor>
3306-
<constructor name=".ctor(System.Object, System.Collections.Generic.List`1[T], System.Boolean)" attrib="6278">
3307-
<parameters>
3308-
<parameter name="sync_root" position="0" attrib="0" type="System.Object" />
3309-
<parameter name="list" position="1" attrib="0" type="System.Collections.Generic.List`1[T]" />
3310-
<parameter name="make_copy" position="2" attrib="0" type="System.Boolean" />
3311-
</parameters>
3312-
</constructor>
33133294
</constructors>
33143295
<properties>
33153296
<property name="Count" attrib="0" ptype="System.Int32">

‎reference/System.xml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2105,6 +2105,11 @@
21052105
<property name="ProxyTypeName" value="System.Collections.Generic.QueueDebugView`1" />
21062106
</properties>
21072107
</attribute>
2108+
<attribute name="System.Runtime.CompilerServices.TypeForwardedFromAttribute">
2109+
<properties>
2110+
<property name="AssemblyFullName" value="System, Version=2.0.5.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2111+
</properties>
2112+
</attribute>
21082113
</attributes>
21092114
<interfaces>
21102115
<interface name="System.Collections.Generic.IEnumerable`1[T]" />
@@ -2985,6 +2990,11 @@
29852990
<property name="ProxyTypeName" value="System.Collections.Generic.StackDebugView`1" />
29862991
</properties>
29872992
</attribute>
2993+
<attribute name="System.Runtime.CompilerServices.TypeForwardedFromAttribute">
2994+
<properties>
2995+
<property name="AssemblyFullName" value="System, Version=2.0.5.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2996+
</properties>
2997+
</attribute>
29882998
</attributes>
29892999
<interfaces>
29903000
<interface name="System.Collections.Generic.IEnumerable`1[T]" />
@@ -23248,6 +23258,13 @@
2324823258
</method>
2324923259
</methods>
2325023260
</property>
23261+
<property name="Filters" attrib="0" ptype="System.Collections.ObjectModel.Collection`1[System.String]">
23262+
<methods>
23263+
<method name="get_Filters()" attrib="2182" returntype="System.Collections.ObjectModel.Collection`1[System.String]">
23264+
<parameters />
23265+
</method>
23266+
</methods>
23267+
</property>
2325123268
<property name="IncludeSubdirectories" attrib="0" ptype="System.Boolean">
2325223269
<methods>
2325323270
<method name="get_IncludeSubdirectories()" attrib="2182" returntype="System.Boolean">
@@ -23311,9 +23328,15 @@
2331123328
<property name="SynchronizingObject" attrib="0" ptype="System.ComponentModel.ISynchronizeInvoke">
2331223329
<methods>
2331323330
<method name="get_SynchronizingObject()" attrib="2182" returntype="System.ComponentModel.ISynchronizeInvoke">
23331+
<attributes>
23332+
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
23333+
</attributes>
2331423334
<parameters />
2331523335
</method>
2331623336
<method name="set_SynchronizingObject(System.ComponentModel.ISynchronizeInvoke)" attrib="2182" returntype="System.Void">
23337+
<attributes>
23338+
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
23339+
</attributes>
2331723340
<parameters>
2331823341
<parameter name="value" position="0" attrib="0" type="System.ComponentModel.ISynchronizeInvoke" />
2331923342
</parameters>
@@ -43282,23 +43305,20 @@
4328243305
</parameters>
4328343306
</method>
4328443307
<method name="Import(System.Byte[], System.String, System.Security.Cryptography.X509Certificates.X509KeyStorageFlags)" attrib="198" virtual="true" is-override="true" returntype="System.Void">
43285-
<attributes />
4328643308
<parameters>
4328743309
<parameter name="rawData" position="0" attrib="0" type="System.Byte[]" />
4328843310
<parameter name="password" position="1" attrib="0" type="System.String" />
4328943311
<parameter name="keyStorageFlags" position="2" attrib="0" type="System.Security.Cryptography.X509Certificates.X509KeyStorageFlags" />
4329043312
</parameters>
4329143313
</method>
4329243314
<method name="Import(System.String, System.Security.SecureString, System.Security.Cryptography.X509Certificates.X509KeyStorageFlags)" attrib="198" virtual="true" is-override="true" returntype="System.Void">
43293-
<attributes />
4329443315
<parameters>
4329543316
<parameter name="fileName" position="0" attrib="0" type="System.String" />
4329643317
<parameter name="password" position="1" attrib="0" type="System.Security.SecureString" />
4329743318
<parameter name="keyStorageFlags" position="2" attrib="0" type="System.Security.Cryptography.X509Certificates.X509KeyStorageFlags" />
4329843319
</parameters>
4329943320
</method>
4330043321
<method name="Import(System.String, System.String, System.Security.Cryptography.X509Certificates.X509KeyStorageFlags)" attrib="198" virtual="true" is-override="true" returntype="System.Void">
43301-
<attributes />
4330243322
<parameters>
4330343323
<parameter name="fileName" position="0" attrib="0" type="System.String" />
4330443324
<parameter name="password" position="1" attrib="0" type="System.String" />

0 commit comments

Comments
 (0)