-
Notifications
You must be signed in to change notification settings - Fork 532
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dev/grendel/native-tracing
* main: Bump to xamarin/xamarin-android-binutils/L_18.1.4-8.0.0@758d2e7 (#8885) [Mono.Android] Bind API-VanillaIceCream Beta 1 (#8891) [AndroidToolTask] Log tool output as error (#8861) [Xamarin.Android.Build.Tasks] Remove "Xamarin" from messages (#8884) [Mono.Android] Bind API-VanillaIceCream Developer Preview 2 (#8741) Bump to dotnet/installer@22ffa42d6c 9.0.100-preview.4.24221.5 (#8887)
- Loading branch information
Showing
30 changed files
with
245,619 additions
and
117 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule xamarin-android-tools
updated
from 05f9a9 to 1ea4e3
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| using System; | ||
| using Android.Runtime; | ||
|
|
||
| namespace Java.Util; | ||
|
|
||
| #if ANDROID_35 | ||
| public partial interface IList | ||
| { | ||
| private static Delegate? cb_reversed; | ||
|
|
||
| #pragma warning disable 0169 | ||
| [global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android35.0")] | ||
| private static Delegate GetReversedHandler () | ||
| { | ||
| if (cb_reversed == null) | ||
| cb_reversed = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Reversed)); | ||
| return cb_reversed; | ||
| } | ||
|
|
||
| [global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android35.0")] | ||
| private static IntPtr n_Reversed (IntPtr jnienv, IntPtr native__this) | ||
| { | ||
| var __this = global::Java.Lang.Object.GetObject<Java.Util.IList> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; | ||
| return JNIEnv.ToLocalJniHandle (__this.Reversed ()); | ||
| } | ||
| #pragma warning restore 0169 | ||
|
|
||
| // This gets generated as: | ||
| // return Android.Runtime.JavaList.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef)!; | ||
| // instead of: | ||
| // return global::Java.Lang.Object.GetObject<Java.Util.ISequencedCollection> (__rm.Handle, JniHandleOwnership.TransferLocalRef)!; | ||
|
|
||
| // Metadata.xml XPath method reference: path="/api/package[@name='java.util']/interface[@name='List']/method[@name='reversed' and count(parameter)=0]" | ||
| [global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android35.0")] | ||
| [Register ("reversed", "()Ljava/util/List;", "GetReversedHandler:Java.Util.IList, Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", ApiSince = 35)] | ||
| unsafe Java.Util.ISequencedCollection Java.Util.ISequencedCollection.Reversed () | ||
| { | ||
| const string __id = "reversed.()Ljava/util/List;"; | ||
| try { | ||
| var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); | ||
| return global::Java.Lang.Object.GetObject<Java.Util.ISequencedCollection> (__rm.Handle, JniHandleOwnership.TransferLocalRef)!; | ||
| } finally { | ||
| } | ||
| } | ||
| } | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| using System; | ||
| using Android.Runtime; | ||
|
|
||
| namespace Java.Util; | ||
|
|
||
| #if ANDROID_35 | ||
| public partial interface ISortedMap | ||
| { | ||
| private static Delegate? cb_reversed; | ||
|
|
||
| #pragma warning disable 0169 | ||
| [global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android35.0")] | ||
| private static Delegate GetReversedHandler () | ||
| { | ||
| if (cb_reversed == null) | ||
| cb_reversed = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Reversed)); | ||
| return cb_reversed; | ||
| } | ||
|
|
||
| [global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android35.0")] | ||
| private static IntPtr n_Reversed (IntPtr jnienv, IntPtr native__this) | ||
| { | ||
| var __this = global::Java.Lang.Object.GetObject<Java.Util.ISortedMap> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; | ||
| return JNIEnv.ToLocalJniHandle (__this.Reversed ()); | ||
| } | ||
| #pragma warning restore 0169 | ||
|
|
||
| // This gets generated as: | ||
| // return Android.Runtime.JavaDictionary.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef)!; | ||
| // instead of: | ||
| // return global::Java.Lang.Object.GetObject<Java.Util.ISequencedMap> (__rm.Handle, JniHandleOwnership.TransferLocalRef)!; | ||
|
|
||
| // Metadata.xml XPath method reference: path="/api/package[@name='java.util']/interface[@name='SortedMap']/method[@name='reversed' and count(parameter)=0]" | ||
| [global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android35.0")] | ||
| [Register ("reversed", "()Ljava/util/SortedMap;", "GetReversedHandler:Java.Util.ISortedMap, Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", ApiSince = 35)] | ||
| unsafe Java.Util.ISequencedMap Java.Util.ISequencedMap.Reversed () | ||
| { | ||
| const string __id = "reversed.()Ljava/util/SortedMap;"; | ||
| try { | ||
| var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); | ||
| return global::Java.Lang.Object.GetObject<Java.Util.ISequencedMap> (__rm.Handle, JniHandleOwnership.TransferLocalRef)!; | ||
| } finally { | ||
| } | ||
| } | ||
| } | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.