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

Commit 7633fac

Browse files
committed
Remove Span<T> types; flush Xamarin.Android API
Context: dotnet/android#1732 Context: https://jenkins.mono-project.com/job/xamarin-android-pr-builder/3239/API_20Compatibility_20Checks/ The Mono runtime team had to remove the `System.Span<T>` and `System.Memory<T>` APIs from the mono/2018-02 branch recently. This removal caused a Xamarin.Android PR breakage because of the [removed API][0]. [0]: https://jenkins.mono-project.com/job/xamarin-android-pr-builder/3239/API_20Compatibility_20Checks/ Update `mscorlib.xml`, `System.xml`, and `System.Numerics.xml` so that the offending `Span<T>`-using members are removed. Additionally, flush API additions to `Java.Interop.dll` and `Mono.Android.dll` from API-28/v8.1.
1 parent 4068bbb commit 7633fac

File tree

5 files changed

+1108
-1105
lines changed

5 files changed

+1108
-1105
lines changed

reference/Java.Interop.xml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<attributes>
55
<attribute name="System.Diagnostics.DebuggableAttribute">
66
<properties>
7-
<property name="IsJITTrackingEnabled" value="IgnoreSymbolStoreSequencePoints" />
8-
<property name="IsJITOptimizerDisabled" value="IgnoreSymbolStoreSequencePoints" />
9-
<property name="DebuggingFlags" value="IgnoreSymbolStoreSequencePoints" />
7+
<property name="IsJITTrackingEnabled" value="EnableEditAndContinue, IgnoreSymbolStoreSequencePoints, DisableOptimizations, Default" />
8+
<property name="IsJITOptimizerDisabled" value="EnableEditAndContinue, IgnoreSymbolStoreSequencePoints, DisableOptimizations, Default" />
9+
<property name="DebuggingFlags" value="EnableEditAndContinue, IgnoreSymbolStoreSequencePoints, DisableOptimizations, Default" />
1010
</properties>
1111
</attribute>
1212
<attribute name="System.Reflection.AssemblyCompanyAttribute">
@@ -4520,6 +4520,13 @@
45204520
<parameter name="methods" position="2" attrib="0" type="System.String" />
45214521
</parameters>
45224522
</method>
4523+
<method name="TryRegisterNativeMembers(Java.Interop.JniType, System.Type, System.String)" attrib="132" returntype="System.Boolean">
4524+
<parameters>
4525+
<parameter name="nativeClass" position="0" attrib="0" type="Java.Interop.JniType" />
4526+
<parameter name="type" position="1" attrib="0" type="System.Type" />
4527+
<parameter name="methods" position="2" attrib="0" type="System.String" />
4528+
</parameters>
4529+
</method>
45234530
</methods>
45244531
</class>
45254532
<class name="JniValueManager" type="class" base="System.Object" abstract="true" charset="Ansi" layout="Auto">
@@ -5448,6 +5455,12 @@
54485455
<parameter name="runtime" position="0" attrib="0" type="System.Linq.Expressions.Expression" />
54495456
</parameters>
54505457
</constructor>
5458+
<constructor name=".ctor(System.Linq.Expressions.Expression, System.Linq.Expressions.Expression)" attrib="6278">
5459+
<parameters>
5460+
<parameter name="runtime" position="0" attrib="0" type="System.Linq.Expressions.Expression" />
5461+
<parameter name="vm" position="1" attrib="0" type="System.Linq.Expressions.Expression" />
5462+
</parameters>
5463+
</constructor>
54515464
</constructors>
54525465
<properties>
54535466
<property name="CleanupStatements" attrib="0" ptype="System.Collections.ObjectModel.Collection`1[System.Linq.Expressions.Expression]">
@@ -5490,6 +5503,16 @@
54905503
</method>
54915504
</methods>
54925505
</property>
5506+
<property name="ValueManager" attrib="0" ptype="System.Linq.Expressions.Expression">
5507+
<methods>
5508+
<method name="get_ValueManager()" attrib="2182" returntype="System.Linq.Expressions.Expression">
5509+
<attributes>
5510+
<attribute name="System.Runtime.CompilerServices.CompilerGeneratedAttribute" />
5511+
</attributes>
5512+
<parameters />
5513+
</method>
5514+
</methods>
5515+
</property>
54935516
</properties>
54945517
</class>
54955518
</classes>

0 commit comments

Comments
 (0)