From 58960d2b24a8e7e103bfac196ae15ed398ec57d3 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 9 Dec 2024 19:44:28 +0100 Subject: [PATCH 001/140] research/investigation initial commit --- ...geLabelerOptions.cs => AutoMLImageLabelerOptions.net80.cs} | 2 ++ ...arin.Grpc.CodecGzip.cs => Xamarin.Grpc.CodecGzip.net80.cs} | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) rename source/com.google.mlkit/image-labeling-automl/Additions/{AutoMLImageLabelerOptions.cs => AutoMLImageLabelerOptions.net80.cs} (99%) rename source/io.grpc/grpc-api/Additions/{Xamarin.Grpc.CodecGzip.cs => Xamarin.Grpc.CodecGzip.net80.cs} (97%) diff --git a/source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.cs b/source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.net80.cs similarity index 99% rename from source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.cs rename to source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.net80.cs index 482c996ec..ceec30714 100644 --- a/source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.cs +++ b/source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.net80.cs @@ -2,6 +2,7 @@ using Android.Runtime; using Java.Interop; +#if ! NET9_0_OR_GREATER namespace Xamarin.Google.MLKit.Vision.Label.AutoML { @@ -79,3 +80,4 @@ static IntPtr n_SetConfidenceThreshold_F(IntPtr jnienv, IntPtr native__this, flo } } +#endif diff --git a/source/io.grpc/grpc-api/Additions/Xamarin.Grpc.CodecGzip.cs b/source/io.grpc/grpc-api/Additions/Xamarin.Grpc.CodecGzip.net80.cs similarity index 97% rename from source/io.grpc/grpc-api/Additions/Xamarin.Grpc.CodecGzip.cs rename to source/io.grpc/grpc-api/Additions/Xamarin.Grpc.CodecGzip.net80.cs index eb3419df1..610b23fe0 100644 --- a/source/io.grpc/grpc-api/Additions/Xamarin.Grpc.CodecGzip.cs +++ b/source/io.grpc/grpc-api/Additions/Xamarin.Grpc.CodecGzip.net80.cs @@ -4,6 +4,7 @@ using Android.Graphics; using Android.Runtime; +#if ! NET9_0_OR_GREATER namespace Xamarin.Grpc { @@ -39,4 +40,5 @@ public unsafe string MessageEncodingDecompressor } } } -} \ No newline at end of file +} +#endif \ No newline at end of file From 28cb1ecbf00ce1c34736aa507946b1dcd7238222 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 11 Dec 2024 16:01:13 +0100 Subject: [PATCH 002/140] androidx.activity --- .../Additions/ActivityResultContracts.cs | 238 +----------------- .../activity/Transforms/Metadata.xml | 98 +++++++- 2 files changed, 102 insertions(+), 234 deletions(-) diff --git a/source/androidx.activity/activity/Additions/ActivityResultContracts.cs b/source/androidx.activity/activity/Additions/ActivityResultContracts.cs index ee6c508a2..5205403cd 100644 --- a/source/androidx.activity/activity/Additions/ActivityResultContracts.cs +++ b/source/androidx.activity/activity/Additions/ActivityResultContracts.cs @@ -5,241 +5,17 @@ namespace AndroidX.Activity.Result.Contract { - /* - TODO: remove after virtual vs override support in metadata is added - must be removed after 16.9 is stable 20210302 - */ - internal delegate IntPtr _JniMarshal_PPLL_L(IntPtr jnienv, IntPtr klass, IntPtr p0, IntPtr p1); - - // Metadata.xml XPath class reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts']" - //[global::Android.Runtime.Register ("androidx/activity/result/contract/ActivityResultContracts", DoNotGenerateAcw=true)] - public sealed partial class ActivityResultContracts // : global::Java.Lang.Object - { - public partial class OpenDocument // : global::AndroidX.Activity.Result.Contract.ActivityResultContract - { - static Delegate cb_createIntent_Landroid_content_Context_arrayLjava_lang_String_; -#pragma warning disable 0169 - static Delegate GetCreateIntent_Landroid_content_Context_arrayLjava_lang_String_Handler () - { - if (cb_createIntent_Landroid_content_Context_arrayLjava_lang_String_ == null) - cb_createIntent_Landroid_content_Context_arrayLjava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPLL_L) n_CreateIntent_Landroid_content_Context_arrayLjava_lang_String_); - return cb_createIntent_Landroid_content_Context_arrayLjava_lang_String_; - } - - static IntPtr n_CreateIntent_Landroid_content_Context_arrayLjava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_context, IntPtr native_input) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var context = global::Java.Lang.Object.GetObject (native_context, JniHandleOwnership.DoNotTransfer); - var input = (string[]) JNIEnv.GetArray (native_input, JniHandleOwnership.DoNotTransfer, typeof (string)); - IntPtr __ret = JNIEnv.ToLocalJniHandle (__this.CreateIntent (context, input)); - if (input != null) - JNIEnv.CopyArray (input, native_input); - return __ret; - } -#pragma warning restore 0169 - - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.OpenDocument']/method[@name='createIntent' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.lang.String[]']]" - [Register ("createIntent", "(Landroid/content/Context;[Ljava/lang/String;)Landroid/content/Intent;", "GetCreateIntent_Landroid_content_Context_arrayLjava_lang_String_Handler")] - public - //virtual - override - unsafe global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, global::Java.Lang.Object input) - { - const string __id = "createIntent.(Landroid/content/Context;[Ljava/lang/String;)Landroid/content/Intent;"; - IntPtr native_input = JNIEnv.NewArray ((bool[]?)input); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue ((context == null) ? IntPtr.Zero : ((global::Java.Lang.Object) context).Handle); - __args [1] = new JniArgumentValue (native_input); - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - if (input != null) { - JNIEnv.CopyArray (native_input, (bool[]?) input); - JNIEnv.DeleteLocalRef (native_input); - } - global::System.GC.KeepAlive (context); - global::System.GC.KeepAlive (input); - } - } - } - - public partial class OpenMultipleDocuments // : global::AndroidX.Activity.Result.Contract.ActivityResultContract - { - static Delegate cb_createIntent_Landroid_content_Context_arrayLjava_lang_String_; -#pragma warning disable 0169 - static Delegate GetCreateIntent_Landroid_content_Context_arrayLjava_lang_String_Handler () - { - if (cb_createIntent_Landroid_content_Context_arrayLjava_lang_String_ == null) - cb_createIntent_Landroid_content_Context_arrayLjava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPLL_L) n_CreateIntent_Landroid_content_Context_arrayLjava_lang_String_); - return cb_createIntent_Landroid_content_Context_arrayLjava_lang_String_; - } - - static IntPtr n_CreateIntent_Landroid_content_Context_arrayLjava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_context, IntPtr native_input) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var context = global::Java.Lang.Object.GetObject (native_context, JniHandleOwnership.DoNotTransfer); - var input = (string[]) JNIEnv.GetArray (native_input, JniHandleOwnership.DoNotTransfer, typeof (string)); - IntPtr __ret = JNIEnv.ToLocalJniHandle (__this.CreateIntent (context, input)); - if (input != null) - JNIEnv.CopyArray (input, native_input); - return __ret; - } -#pragma warning restore 0169 - - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.OpenMultipleDocuments']/method[@name='createIntent' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.lang.String[]']]" - [Register ("createIntent", "(Landroid/content/Context;[Ljava/lang/String;)Landroid/content/Intent;", "GetCreateIntent_Landroid_content_Context_arrayLjava_lang_String_Handler")] - public - //virtual - override - unsafe global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, global::Java.Lang.Object input) - { - const string __id = "createIntent.(Landroid/content/Context;[Ljava/lang/String;)Landroid/content/Intent;"; - IntPtr native_input = JNIEnv.NewArray ((bool[]?) input); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue ((context == null) ? IntPtr.Zero : ((global::Java.Lang.Object) context).Handle); - __args [1] = new JniArgumentValue (native_input); - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - if (input != null) { - JNIEnv.CopyArray (native_input, (bool[]?) input); - JNIEnv.DeleteLocalRef (native_input); - } - global::System.GC.KeepAlive (context); - global::System.GC.KeepAlive (input); - } - } - - - - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.OpenMultipleDocuments']/method[@name='parseResult' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='android.content.Intent']]" - [Register("parseResult", "(ILandroid/content/Intent;)Ljava/util/List;", "")] - public override sealed unsafe global::Java.Lang.Object ParseResult(int resultCode, global::Android.Content.Intent intent) - { - const string __id = "parseResult.(ILandroid/content/Intent;)Ljava/util/List;"; - try - { - JniArgumentValue* __args = stackalloc JniArgumentValue[2]; - __args[0] = new JniArgumentValue(resultCode); - __args[1] = new JniArgumentValue((intent == null) ? IntPtr.Zero : ((global::Java.Lang.Object)intent).Handle); - var __rm = _members.InstanceMethods.InvokeNonvirtualObjectMethod(__id, this, __args); - return (global::Java.Lang.Object) global::Android.Runtime.JavaList.FromJniHandle(__rm.Handle, JniHandleOwnership.TransferLocalRef); - } - finally - { - global::System.GC.KeepAlive(intent); - } - } - } - - public partial class RequestMultiplePermissions // : global::AndroidX.Activity.Result.Contract.ActivityResultContract - { - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.RequestMultiplePermissions']/method[@name='createIntent' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.lang.String[]']]" - [Register ("createIntent", "(Landroid/content/Context;[Ljava/lang/String;)Landroid/content/Intent;", "")] - public - override - unsafe global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, global::Java.Lang.Object input) - { - const string __id = "createIntent.(Landroid/content/Context;[Ljava/lang/String;)Landroid/content/Intent;"; - IntPtr native_input = JNIEnv.NewArray ((bool[]?)input); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue ((context == null) ? IntPtr.Zero : ((global::Java.Lang.Object) context).Handle); - __args [1] = new JniArgumentValue (native_input); - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - if (input != null) { - JNIEnv.CopyArray (native_input, (bool[]?) input); - JNIEnv.DeleteLocalRef (native_input); - } - global::System.GC.KeepAlive (context); - global::System.GC.KeepAlive (input); - } - } - + public sealed partial class RequestMultiplePermissions + { + // public new global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, string input) + // { + // Java.Lang.String i = new Java.Lang.String(input); - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.RequestMultiplePermissions']/method[@name='parseResult' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='android.content.Intent']]" - [Register("parseResult", "(ILandroid/content/Intent;)Ljava/util/Map;", "")] - public override unsafe global::Java.Lang.Object ParseResult(int resultCode, global::Android.Content.Intent intent) - { - const string __id = "parseResult.(ILandroid/content/Intent;)Ljava/util/Map;"; - try - { - JniArgumentValue* __args = stackalloc JniArgumentValue[2]; - __args[0] = new JniArgumentValue(resultCode); - __args[1] = new JniArgumentValue((intent == null) ? IntPtr.Zero : ((global::Java.Lang.Object)intent).Handle); - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod(__id, this, __args); - return (global::Java.Lang.Object) global::Android.Runtime.JavaDictionary.FromJniHandle(__rm.Handle, JniHandleOwnership.TransferLocalRef); - } - finally - { - global::System.GC.KeepAlive(intent); - } - } + // return this.CreateIntent(context, i); + // } - } } -} -namespace AndroidX.Activity.Result.Contract -{ - // Metadata.xml XPath class reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts']" - // [global::Android.Runtime.Register ("androidx/activity/result/contract/ActivityResultContracts", DoNotGenerateAcw=true)] - public sealed partial class ActivityResultContracts //: global::Java.Lang.Object - { - public partial class CreateDocument - { - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.CreateDocument']/method[@name='createIntent' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.lang.String']]" - [Register ("createIntent", "(Landroid/content/Context;Ljava/lang/String;)Landroid/content/Intent;", "GetCreateIntent_Landroid_content_Context_Ljava_lang_String_Handler")] - public override unsafe global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, global::Java.Lang.Object input) - { - const string __id = "createIntent.(Landroid/content/Context;Ljava/lang/String;)Landroid/content/Intent;"; - IntPtr native_input = JNIEnv.NewString ((string) input); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue ((context == null) ? IntPtr.Zero : ((global::Java.Lang.Object) context).Handle); - __args [1] = new JniArgumentValue (native_input); - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - JNIEnv.DeleteLocalRef (native_input); - global::System.GC.KeepAlive (context); - global::System.GC.KeepAlive (input); - } - } - } - } } -namespace AndroidX.Activity.Result.Contract -{ - // Metadata.xml XPath class reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts']" - // [global::Android.Runtime.Register ("androidx/activity/result/contract/ActivityResultContracts", DoNotGenerateAcw=true)] - public sealed partial class ActivityResultContracts //: global::Java.Lang.Object - { - - public partial class PickMultipleVisualMedia //: global::AndroidX.Activity.Result.Contract.ActivityResultContract - { - - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.PickVisualMedia']/method[@name='parseResult' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='android.content.Intent']]" - [Register ("parseResult", "(ILandroid/content/Intent;)Landroid/net/Uri;", "")] - public override sealed unsafe global::Java.Lang.Object? ParseResult (int resultCode, global::Android.Content.Intent? intent) - { - const string __id = "parseResult.(ILandroid/content/Intent;)Landroid/net/Uri;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue (resultCode); - __args [1] = new JniArgumentValue ((intent == null) ? IntPtr.Zero : ((global::Java.Lang.Object) intent).Handle); - var __rm = _members.InstanceMethods.InvokeNonvirtualObjectMethod (__id, this, __args); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - global::System.GC.KeepAlive (intent); - } - } - } - } -} \ No newline at end of file diff --git a/source/androidx.activity/activity/Transforms/Metadata.xml b/source/androidx.activity/activity/Transforms/Metadata.xml index ecbde8246..3c001ed3c 100644 --- a/source/androidx.activity/activity/Transforms/Metadata.xml +++ b/source/androidx.activity/activity/Transforms/Metadata.xml @@ -228,9 +228,11 @@ Android.Content.Intent --> + + --> + --> + --> Java.Lang.Object + + + + + + Java.Lang.Object + + + + + + + Java.Lang.Object + + + override + + + Java.Lang.Object + + + override + + + Java.Lang.Object + + + override + + \ No newline at end of file From f237e90f4a23cdf4a8fd7f89201f18bb372b44fd Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 11 Dec 2024 16:08:31 +0100 Subject: [PATCH 003/140] corrected errors reported --- .../androidx.activity/activity/Transforms/Metadata.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/androidx.activity/activity/Transforms/Metadata.xml b/source/androidx.activity/activity/Transforms/Metadata.xml index 3c001ed3c..da74f1133 100644 --- a/source/androidx.activity/activity/Transforms/Metadata.xml +++ b/source/androidx.activity/activity/Transforms/Metadata.xml @@ -400,9 +400,11 @@ override + --> --> - - - Java.Lang.Object - - - Android.Content.Intent - - - Java.Lang.Object - - - - - - Java.Lang.Object - - - Android.Content.Intent - - - Java.Lang.Object - - - Java.Lang.Object - - Java.Lang.Object - - - - - + + + + + override - + + + + + + + Java.Lang.Object + + + + + + - override - - --> - + + - java.lang.Object + Java.Lang.Object + + + + + - java.lang.Object + Java.Lang.Object - --> + \ No newline at end of file From 14e2832aca8766724673fedb0fefa201a80279a2 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 17 Dec 2024 20:44:17 +0100 Subject: [PATCH 005/140] cleanup --- .../appcompat/Additions/ActionMenuView.cs | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 source/androidx.appcompat/appcompat/Additions/ActionMenuView.cs diff --git a/source/androidx.appcompat/appcompat/Additions/ActionMenuView.cs b/source/androidx.appcompat/appcompat/Additions/ActionMenuView.cs deleted file mode 100644 index c848d234d..000000000 --- a/source/androidx.appcompat/appcompat/Additions/ActionMenuView.cs +++ /dev/null @@ -1,29 +0,0 @@ -//using System; -//using Android.Runtime; - -//namespace AndroidX.Appcompat.AppCompat -//{ -// public partial class ActionMenuView -// { -// static IntPtr id_setPresenter_ActionMenuPresenter; -// [Register("setPresenter", "(Landroid/support/v7/widget/ActionMenuPresenter;)V", "GetSetPresenter_Landroid_support_v7_widget_ActionMenuPresenter")] -// public unsafe void SetPresenter(global::Android.Support.V7.Widget.ActionMenuPresenter presenter) -// { -// if (id_setPresenter_ActionMenuPresenter == IntPtr.Zero) -// id_setPresenter_ActionMenuPresenter = JNIEnv.GetMethodID(class_ref, "setPresenter", "(Landroid/support/v7/widget/ActionMenuPresenter;)V"); -// try -// { -// JValue* __args = stackalloc JValue[1]; -// __args[0] = new JValue(presenter); - -// if (GetType() == ThresholdType) -// JNIEnv.CallVoidMethod(((global::Java.Lang.Object)this).Handle, id_setPresenter_ActionMenuPresenter, __args); -// else -// JNIEnv.CallNonvirtualVoidMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "setPresenter", "(Landroid/support/v7/widget/ActionMenuPresenter;)V"), __args); -// } -// finally -// { -// } -// } -// } -//} From 3536668f592b7cd71e31cb98f31c696f1231c5af Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 18 Dec 2024 18:01:01 +0100 Subject: [PATCH 006/140] androidx.appcompat metadata --- .../appcompat/Additions/Additions.cs | 463 +----------------- .../appcompat/Transforms/Metadata.xml | 82 ++++ 2 files changed, 95 insertions(+), 450 deletions(-) diff --git a/source/androidx.appcompat/appcompat/Additions/Additions.cs b/source/androidx.appcompat/appcompat/Additions/Additions.cs index 56629484e..42f8d247f 100644 --- a/source/androidx.appcompat/appcompat/Additions/Additions.cs +++ b/source/androidx.appcompat/appcompat/Additions/Additions.cs @@ -3,421 +3,6 @@ using Java.Interop; using Java.Lang; -namespace AndroidX.AppCompat.View -{ - - public partial class SupportActionModeWrapper - { - static Delegate cb_getTitle; -#pragma warning disable 0169 - static Delegate GetGetTitleHandler () - { - if (cb_getTitle == null) - cb_getTitle = JNINativeWrapper.CreateDelegate ((Func)n_GetTitle); - return cb_getTitle; - } - - static IntPtr n_GetTitle (IntPtr jnienv, IntPtr native__this) - { - global::AndroidX.AppCompat.View.SupportActionModeWrapper __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return CharSequence.ToLocalJniHandle (__this.TitleFormatted); - } -#pragma warning restore 0169 - - static IntPtr id_getTitle; - public override unsafe global::Java.Lang.ICharSequence TitleFormatted { - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.appcompat.view']/class[@name='SupportActionModeWrapper']/method[@name='getTitle' and count(parameter)=0]" - [Register ("getTitle", "()Ljava/lang/CharSequence;", "GetGetTitleHandler")] - get { - if (id_getTitle == IntPtr.Zero) - id_getTitle = JNIEnv.GetMethodID (class_ref, "getTitle", "()Ljava/lang/CharSequence;"); - try { - - if (GetType () == ThresholdType) - return global::Java.Lang.Object.GetObject (JNIEnv.CallObjectMethod (((global::Java.Lang.Object)this).Handle, id_getTitle), JniHandleOwnership.TransferLocalRef); - else - return global::Java.Lang.Object.GetObject (JNIEnv.CallNonvirtualObjectMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "getTitle", "()Ljava/lang/CharSequence;")), JniHandleOwnership.TransferLocalRef); - } finally { - } - } - - set { - SetTitle (value); - } - } - - - static Delegate cb_setTitle_Ljava_lang_CharSequence_; -#pragma warning disable 0169 - static Delegate GetSetTitle_Ljava_lang_CharSequence_Handler () - { - if (cb_setTitle_Ljava_lang_CharSequence_ == null) - cb_setTitle_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((Action)n_SetTitle_Ljava_lang_CharSequence_); - return cb_setTitle_Ljava_lang_CharSequence_; - } - - static void n_SetTitle_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_title) - { - global::AndroidX.AppCompat.View.SupportActionModeWrapper __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - global::Java.Lang.ICharSequence title = global::Java.Lang.Object.GetObject (native_title, JniHandleOwnership.DoNotTransfer); - __this.SetTitle (title); - } -#pragma warning restore 0169 - - static IntPtr id_setTitle_Ljava_lang_CharSequence_; - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.appcompat.view']/class[@name='SupportActionModeWrapper']/method[@name='setTitle' and count(parameter)=1 and parameter[1][@type='java.lang.CharSequence']]" - [Register ("setTitle", "(Ljava/lang/CharSequence;)V", "GetSetTitle_Ljava_lang_CharSequence_Handler")] - public unsafe void SetTitle (global::Java.Lang.ICharSequence title) - { - if (id_setTitle_Ljava_lang_CharSequence_ == IntPtr.Zero) - id_setTitle_Ljava_lang_CharSequence_ = JNIEnv.GetMethodID (class_ref, "setTitle", "(Ljava/lang/CharSequence;)V"); - IntPtr native_title = CharSequence.ToLocalJniHandle (title); - try { - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue (native_title); - - if (GetType () == ThresholdType) - JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setTitle_Ljava_lang_CharSequence_, __args); - else - JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setTitle", "(Ljava/lang/CharSequence;)V"), __args); - } finally { - JNIEnv.DeleteLocalRef (native_title); - } - } - - - - - - static Delegate cb_getSubtitle; -#pragma warning disable 0169 - static Delegate GetGetSubtitleHandler () - { - if (cb_getSubtitle == null) - cb_getSubtitle = JNINativeWrapper.CreateDelegate ((Func)n_GetSubtitle); - return cb_getSubtitle; - } - - static IntPtr n_GetSubtitle (IntPtr jnienv, IntPtr native__this) - { - global::AndroidX.AppCompat.View.SupportActionModeWrapper __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return CharSequence.ToLocalJniHandle (__this.SubtitleFormatted); - } -#pragma warning restore 0169 - - static IntPtr id_getSubtitle; - public override unsafe global::Java.Lang.ICharSequence SubtitleFormatted { - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.appcompat.view']/class[@name='SupportActionModeWrapper']/method[@name='getSubtitle' and count(parameter)=0]" - [Register ("getSubtitle", "()Ljava/lang/CharSequence;", "GetGetSubtitleHandler")] - get { - if (id_getSubtitle == IntPtr.Zero) - id_getSubtitle = JNIEnv.GetMethodID (class_ref, "getSubtitle", "()Ljava/lang/CharSequence;"); - try { - - if (GetType () == ThresholdType) - return global::Java.Lang.Object.GetObject (JNIEnv.CallObjectMethod (((global::Java.Lang.Object)this).Handle, id_getSubtitle), JniHandleOwnership.TransferLocalRef); - else - return global::Java.Lang.Object.GetObject (JNIEnv.CallNonvirtualObjectMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "getSubtitle", "()Ljava/lang/CharSequence;")), JniHandleOwnership.TransferLocalRef); - } finally { - } - } - set { - SetSubtitle (value); - } - } - - - static Delegate cb_setSubtitle_Ljava_lang_CharSequence_; -#pragma warning disable 0169 - static Delegate GetSetSubtitle_Ljava_lang_CharSequence_Handler () - { - if (cb_setSubtitle_Ljava_lang_CharSequence_ == null) - cb_setSubtitle_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate ((Action)n_SetSubtitle_Ljava_lang_CharSequence_); - return cb_setSubtitle_Ljava_lang_CharSequence_; - } - - static void n_SetSubtitle_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_subtitle) - { - global::AndroidX.AppCompat.View.SupportActionModeWrapper __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - global::Java.Lang.ICharSequence subtitle = global::Java.Lang.Object.GetObject (native_subtitle, JniHandleOwnership.DoNotTransfer); - __this.SetSubtitle (subtitle); - } -#pragma warning restore 0169 - - static IntPtr id_setSubtitle_Ljava_lang_CharSequence_; - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.appcompat.view']/class[@name='SupportActionModeWrapper']/method[@name='setSubtitle' and count(parameter)=1 and parameter[1][@type='java.lang.CharSequence']]" - [Register ("setSubtitle", "(Ljava/lang/CharSequence;)V", "GetSetSubtitle_Ljava_lang_CharSequence_Handler")] - public unsafe void SetSubtitle (global::Java.Lang.ICharSequence subtitle) - { - if (id_setSubtitle_Ljava_lang_CharSequence_ == IntPtr.Zero) - id_setSubtitle_Ljava_lang_CharSequence_ = JNIEnv.GetMethodID (class_ref, "setSubtitle", "(Ljava/lang/CharSequence;)V"); - IntPtr native_subtitle = CharSequence.ToLocalJniHandle (subtitle); - try { - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue (native_subtitle); - - if (GetType () == ThresholdType) - JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setSubtitle_Ljava_lang_CharSequence_, __args); - else - JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setSubtitle", "(Ljava/lang/CharSequence;)V"), __args); - } finally { - JNIEnv.DeleteLocalRef (native_subtitle); - } - } - } -} - -namespace AndroidX.AppCompat.Widget -{ - public partial class AbsActionBarView - { - public override Android.Views.ViewStates Visibility { - get { - return base.Visibility; - } - set { - SetVisibility (value); - } - } - - static Delegate cb_setVisibility_I; -#pragma warning disable 0169 - static Delegate GetSetVisibility_IHandler () - { - if (cb_setVisibility_I == null) - cb_setVisibility_I = JNINativeWrapper.CreateDelegate ((Action)n_SetVisibility_I); - return cb_setVisibility_I; - } - - static void n_SetVisibility_I (IntPtr jnienv, IntPtr native__this, int native_visibility) - { - global::AndroidX.AppCompat.Widget.AbsActionBarView __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - global::Android.Views.ViewStates visibility = (global::Android.Views.ViewStates)native_visibility; - __this.SetVisibility (visibility); - } -#pragma warning restore 0169 - - static IntPtr id_setVisibility_I; - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.appcompat.widget']/class[@name='AbsActionBarView']/method[@name='setVisibility' and count(parameter)=1 and parameter[1][@type='int']]" - [Register ("setVisibility", "(I)V", "GetSetVisibility_IHandler")] - public unsafe virtual void SetVisibility ([global::Android.Runtime.GeneratedEnum] global::Android.Views.ViewStates visibility) - { - if (id_setVisibility_I == IntPtr.Zero) - id_setVisibility_I = JNIEnv.GetMethodID (class_ref, "setVisibility", "(I)V"); - try { - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue ((int)visibility); - - if (GetType () == ThresholdType) - JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setVisibility_I, __args); - else - JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setVisibility", "(I)V"), __args); - } finally { - } - } - } - - - public partial class ActionBarContainer - { - public override Android.Views.ViewStates Visibility { - get { - return base.Visibility; - } - set { - SetVisibility (value); - } - } - - static Delegate cb_setVisibility_I; -#pragma warning disable 0169 - static Delegate GetSetVisibility_IHandler () - { - if (cb_setVisibility_I == null) - cb_setVisibility_I = JNINativeWrapper.CreateDelegate ((Action)n_SetVisibility_I); - return cb_setVisibility_I; - } - - static void n_SetVisibility_I (IntPtr jnienv, IntPtr native__this, int native_visibility) - { - global::AndroidX.AppCompat.Widget.ActionBarContainer __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - global::Android.Views.ViewStates visibility = (global::Android.Views.ViewStates)native_visibility; - __this.SetVisibility (visibility); - } -#pragma warning restore 0169 - - static IntPtr id_setVisibility_I; - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.appcompat.widget']/class[@name='ActionBarContainer']/method[@name='setVisibility' and count(parameter)=1 and parameter[1][@type='int']]" - [Register ("setVisibility", "(I)V", "GetSetVisibility_IHandler")] - public unsafe void SetVisibility ([global::Android.Runtime.GeneratedEnum] global::Android.Views.ViewStates visibility) - { - if (id_setVisibility_I == IntPtr.Zero) - id_setVisibility_I = JNIEnv.GetMethodID (class_ref, "setVisibility", "(I)V"); - try { - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue ((int)visibility); - - if (GetType () == ThresholdType) - JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setVisibility_I, __args); - else - JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setVisibility", "(I)V"), __args); - } finally { - } - } - } - - -// public partial class AppCompatSpinner -// { -// public override Android.Widget.ISpinnerAdapter Adapter { -// get { -// return base.Adapter; -// } -// set { -// SetAdapter (value); -// } -// } - -// static Delegate cb_setAdapter_Landroid_widget_SpinnerAdapter_; -//#pragma warning disable 0169 -// static Delegate GetSetAdapter_Landroid_widget_SpinnerAdapter_Handler () -// { -// if (cb_setAdapter_Landroid_widget_SpinnerAdapter_ == null) -// cb_setAdapter_Landroid_widget_SpinnerAdapter_ = JNINativeWrapper.CreateDelegate ((Action)n_SetAdapter_Landroid_widget_SpinnerAdapter_); -// return cb_setAdapter_Landroid_widget_SpinnerAdapter_; -// } - -// static void n_SetAdapter_Landroid_widget_SpinnerAdapter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) -// { -// global::AndroidX.AppCompat.Widget.AppCompatSpinner __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); -// global::Android.Widget.ISpinnerAdapter adapter = (global::Android.Widget.ISpinnerAdapter)global::Java.Lang.Object.GetObject (native_adapter, JniHandleOwnership.DoNotTransfer); -// __this.SetAdapter (adapter); -// } -//#pragma warning restore 0169 - - // static IntPtr id_setAdapter_Landroid_widget_SpinnerAdapter_; - // // Metadata.xml XPath method reference: path="/api/package[@name='androidx.appcompat.widget']/class[@name='AppCompatSpinner']/method[@name='setAdapter' and count(parameter)=1 and parameter[1][@type='android.widget.SpinnerAdapter']]" - // [Register ("setAdapter", "(Landroid/widget/SpinnerAdapter;)V", "GetSetAdapter_Landroid_widget_SpinnerAdapter_Handler")] - // public unsafe void SetAdapter (global::Android.Widget.ISpinnerAdapter adapter) - // { - // if (id_setAdapter_Landroid_widget_SpinnerAdapter_ == IntPtr.Zero) - // id_setAdapter_Landroid_widget_SpinnerAdapter_ = JNIEnv.GetMethodID (class_ref, "setAdapter", "(Landroid/widget/SpinnerAdapter;)V"); - // try { - // JValue* __args = stackalloc JValue [1]; - // __args [0] = new JValue (adapter); - - // if (GetType () == ThresholdType) - // JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setAdapter_Landroid_widget_SpinnerAdapter_, __args); - // else - // JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setAdapter", "(Landroid/widget/SpinnerAdapter;)V"), __args); - // } finally { - // } - // } - //} - - -// mc++ begin -// public partial class ListViewCompat -// { -// public override Android.Graphics.Drawables.Drawable Selector { -// set { -// SetSelector (value); -// } -// get { -// return base.Selector; -// } -// } - -// static Delegate cb_setSelector_Landroid_graphics_drawable_Drawable_; -//#pragma warning disable 0169 -// static Delegate GetSetSelector_Landroid_graphics_drawable_Drawable_Handler () -// { -// if (cb_setSelector_Landroid_graphics_drawable_Drawable_ == null) -// cb_setSelector_Landroid_graphics_drawable_Drawable_ = JNINativeWrapper.CreateDelegate ((Action)n_SetSelector_Landroid_graphics_drawable_Drawable_); -// return cb_setSelector_Landroid_graphics_drawable_Drawable_; -// } - -// static void n_SetSelector_Landroid_graphics_drawable_Drawable_ (IntPtr jnienv, IntPtr native__this, IntPtr native_sel) -// { -// global::AndroidX.AppCompat.Widget.ListViewCompat __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); -// global::Android.Graphics.Drawables.Drawable sel = global::Java.Lang.Object.GetObject (native_sel, JniHandleOwnership.DoNotTransfer); -// __this.SetSelector (sel); -// } -//#pragma warning restore 0169 - - // static IntPtr id_setSelector_Landroid_graphics_drawable_Drawable_; - // // Metadata.xml XPath method reference: path="/api/package[@name='androidx.appcompat.widget']/class[@name='ListViewCompat']/method[@name='setSelector' and count(parameter)=1 and parameter[1][@type='android.graphics.drawable.Drawable']]" - // [Register ("setSelector", "(Landroid/graphics/drawable/Drawable;)V", "GetSetSelector_Landroid_graphics_drawable_Drawable_Handler")] - // public unsafe void SetSelector (global::Android.Graphics.Drawables.Drawable sel) - // { - // if (id_setSelector_Landroid_graphics_drawable_Drawable_ == IntPtr.Zero) - // id_setSelector_Landroid_graphics_drawable_Drawable_ = JNIEnv.GetMethodID (class_ref, "setSelector", "(Landroid/graphics/drawable/Drawable;)V"); - // try { - // JValue* __args = stackalloc JValue [1]; - // __args [0] = new JValue (sel); - - // if (GetType () == ThresholdType) - // JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setSelector_Landroid_graphics_drawable_Drawable_, __args); - // else - // JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setSelector", "(Landroid/graphics/drawable/Drawable;)V"), __args); - // } finally { - // } - // } - //} - // mc++ end - - -// public partial class ScrollingTabContainerView -// { -// private partial class TabView -// { -// public override bool Selected { -// set { -// SetSelected (value); -// } -// get { -// return base.Selected; -// } -// } - -// static Delegate cb_setSelected_Z; -//#pragma warning disable 0169 -// static Delegate GetSetSelected_ZHandler () -// { -// if (cb_setSelected_Z == null) -// cb_setSelected_Z = JNINativeWrapper.CreateDelegate ((Action)n_SetSelected_Z); -// return cb_setSelected_Z; -// } - -// static void n_SetSelected_Z (IntPtr jnienv, IntPtr native__this, bool selected) -// { -// global::AndroidX.AppCompat.Widget.ScrollingTabContainerView.TabView __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); -// __this.SetSelected (selected); -// } -//#pragma warning restore 0169 - -// static IntPtr id_setSelected_Z; -// // Metadata.xml XPath method reference: path="/api/package[@name='androidx.appcompat.widget']/class[@name='ScrollingTabContainerView.TabView']/method[@name='setSelected' and count(parameter)=1 and parameter[1][@type='boolean']]" -// [Register ("setSelected", "(Z)V", "GetSetSelected_ZHandler")] -// public unsafe void SetSelected (bool selected) -// { -// if (id_setSelected_Z == IntPtr.Zero) -// id_setSelected_Z = JNIEnv.GetMethodID (class_ref, "setSelected", "(Z)V"); -// try { -// JValue* __args = stackalloc JValue [1]; -// __args [0] = new JValue (selected); - -// if (GetType () == ThresholdType) -// JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setSelected_Z, __args); -// else -// JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setSelected", "(Z)V"), __args); -// } finally { -// } -// } -// } -// } -} - namespace AndroidX.AppCompat.View.Menu { // Metadata.xml XPath class reference: path="/api/package[@name='androidx.appcompat.view.menu']/class[@name='BaseMenuPresenter']" @@ -453,41 +38,19 @@ public void SetGroupDividerEnabled(bool enabled) } } - public partial class MenuAdapter - { - - static Delegate cb_getItem_I; -#pragma warning disable 0169 - static Delegate GetGetItem_IHandler() - { - if (cb_getItem_I == null) - cb_getItem_I = JNINativeWrapper.CreateDelegate((Func)n_GetItem_I); - return cb_getItem_I; - } - - static Java.Lang.Object n_GetItem_I(IntPtr jnienv, IntPtr native__this, int position) - { - global::AndroidX.AppCompat.View.Menu.MenuAdapter __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.GetItem(position); - } -#pragma warning restore 0169 + public partial class SupportActionModeWrapper // : global::Android.Views.ActionMode + { + public string? Title + { + get; + set; + } - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.appcompat.view.menu']/class[@name='MenuAdapter']/method[@name='getItem' and count(parameter)=1 and parameter[1][@type='int']]" - [Register("getItem", "(I)J", "GetGetItem_IHandler")] - public override unsafe Java.Lang.Object GetItem(int position) - { - const string __id = "getItem.(I)J"; - try - { - JniArgumentValue* __args = stackalloc JniArgumentValue[1]; - __args[0] = new JniArgumentValue(position); - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod(__id, this, __args); - return global::Java.Lang.Object.GetObject(__rm.Handle, JniHandleOwnership.TransferLocalRef); - } - finally - { - } - } + public string? Subtitle + { + get; + set; + } - } + } } diff --git a/source/androidx.appcompat/appcompat/Transforms/Metadata.xml b/source/androidx.appcompat/appcompat/Transforms/Metadata.xml index 11080c67a..ac53a5918 100644 --- a/source/androidx.appcompat/appcompat/Transforms/Metadata.xml +++ b/source/androidx.appcompat/appcompat/Transforms/Metadata.xml @@ -19,7 +19,9 @@ public protected protected + Java.Lang.Object Java.Lang.Object Java.Lang.Object @@ -29,6 +31,7 @@ protected override Java.Lang.Object + Android.Views.IMenuItem Android.Views.IMenuItem @@ -46,9 +50,11 @@ Android.Views.IMenuItem Android.Views.IMenuItem Java.Lang.Object + + protected @@ -230,4 +238,78 @@ Java.Lang.Object + + + virtual + + + Visibility + + + + SubtitleFormatted + + + + TitleFormatted + + + + override + + + new + + + + + + + \ No newline at end of file From ece3cf2252af752b27ad1331711c3856d5a3c8a7 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 18 Dec 2024 18:39:58 +0100 Subject: [PATCH 007/140] androidx.preference --- .../preference/Additions/Additions.cs | 31 -------------- .../preference/Transforms/Metadata.xml | 40 +++++-------------- 2 files changed, 9 insertions(+), 62 deletions(-) diff --git a/source/androidx.preference/preference/Additions/Additions.cs b/source/androidx.preference/preference/Additions/Additions.cs index 59f6acecb..02d529bb6 100644 --- a/source/androidx.preference/preference/Additions/Additions.cs +++ b/source/androidx.preference/preference/Additions/Additions.cs @@ -7,36 +7,5 @@ namespace AndroidX.Preference { public partial class PreferenceGroupAdapter { - -static Delegate cb_onBindViewHolder_Landroidx_preference_PreferenceViewHolder_I; -#pragma warning disable 0169 - static Delegate GetOnBindViewHolder_Landroidx_preference_PreferenceViewHolder_IHandler () - { - if (cb_onBindViewHolder_Landroidx_preference_PreferenceViewHolder_I == null) - cb_onBindViewHolder_Landroidx_preference_PreferenceViewHolder_I = JNINativeWrapper.CreateDelegate ((Action) n_OnBindViewHolder_Landroidx_preference_PreferenceViewHolder_I); - return cb_onBindViewHolder_Landroidx_preference_PreferenceViewHolder_I; - } - - static void n_OnBindViewHolder_Landroidx_preference_PreferenceViewHolder_I (IntPtr jnienv, IntPtr native__this, IntPtr native_holder, int position) - { - global::AndroidX.Preference.PreferenceGroupAdapter __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - global::AndroidX.Preference.PreferenceViewHolder holder = global::Java.Lang.Object.GetObject (native_holder, JniHandleOwnership.DoNotTransfer); - __this.OnBindViewHolder (holder, position); - } -#pragma warning restore 0169 - - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.preference']/class[@name='PreferenceGroupAdapter']/method[@name='onBindViewHolder' and count(parameter)=2 and parameter[1][@type='androidx.preference.PreferenceViewHolder'] and parameter[2][@type='int']]" - [Register ("onBindViewHolder", "(Landroidx/preference/PreferenceViewHolder;I)V", "GetOnBindViewHolder_Landroidx_preference_PreferenceViewHolder_IHandler")] - public override unsafe void OnBindViewHolder (global::AndroidX.RecyclerView.Widget.RecyclerView.ViewHolder holder, int position) - { - const string __id = "onBindViewHolder.(Landroidx/preference/PreferenceViewHolder;I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue ((holder == null) ? IntPtr.Zero : ((global::Java.Lang.Object) holder).Handle); - __args [1] = new JniArgumentValue (position); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - } - } } } diff --git a/source/androidx.preference/preference/Transforms/Metadata.xml b/source/androidx.preference/preference/Transforms/Metadata.xml index 7c435e932..9ed6ed578 100644 --- a/source/androidx.preference/preference/Transforms/Metadata.xml +++ b/source/androidx.preference/preference/Transforms/Metadata.xml @@ -1,5 +1,4 @@  - Java.Lang.Object + AndroidX.RecyclerView.Widget.RecyclerView.ViewHolder preference newValue @@ -98,10 +99,6 @@ > androidx.preference.Preference - - androidx.preference.Preference - - androidx.preference.Preference - - androidx.preference.Preference - - androidx.preference.Preference - - androidx.preference.Preference - - - - - - + + AndroidX.RecyclerView.Widget.RecyclerView.ViewHolder + + \ No newline at end of file From e4118ae32a87602c50b84208d64d48b83cf715e8 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 18 Dec 2024 18:55:58 +0100 Subject: [PATCH 008/140] androidx.recyclerview --- .../Additions/Additions.cs | 25 ------------------- .../Transforms/Metadata.xml | 13 +++++++++- .../recyclerview/Transforms/Metadata.xml | 2 -- 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/source/androidx.recyclerview/recyclerview-selection/Additions/Additions.cs b/source/androidx.recyclerview/recyclerview-selection/Additions/Additions.cs index d553dc458..379b6fbf5 100644 --- a/source/androidx.recyclerview/recyclerview-selection/Additions/Additions.cs +++ b/source/androidx.recyclerview/recyclerview-selection/Additions/Additions.cs @@ -5,29 +5,4 @@ namespace AndroidX.RecyclerView.Selection { - public partial class DefaultSelectionTracker - { - static Delegate cb_getSelection; -#pragma warning disable 0169 - static Delegate GetGetSelectionHandler() - { - if (cb_getSelection == null) - cb_getSelection = JNINativeWrapper.CreateDelegate((Func)n_GetSelection); - return cb_getSelection; - } - - static IntPtr n_GetSelection(IntPtr jnienv, IntPtr native__this) - { - global::AndroidX.RecyclerView.Selection.DefaultSelectionTracker __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle(__this.RawSelection); - } -#pragma warning restore 0169 - - protected override global::AndroidX.RecyclerView.Selection.Selection RawSelection - { - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.recyclerview.selection']/class[@name='SelectionTracker']/method[@name='getSelection' and count(parameter)=0]" - [Register("getSelection", "()Landroidx/recyclerview/selection/Selection;", "GetGetSelectionHandler")] - get; - } - } } \ No newline at end of file diff --git a/source/androidx.recyclerview/recyclerview-selection/Transforms/Metadata.xml b/source/androidx.recyclerview/recyclerview-selection/Transforms/Metadata.xml index 4fcc04455..02a26ef0b 100644 --- a/source/androidx.recyclerview/recyclerview-selection/Transforms/Metadata.xml +++ b/source/androidx.recyclerview/recyclerview-selection/Transforms/Metadata.xml @@ -1,7 +1,6 @@  Java.Lang.Object Java.Lang.Object - protected protected protected @@ -13,5 +12,17 @@ > AndroidX.RecyclerView.Selection.MutableSelection + + RawSelection + + + protected + \ No newline at end of file diff --git a/source/androidx.recyclerview/recyclerview/Transforms/Metadata.xml b/source/androidx.recyclerview/recyclerview/Transforms/Metadata.xml index ccc0edd47..c43ef97fd 100644 --- a/source/androidx.recyclerview/recyclerview/Transforms/Metadata.xml +++ b/source/androidx.recyclerview/recyclerview/Transforms/Metadata.xml @@ -4,8 +4,6 @@ androidx.recyclerview.widget.RecyclerView.ViewHolder androidx.recyclerview.widget.RecyclerView.ViewHolder - - Date: Wed, 18 Dec 2024 19:30:00 +0100 Subject: [PATCH 009/140] androidx.swiperefreshlayout --- .../swiperefreshlayout/Additions/Additions.cs | 77 ------------------- 1 file changed, 77 deletions(-) delete mode 100644 source/androidx.swiperefreshlayout/swiperefreshlayout/Additions/Additions.cs diff --git a/source/androidx.swiperefreshlayout/swiperefreshlayout/Additions/Additions.cs b/source/androidx.swiperefreshlayout/swiperefreshlayout/Additions/Additions.cs deleted file mode 100644 index 1fa9b6964..000000000 --- a/source/androidx.swiperefreshlayout/swiperefreshlayout/Additions/Additions.cs +++ /dev/null @@ -1,77 +0,0 @@ -//using System; -//using System.Collections.Generic; -//using Android.Runtime; - -//namespace AndroidX.SwipeRefreshLayout.SwipeRefreshLayout.Widget -//{ -// // Metadata.xml XPath class reference: path="/api/package[@name='android.support.v4.widget']/class[@name='SwipeRefreshLayout']" -// public partial class SwipeRefreshLayout -// { -// static Delegate cb_setEnabled_Z; -//#pragma warning disable 0169 -// static Delegate GetSetEnabled_ZHandler () -// { -// if (cb_setEnabled_Z == null) -// cb_setEnabled_Z = JNINativeWrapper.CreateDelegate ((Action)n_SetEnabled_Z); -// return cb_setEnabled_Z; -// } - -// static void n_SetEnabled_Z (IntPtr jnienv, IntPtr native__this, bool enabled) -// { -// global::Android.Support.V4.Widget.SwipeRefreshLayout __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); -// __this.SetEnabled (enabled); -// } -//#pragma warning restore 0169 - -// static IntPtr id_setEnabled_Z; -// // Metadata.xml XPath method reference: path="/api/package[@name='android.support.v4.widget']/class[@name='SwipeRefreshLayout']/method[@name='setEnabled' and count(parameter)=1 and parameter[1][@type='boolean']]" -// [Register ("setEnabled", "(Z)V", "GetSetEnabled_ZHandler")] -// public unsafe void SetEnabled (bool enabled) -// { -// if (id_setEnabled_Z == IntPtr.Zero) -// id_setEnabled_Z = JNIEnv.GetMethodID (class_ref, "setEnabled", "(Z)V"); -// try { -// JValue* __args = stackalloc JValue [1]; -// __args [0] = new JValue (enabled); - -// if (GetType () == ThresholdType) -// JNIEnv.CallVoidMethod (Handle, id_setEnabled_Z, __args); -// else -// JNIEnv.CallNonvirtualVoidMethod (Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setEnabled", "(Z)V"), __args); -// } finally { - -// } -// } - - -// private static IntPtr id_isNestedScrollingEnabled = IntPtr.Zero; -// private static IntPtr id_setNestedScrollingEnabled = IntPtr.Zero; - -// public unsafe virtual bool NestedScrollingEnabled { -// [Register("isNestedScrollingEnabled", "()Z", "GetIsNestedScrollingEnabledHandler")] -// get { -// if (id_isNestedScrollingEnabled == IntPtr.Zero) { -// id_isNestedScrollingEnabled = JNIEnv.GetMethodID(class_ref, "isNestedScrollingEnabled", "()Z"); -// } -// if (base.GetType() == ThresholdType) { -// return JNIEnv.CallBooleanMethod(base.Handle, id_isNestedScrollingEnabled); -// } -// return JNIEnv.CallNonvirtualBooleanMethod(base.Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "isNestedScrollingEnabled", "()Z")); -// } - -// [Register("setNestedScrollingEnabled", "(Z)V", "GetSetNestedScrollingEnabledHandler")] -// set { -// if (id_setNestedScrollingEnabled == IntPtr.Zero) { -// id_setNestedScrollingEnabled = JNIEnv.GetMethodID(class_ref, "setNestedScrollingEnabled", "(Z)V"); -// } -// JValue* ptr = stackalloc JValue[1]; -// *ptr = new JValue(value); -// if (base.GetType() == ThresholdType) { -// JNIEnv.CallVoidMethod(base.Handle, id_setNestedScrollingEnabled, ptr); -// return; -// } -// JNIEnv.CallNonvirtualVoidMethod(base.Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "setNestedScrollingEnabled", "(Z)V"), ptr); -// } -// } -// } -//} \ No newline at end of file From c5d79e4aba6a282b40f442a36f6c1acf6d7e5598 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 18 Dec 2024 20:12:32 +0100 Subject: [PATCH 010/140] androidx.transition --- .../transition/Additions/Additions.cs | 299 ------------------ .../transition/Transforms/Metadata.xml | 50 ++- 2 files changed, 40 insertions(+), 309 deletions(-) diff --git a/source/androidx.transition/transition/Additions/Additions.cs b/source/androidx.transition/transition/Additions/Additions.cs index c939f2a71..951a01ea0 100644 --- a/source/androidx.transition/transition/Additions/Additions.cs +++ b/source/androidx.transition/transition/Additions/Additions.cs @@ -3,305 +3,6 @@ namespace AndroidX.Transitions { - public partial class FragmentTransitionSupport - { - static Delegate cb_addTargets_Ljava_lang_Object_Ljava_util_ArrayList_; -#pragma warning disable 0169 - static Delegate GetAddTargets_Ljava_lang_Object_Ljava_util_ArrayList_Handler() - { - if (cb_addTargets_Ljava_lang_Object_Ljava_util_ArrayList_ == null) - cb_addTargets_Ljava_lang_Object_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate((Action)n_AddTargets_Ljava_lang_Object_Ljava_util_ArrayList_); - return cb_addTargets_Ljava_lang_Object_Ljava_util_ArrayList_; - } - - static void n_AddTargets_Ljava_lang_Object_Ljava_util_ArrayList_(IntPtr jnienv, IntPtr native__this, IntPtr native_transitionObj, IntPtr native_views) - { - global::AndroidX.Transitions.FragmentTransitionSupport __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); - global::Java.Lang.Object transitionObj = global::Java.Lang.Object.GetObject(native_transitionObj, JniHandleOwnership.DoNotTransfer); - var views = global::Android.Runtime.JavaList.FromJniHandle(native_views, JniHandleOwnership.DoNotTransfer); - __this.AddTargets(transitionObj, views); - } -#pragma warning restore 0169 - - static IntPtr id_addTargets_Ljava_lang_Object_Ljava_util_ArrayList_; - // Metadata.xml XPath method reference: path="/api/package[@name='android.support.transition']/class[@name='FragmentTransitionSupport']/method[@name='addTargets' and count(parameter)=2 and parameter[1][@type='java.lang.Object'] and parameter[2][@type='java.util.ArrayList<android.view.View>']]" - [Register("addTargets", "(Ljava/lang/Object;Ljava/util/ArrayList;)V", "GetAddTargets_Ljava_lang_Object_Ljava_util_ArrayList_Handler")] - public override unsafe void AddTargets(global::Java.Lang.Object transitionObj, global::System.Collections.Generic.IList views) - { - if (id_addTargets_Ljava_lang_Object_Ljava_util_ArrayList_ == IntPtr.Zero) - id_addTargets_Ljava_lang_Object_Ljava_util_ArrayList_ = JNIEnv.GetMethodID(class_ref, "addTargets", "(Ljava/lang/Object;Ljava/util/ArrayList;)V"); - IntPtr native_views = global::Android.Runtime.JavaList.ToLocalJniHandle(views); - try - { - JValue* __args = stackalloc JValue[2]; - __args[0] = new JValue(transitionObj); - __args[1] = new JValue(native_views); - - if (((object)this).GetType() == ThresholdType) - JNIEnv.CallVoidMethod(((global::Java.Lang.Object)this).Handle, id_addTargets_Ljava_lang_Object_Ljava_util_ArrayList_, __args); - else - JNIEnv.CallNonvirtualVoidMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "addTargets", "(Ljava/lang/Object;Ljava/util/ArrayList;)V"), __args); - } - finally - { - JNIEnv.DeleteLocalRef(native_views); - } - } - - - - - static Delegate cb_scheduleRemoveTargets_Ljava_lang_Object_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_; -#pragma warning disable 0169 - static Delegate GetScheduleRemoveTargets_Ljava_lang_Object_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Handler() - { - if (cb_scheduleRemoveTargets_Ljava_lang_Object_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_ == null) - cb_scheduleRemoveTargets_Ljava_lang_Object_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate((Action)n_ScheduleRemoveTargets_Ljava_lang_Object_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_); - return cb_scheduleRemoveTargets_Ljava_lang_Object_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_; - } - - static void n_ScheduleRemoveTargets_Ljava_lang_Object_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_(IntPtr jnienv, IntPtr native__this, IntPtr native_overallTransitionObj, IntPtr native_enterTransition, IntPtr native_enteringViews, IntPtr native_exitTransition, IntPtr native_exitingViews, IntPtr native_sharedElementTransition, IntPtr native_sharedElementsIn) - { - global::AndroidX.Transitions.FragmentTransitionSupport __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); - global::Java.Lang.Object overallTransitionObj = global::Java.Lang.Object.GetObject(native_overallTransitionObj, JniHandleOwnership.DoNotTransfer); - global::Java.Lang.Object enterTransition = global::Java.Lang.Object.GetObject(native_enterTransition, JniHandleOwnership.DoNotTransfer); - var enteringViews = global::Android.Runtime.JavaList.FromJniHandle(native_enteringViews, JniHandleOwnership.DoNotTransfer); - global::Java.Lang.Object exitTransition = global::Java.Lang.Object.GetObject(native_exitTransition, JniHandleOwnership.DoNotTransfer); - var exitingViews = global::Android.Runtime.JavaList.FromJniHandle(native_exitingViews, JniHandleOwnership.DoNotTransfer); - global::Java.Lang.Object sharedElementTransition = global::Java.Lang.Object.GetObject(native_sharedElementTransition, JniHandleOwnership.DoNotTransfer); - var sharedElementsIn = global::Android.Runtime.JavaList.FromJniHandle(native_sharedElementsIn, JniHandleOwnership.DoNotTransfer); - __this.ScheduleRemoveTargets(overallTransitionObj, enterTransition, enteringViews, exitTransition, exitingViews, sharedElementTransition, sharedElementsIn); - } -#pragma warning restore 0169 - - static IntPtr id_scheduleRemoveTargets_Ljava_lang_Object_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_; - // Metadata.xml XPath method reference: path="/api/package[@name='android.support.transition']/class[@name='FragmentTransitionSupport']/method[@name='scheduleRemoveTargets' and count(parameter)=7 and parameter[1][@type='java.lang.Object'] and parameter[2][@type='java.lang.Object'] and parameter[3][@type='java.util.ArrayList<android.view.View>'] and parameter[4][@type='java.lang.Object'] and parameter[5][@type='java.util.ArrayList<android.view.View>'] and parameter[6][@type='java.lang.Object'] and parameter[7][@type='java.util.ArrayList<android.view.View>']]" - [Register("scheduleRemoveTargets", "(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/util/ArrayList;)V", "GetScheduleRemoveTargets_Ljava_lang_Object_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Handler")] - public override unsafe void ScheduleRemoveTargets(global::Java.Lang.Object overallTransitionObj, global::Java.Lang.Object enterTransition, global::System.Collections.Generic.IList enteringViews, global::Java.Lang.Object exitTransition, global::System.Collections.Generic.IList exitingViews, global::Java.Lang.Object sharedElementTransition, global::System.Collections.Generic.IList sharedElementsIn) - { - if (id_scheduleRemoveTargets_Ljava_lang_Object_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_ == IntPtr.Zero) - id_scheduleRemoveTargets_Ljava_lang_Object_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_ = JNIEnv.GetMethodID(class_ref, "scheduleRemoveTargets", "(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/util/ArrayList;)V"); - IntPtr native_enteringViews = global::Android.Runtime.JavaList.ToLocalJniHandle(enteringViews); - IntPtr native_exitingViews = global::Android.Runtime.JavaList.ToLocalJniHandle(exitingViews); - IntPtr native_sharedElementsIn = global::Android.Runtime.JavaList.ToLocalJniHandle(sharedElementsIn); - try - { - JValue* __args = stackalloc JValue[7]; - __args[0] = new JValue(overallTransitionObj); - __args[1] = new JValue(enterTransition); - __args[2] = new JValue(native_enteringViews); - __args[3] = new JValue(exitTransition); - __args[4] = new JValue(native_exitingViews); - __args[5] = new JValue(sharedElementTransition); - __args[6] = new JValue(native_sharedElementsIn); - - if (((object)this).GetType() == ThresholdType) - JNIEnv.CallVoidMethod(((global::Java.Lang.Object)this).Handle, id_scheduleRemoveTargets_Ljava_lang_Object_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_lang_Object_Ljava_util_ArrayList_, __args); - else - JNIEnv.CallNonvirtualVoidMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "scheduleRemoveTargets", "(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/util/ArrayList;Ljava/lang/Object;Ljava/util/ArrayList;)V"), __args); - } - finally - { - JNIEnv.DeleteLocalRef(native_enteringViews); - JNIEnv.DeleteLocalRef(native_exitingViews); - JNIEnv.DeleteLocalRef(native_sharedElementsIn); - } - } - - - - static Delegate cb_swapSharedElementTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_; -#pragma warning disable 0169 - static Delegate GetSwapSharedElementTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_Handler() - { - if (cb_swapSharedElementTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_ == null) - cb_swapSharedElementTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate((Action)n_SwapSharedElementTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_); - return cb_swapSharedElementTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_; - } - - static void n_SwapSharedElementTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_(IntPtr jnienv, IntPtr native__this, IntPtr native_sharedElementTransitionObj, IntPtr native_sharedElementsOut, IntPtr native_sharedElementsIn) - { - global::AndroidX.Transitions.FragmentTransitionSupport __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); - global::Java.Lang.Object sharedElementTransitionObj = global::Java.Lang.Object.GetObject(native_sharedElementTransitionObj, JniHandleOwnership.DoNotTransfer); - var sharedElementsOut = global::Android.Runtime.JavaList.FromJniHandle(native_sharedElementsOut, JniHandleOwnership.DoNotTransfer); - var sharedElementsIn = global::Android.Runtime.JavaList.FromJniHandle(native_sharedElementsIn, JniHandleOwnership.DoNotTransfer); - __this.SwapSharedElementTargets(sharedElementTransitionObj, sharedElementsOut, sharedElementsIn); - } -#pragma warning restore 0169 - - static IntPtr id_swapSharedElementTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_; - // Metadata.xml XPath method reference: path="/api/package[@name='android.support.transition']/class[@name='FragmentTransitionSupport']/method[@name='swapSharedElementTargets' and count(parameter)=3 and parameter[1][@type='java.lang.Object'] and parameter[2][@type='java.util.ArrayList<android.view.View>'] and parameter[3][@type='java.util.ArrayList<android.view.View>']]" - [Register("swapSharedElementTargets", "(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V", "GetSwapSharedElementTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_Handler")] - public override unsafe void SwapSharedElementTargets(global::Java.Lang.Object sharedElementTransitionObj, global::System.Collections.Generic.IList sharedElementsOut, global::System.Collections.Generic.IList sharedElementsIn) - { - if (id_swapSharedElementTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_ == IntPtr.Zero) - id_swapSharedElementTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_ = JNIEnv.GetMethodID(class_ref, "swapSharedElementTargets", "(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V"); - IntPtr native_sharedElementsOut = global::Android.Runtime.JavaList.ToLocalJniHandle(sharedElementsOut); - IntPtr native_sharedElementsIn = global::Android.Runtime.JavaList.ToLocalJniHandle(sharedElementsIn); - try - { - JValue* __args = stackalloc JValue[3]; - __args[0] = new JValue(sharedElementTransitionObj); - __args[1] = new JValue(native_sharedElementsOut); - __args[2] = new JValue(native_sharedElementsIn); - - if (((object)this).GetType() == ThresholdType) - JNIEnv.CallVoidMethod(((global::Java.Lang.Object)this).Handle, id_swapSharedElementTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_, __args); - else - JNIEnv.CallNonvirtualVoidMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "swapSharedElementTargets", "(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V"), __args); - } - finally - { - JNIEnv.DeleteLocalRef(native_sharedElementsOut); - JNIEnv.DeleteLocalRef(native_sharedElementsIn); - } - } - - - - static Delegate cb_scheduleHideFragmentView_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_; -#pragma warning disable 0169 - static Delegate GetScheduleHideFragmentView_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_Handler() - { - if (cb_scheduleHideFragmentView_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_ == null) - cb_scheduleHideFragmentView_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate((Action)n_ScheduleHideFragmentView_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_); - return cb_scheduleHideFragmentView_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_; - } - - static void n_ScheduleHideFragmentView_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_(IntPtr jnienv, IntPtr native__this, IntPtr native_exitTransitionObj, IntPtr native_fragmentView, IntPtr native_exitingViews) - { - global::AndroidX.Transitions.FragmentTransitionSupport __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); - global::Java.Lang.Object exitTransitionObj = global::Java.Lang.Object.GetObject(native_exitTransitionObj, JniHandleOwnership.DoNotTransfer); - global::Android.Views.View fragmentView = global::Java.Lang.Object.GetObject(native_fragmentView, JniHandleOwnership.DoNotTransfer); - var exitingViews = global::Android.Runtime.JavaList.FromJniHandle(native_exitingViews, JniHandleOwnership.DoNotTransfer); - __this.ScheduleHideFragmentView(exitTransitionObj, fragmentView, exitingViews); - } -#pragma warning restore 0169 - - static IntPtr id_scheduleHideFragmentView_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_; - // Metadata.xml XPath method reference: path="/api/package[@name='android.support.transition']/class[@name='FragmentTransitionSupport']/method[@name='scheduleHideFragmentView' and count(parameter)=3 and parameter[1][@type='java.lang.Object'] and parameter[2][@type='android.view.View'] and parameter[3][@type='java.util.ArrayList<android.view.View>']]" - [Register("scheduleHideFragmentView", "(Ljava/lang/Object;Landroid/view/View;Ljava/util/ArrayList;)V", "GetScheduleHideFragmentView_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_Handler")] - public override unsafe void ScheduleHideFragmentView(global::Java.Lang.Object exitTransitionObj, global::Android.Views.View fragmentView, global::System.Collections.Generic.IList exitingViews) - { - if (id_scheduleHideFragmentView_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_ == IntPtr.Zero) - id_scheduleHideFragmentView_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_ = JNIEnv.GetMethodID(class_ref, "scheduleHideFragmentView", "(Ljava/lang/Object;Landroid/view/View;Ljava/util/ArrayList;)V"); - IntPtr native_exitingViews = global::Android.Runtime.JavaList.ToLocalJniHandle(exitingViews); - try - { - JValue* __args = stackalloc JValue[3]; - __args[0] = new JValue(exitTransitionObj); - __args[1] = new JValue(fragmentView); - __args[2] = new JValue(native_exitingViews); - - if (((object)this).GetType() == ThresholdType) - JNIEnv.CallVoidMethod(((global::Java.Lang.Object)this).Handle, id_scheduleHideFragmentView_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_, __args); - else - JNIEnv.CallNonvirtualVoidMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "scheduleHideFragmentView", "(Ljava/lang/Object;Landroid/view/View;Ljava/util/ArrayList;)V"), __args); - } - finally - { - JNIEnv.DeleteLocalRef(native_exitingViews); - } - } - - - - - - static Delegate cb_setSharedElementTargets_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_; -#pragma warning disable 0169 - static Delegate GetSetSharedElementTargets_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_Handler() - { - if (cb_setSharedElementTargets_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_ == null) - cb_setSharedElementTargets_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate((Action)n_SetSharedElementTargets_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_); - return cb_setSharedElementTargets_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_; - } - - static void n_SetSharedElementTargets_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_(IntPtr jnienv, IntPtr native__this, IntPtr native_transitionObj, IntPtr native_nonExistentView, IntPtr native_sharedViews) - { - global::AndroidX.Transitions.FragmentTransitionSupport __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); - global::Java.Lang.Object transitionObj = global::Java.Lang.Object.GetObject(native_transitionObj, JniHandleOwnership.DoNotTransfer); - global::Android.Views.View nonExistentView = global::Java.Lang.Object.GetObject(native_nonExistentView, JniHandleOwnership.DoNotTransfer); - var sharedViews = global::Android.Runtime.JavaList.FromJniHandle(native_sharedViews, JniHandleOwnership.DoNotTransfer); - __this.SetSharedElementTargets(transitionObj, nonExistentView, sharedViews); - } -#pragma warning restore 0169 - - static IntPtr id_setSharedElementTargets_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_; - // Metadata.xml XPath method reference: path="/api/package[@name='android.support.transition']/class[@name='FragmentTransitionSupport']/method[@name='setSharedElementTargets' and count(parameter)=3 and parameter[1][@type='java.lang.Object'] and parameter[2][@type='android.view.View'] and parameter[3][@type='java.util.ArrayList<android.view.View>']]" - [Register("setSharedElementTargets", "(Ljava/lang/Object;Landroid/view/View;Ljava/util/ArrayList;)V", "GetSetSharedElementTargets_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_Handler")] - public override unsafe void SetSharedElementTargets(global::Java.Lang.Object transitionObj, global::Android.Views.View nonExistentView, global::System.Collections.Generic.IList sharedViews) - { - if (id_setSharedElementTargets_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_ == IntPtr.Zero) - id_setSharedElementTargets_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_ = JNIEnv.GetMethodID(class_ref, "setSharedElementTargets", "(Ljava/lang/Object;Landroid/view/View;Ljava/util/ArrayList;)V"); - IntPtr native_sharedViews = global::Android.Runtime.JavaList.ToLocalJniHandle(sharedViews); - try - { - JValue* __args = stackalloc JValue[3]; - __args[0] = new JValue(transitionObj); - __args[1] = new JValue(nonExistentView); - __args[2] = new JValue(native_sharedViews); - - if (((object)this).GetType() == ThresholdType) - JNIEnv.CallVoidMethod(((global::Java.Lang.Object)this).Handle, id_setSharedElementTargets_Ljava_lang_Object_Landroid_view_View_Ljava_util_ArrayList_, __args); - else - JNIEnv.CallNonvirtualVoidMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "setSharedElementTargets", "(Ljava/lang/Object;Landroid/view/View;Ljava/util/ArrayList;)V"), __args); - } - finally - { - JNIEnv.DeleteLocalRef(native_sharedViews); - } - } - - - - static Delegate cb_replaceTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_; -#pragma warning disable 0169 - static Delegate GetReplaceTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_Handler() - { - if (cb_replaceTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_ == null) - cb_replaceTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate((Action)n_ReplaceTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_); - return cb_replaceTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_; - } - - static void n_ReplaceTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_(IntPtr jnienv, IntPtr native__this, IntPtr native_transitionObj, IntPtr native_oldTargets, IntPtr native_newTargets) - { - global::AndroidX.Transitions.FragmentTransitionSupport __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); - global::Java.Lang.Object transitionObj = global::Java.Lang.Object.GetObject(native_transitionObj, JniHandleOwnership.DoNotTransfer); - var oldTargets = global::Android.Runtime.JavaList.FromJniHandle(native_oldTargets, JniHandleOwnership.DoNotTransfer); - var newTargets = global::Android.Runtime.JavaList.FromJniHandle(native_newTargets, JniHandleOwnership.DoNotTransfer); - __this.ReplaceTargets(transitionObj, oldTargets, newTargets); - } -#pragma warning restore 0169 - - static IntPtr id_replaceTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_; - // Metadata.xml XPath method reference: path="/api/package[@name='android.support.transition']/class[@name='FragmentTransitionSupport']/method[@name='replaceTargets' and count(parameter)=3 and parameter[1][@type='java.lang.Object'] and parameter[2][@type='java.util.ArrayList<android.view.View>'] and parameter[3][@type='java.util.ArrayList<android.view.View>']]" - [Register("replaceTargets", "(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V", "GetReplaceTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_Handler")] - public override unsafe void ReplaceTargets(global::Java.Lang.Object transitionObj, global::System.Collections.Generic.IList oldTargets, global::System.Collections.Generic.IList newTargets) - { - if (id_replaceTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_ == IntPtr.Zero) - id_replaceTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_ = JNIEnv.GetMethodID(class_ref, "replaceTargets", "(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V"); - IntPtr native_oldTargets = global::Android.Runtime.JavaList.ToLocalJniHandle(oldTargets); - IntPtr native_newTargets = global::Android.Runtime.JavaList.ToLocalJniHandle(newTargets); - try - { - JValue* __args = stackalloc JValue[3]; - __args[0] = new JValue(transitionObj); - __args[1] = new JValue(native_oldTargets); - __args[2] = new JValue(native_newTargets); - - if (((object)this).GetType() == ThresholdType) - JNIEnv.CallVoidMethod(((global::Java.Lang.Object)this).Handle, id_replaceTargets_Ljava_lang_Object_Ljava_util_ArrayList_Ljava_util_ArrayList_, __args); - else - JNIEnv.CallNonvirtualVoidMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "replaceTargets", "(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/ArrayList;)V"), __args); - } - finally - { - JNIEnv.DeleteLocalRef(native_oldTargets); - JNIEnv.DeleteLocalRef(native_newTargets); - } - } - } } diff --git a/source/androidx.transition/transition/Transforms/Metadata.xml b/source/androidx.transition/transition/Transforms/Metadata.xml index 6d0095411..00e9ec42b 100644 --- a/source/androidx.transition/transition/Transforms/Metadata.xml +++ b/source/androidx.transition/transition/Transforms/Metadata.xml @@ -4,17 +4,8 @@ size dest flags - - - - + - - - - - - transition transition transition @@ -61,4 +52,43 @@ OnTransitionStartReversed + + override + + + override + + + override + + + override + + + override + + + override + + + + \ No newline at end of file From 8edbb3570825b6254df4ebd82fa251ab6b054ebf Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 19 Dec 2024 16:27:13 +0100 Subject: [PATCH 011/140] com.google.android.material.material fixes and generated code removal --- .../material/Additions/Additions.cs | 25 -------- ...terial.Navigation.NavigationBarItemView.cs | 33 ++++------ ...ogle.Android.Material.Snackbar.Snackbar.cs | 31 --------- ....TextField.MaterialAutoCompleteTextView.cs | 0 .../material/Transforms/Metadata.xml | 63 ++++++++++++++++++- 5 files changed, 73 insertions(+), 79 deletions(-) delete mode 100644 source/com.google.android.material/material/Additions/Google.Android.Material.Snackbar.Snackbar.cs create mode 100644 source/com.google.android.material/material/Additions/Google.Android.Material.TextField.MaterialAutoCompleteTextView.cs diff --git a/source/com.google.android.material/material/Additions/Additions.cs b/source/com.google.android.material/material/Additions/Additions.cs index f049ba998..a92dac925 100644 --- a/source/com.google.android.material/material/Additions/Additions.cs +++ b/source/com.google.android.material/material/Additions/Additions.cs @@ -191,28 +191,3 @@ public partial class ItemReselectedEventArgs : EventArgs } } } - -namespace Google.Android.Material.DatePicker -{ - - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.android.material.datepicker']/class[@name='MonthsPagerAdapter']" - //[global::Android.Runtime.Register("com/google/android/material/datepicker/MonthsPagerAdapter", DoNotGenerateAcw = true)] - //public partial class MonthsPagerAdapter : global::AndroidX.RecyclerView.Widget.RecyclerView.Adapter - //{ - // public override unsafe void OnBindViewHolder(global::AndroidX.RecyclerView.Widget.RecyclerView.ViewHolder viewHolder, int position) - // { - // this.OnBindViewHolder((Google.Android.Material.DatePicker.MonthsPagerAdapter.ViewHolder)viewHolder, position); - // } - //} - - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.android.material.datepicker']/class[@name='YearGridAdapter']" - //[global::Android.Runtime.Register("com/google/android/material/datepicker/YearGridAdapter", DoNotGenerateAcw = true)] - //public partial class YearGridAdapter : global::AndroidX.RecyclerView.Widget.RecyclerView.Adapter - //{ - // public override unsafe void OnBindViewHolder(global::AndroidX.RecyclerView.Widget.RecyclerView.ViewHolder viewHolder, int position) - // { - // this.OnBindViewHolder((Google.Android.Material.DatePicker.YearGridAdapter.ViewHolder)viewHolder, position); - // } - //} - -} diff --git a/source/com.google.android.material/material/Additions/Google.Android.Material.Navigation.NavigationBarItemView.cs b/source/com.google.android.material/material/Additions/Google.Android.Material.Navigation.NavigationBarItemView.cs index df2d7203a..a6ab83623 100644 --- a/source/com.google.android.material/material/Additions/Google.Android.Material.Navigation.NavigationBarItemView.cs +++ b/source/com.google.android.material/material/Additions/Google.Android.Material.Navigation.NavigationBarItemView.cs @@ -4,25 +4,18 @@ namespace Google.Android.Material.Navigation { - - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.android.material.navigation']/class[@name='NavigationBarItemView']" - //[global::Android.Runtime.Register("com/google/android/material/navigation/NavigationBarItemView", DoNotGenerateAcw = true)] - public abstract partial class NavigationBarItemView //: global::Android.Widget.FrameLayout, global::AndroidX.AppCompat.View.Menu.IMenuViewItemView + // Metadata.xml XPath class reference: path="/api/package[@name='com.google.android.material.navigation']/class[@name='NavigationBarItemView']" + // [global::System.Obsolete ("While this type is 'public', Google considers it internal API and reserves the right to modify or delete it in the future. Use at your own risk.", DiagnosticId = "XAOBS001")] + // [global::Android.Runtime.Register ("com/google/android/material/navigation/NavigationBarItemView", DoNotGenerateAcw=true)] + public abstract partial class NavigationBarItemView // : global::Android.Widget.FrameLayout, global::AndroidX.AppCompat.View.Menu.IMenuViewItemView { - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.android.material.navigation']/class[@name='NavigationBarItemView']/method[@name='setEnabled' and count(parameter)=1 and parameter[1][@type='boolean']]" - [Register("setEnabled", "(Z)V", "")] - public unsafe void SetEnabled(bool p0) - { - const string __id = "setEnabled.(Z)V"; - try - { - JniArgumentValue* __args = stackalloc JniArgumentValue[1]; - __args[0] = new JniArgumentValue(p0); - _members.InstanceMethods.InvokeNonvirtualVoidMethod(__id, this, __args); - } - finally - { - } - } - } + public override bool Enabled + { + get => base.Enabled; + set => base.Enabled = value; + } + + public void SetEnabled(bool enabled) => + Enabled = enabled; + } } \ No newline at end of file diff --git a/source/com.google.android.material/material/Additions/Google.Android.Material.Snackbar.Snackbar.cs b/source/com.google.android.material/material/Additions/Google.Android.Material.Snackbar.Snackbar.cs deleted file mode 100644 index 9a1e9449e..000000000 --- a/source/com.google.android.material/material/Additions/Google.Android.Material.Snackbar.Snackbar.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Google.Android.Material.Snackbar -{ - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.android.material.snackbar']/class[@name='Snackbar']" - // [global::Android.Runtime.Register ("com/google/android/material/snackbar/Snackbar", DoNotGenerateAcw=true)] - public partial class Snackbar // : global::Google.Android.Material.Snackbar.BaseTransientBottomBar - { - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.android.material.snackbar']/class[@name='Snackbar.SnackbarLayout']" - // [global::Android.Runtime.Register ("com/google/android/material/snackbar/Snackbar$SnackbarLayout", DoNotGenerateAcw=true)] - public sealed partial class SnackbarLayout //: global::Android.Widget.FrameLayout - { - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.android.material.snackbar']/class[@name='Snackbar.SnackbarLayout']/method[@name='setLayoutParams' and count(parameter)=1 and parameter[1][@type='android.view.ViewGroup.LayoutParams']]" - [Register ("setLayoutParams", "(Landroid/view/ViewGroup$LayoutParams;)V", "")] - public unsafe void SetLayoutParams (global::Android.Views.ViewGroup.LayoutParams this_) - { - const string __id = "setLayoutParams.(Landroid/view/ViewGroup$LayoutParams;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((this_ == null) ? IntPtr.Zero : ((global::Java.Lang.Object) this_).Handle); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (this_); - } - } - } - } -} \ No newline at end of file diff --git a/source/com.google.android.material/material/Additions/Google.Android.Material.TextField.MaterialAutoCompleteTextView.cs b/source/com.google.android.material/material/Additions/Google.Android.Material.TextField.MaterialAutoCompleteTextView.cs new file mode 100644 index 000000000..e69de29bb diff --git a/source/com.google.android.material/material/Transforms/Metadata.xml b/source/com.google.android.material/material/Transforms/Metadata.xml index 7b94859ec..9613ceef1 100644 --- a/source/com.google.android.material/material/Transforms/Metadata.xml +++ b/source/com.google.android.material/material/Transforms/Metadata.xml @@ -36,9 +36,10 @@ OnOffsetChangedListener now implements BaseOnOffsetChangedListener with just the same method This causes some inheritance problems in .NET so we're going to hide this base interface and make sure everywhere that uses it is patched up and uses OnOffsetChangedListener instead Luckily for now any methods that take BaseOnOffsetChangedListener also have an overload for OnOffsetChangedListener - --> + + --> com.google.android.material.appbar.AppBarLayout @@ -57,17 +58,20 @@ Google.Android.Material.Tabs.TabLayout.Tab + + Java.Lang.Object + + new + + + + + virtual + + + none + + + none + + + none + + + none + + + none + + + Java.Lang.Object + - \ No newline at end of file + \ No newline at end of file From 3f56736d3bba009122a1006ea21945f4d138c728 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 19 Dec 2024 20:28:25 +0100 Subject: [PATCH 012/140] com.google.crypto.tink fixes and generated code removal --- ...nk.Shaded.Protobuf.GeneratedMessageLite.cs | 9 ---- ...le.Crypto.Tink.Shaded.Protobuf.Internal.cs | 22 ++++++++- ...ink.Shaded.Protobuf.LazyStringArrayList.cs | 27 ----------- ...rypto.Tink.Shaded.Protobuf.MapFieldLite.cs | 29 ------------ ...ded.Protobuf.UnmodifiableLazyStringList.cs | 28 ------------ .../tink-android/Transforms/Metadata.xml | 45 ++++++++----------- 6 files changed, 38 insertions(+), 122 deletions(-) delete mode 100644 source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.GeneratedMessageLite.cs delete mode 100644 source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.LazyStringArrayList.cs delete mode 100644 source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.MapFieldLite.cs delete mode 100644 source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.UnmodifiableLazyStringList.cs diff --git a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.GeneratedMessageLite.cs b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.GeneratedMessageLite.cs deleted file mode 100644 index e4ec77177..000000000 --- a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.GeneratedMessageLite.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.Google.Crypto.Tink.Shaded.Protobuf -{ - -} \ No newline at end of file diff --git a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs index 0339ec694..64faf7555 100644 --- a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs +++ b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs @@ -15,14 +15,32 @@ public sealed partial class Internal // : global::Java.Lang.Object public partial class MapAdapter // : global::Java.Util.AbstractMap { + static Delegate? cb_entrySet; +#pragma warning disable 0169 + static Delegate GetEntrySetHandler () + { + if (cb_entrySet == null) + cb_entrySet = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_EntrySet)); + return cb_entrySet; + } + + static IntPtr n_EntrySet (IntPtr jnienv, IntPtr native__this) + { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + return global::Android.Runtime.JavaSet.ToLocalJniHandle (__this.EntrySet ()); + } +#pragma warning restore 0169 + // Metadata.xml XPath method reference: path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']/class[@name='Internal.MapAdapter']/method[@name='entrySet' and count(parameter)=0]" [Register ("entrySet", "()Ljava/util/Set;", "GetEntrySetHandler")] - public override unsafe global::System.Collections.ICollection EntrySet () + public override unsafe global::System.Collections.ICollection? EntrySet () { const string __id = "entrySet.()Ljava/util/Set;"; try { var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return (System.Collections.ICollection) global::Android.Runtime.JavaSet.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef); + return + (System.Collections.ICollection?) // added manually + global::Android.Runtime.JavaSet.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef); } finally { } } diff --git a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.LazyStringArrayList.cs b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.LazyStringArrayList.cs deleted file mode 100644 index 4451c853f..000000000 --- a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.LazyStringArrayList.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.Google.Crypto.Tink.Shaded.Protobuf -{ - - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']/class[@name='LazyStringArrayList']" - // [global::Android.Runtime.Register ("com/google/crypto/tink/shaded/protobuf/LazyStringArrayList", DoNotGenerateAcw=true)] - public partial class LazyStringArrayList //: global::Java.Util.AbstractList, global::Xamarin.Google.Crypto.Tink.Shaded.Protobuf.ILazyStringList, global::Java.Util.IRandomAccess { - { - [Register ("get", "(I)Ljava/lang/Object;", "GetGet_IHandler")] - public override unsafe Java.Lang.Object Get (int index) - { - const string __id = "get.(I)Ljava/lang/String;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (index); - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); - return (Java.Lang.Object) JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } - } - - } -} diff --git a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.MapFieldLite.cs b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.MapFieldLite.cs deleted file mode 100644 index 79902109a..000000000 --- a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.MapFieldLite.cs +++ /dev/null @@ -1,29 +0,0 @@ - - -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.Google.Crypto.Tink.Shaded.Protobuf -{ - - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']/class[@name='MapFieldLite']" - // [global::Android.Runtime.Register ("com/google/crypto/tink/shaded/protobuf/MapFieldLite", DoNotGenerateAcw=true)] - // [global::Java.Interop.JavaTypeParameters (new string [] {"K", "V"})] - public partial class MapFieldLite // : global::Java.Util.LinkedHashMap - { - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']/class[@name='MapFieldLite']/method[@name='entrySet' and count(parameter)=0]" - [Register ("entrySet", "()Ljava/util/Set;", "")] - public override unsafe global::System.Collections.ICollection EntrySet () - { - const string __id = "entrySet.()Ljava/util/Set;"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return (System.Collections.ICollection) global::Android.Runtime.JavaSet.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } - } - - } -} \ No newline at end of file diff --git a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.UnmodifiableLazyStringList.cs b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.UnmodifiableLazyStringList.cs deleted file mode 100644 index 460fbe428..000000000 --- a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.UnmodifiableLazyStringList.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.Google.Crypto.Tink.Shaded.Protobuf -{ - - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']/class[@name='UnmodifiableLazyStringList']" - // [global::Android.Runtime.Register ("com/google/crypto/tink/shaded/protobuf/UnmodifiableLazyStringList", DoNotGenerateAcw=true)] - public partial class UnmodifiableLazyStringList // : global::Java.Util.AbstractList, global::Xamarin.Google.Crypto.Tink.Shaded.Protobuf.ILazyStringList, global::Java.Util.IRandomAccess - { - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']/class[@name='UnmodifiableLazyStringList']/method[@name='get' and count(parameter)=1 and parameter[1][@type='int']]" - [Register ("get", "(I)Ljava/lang/Object;", "GetGet_IHandler")] - public override unsafe global::Java.Lang.Object Get (int index) - { - const string __id = "get.(I)Ljava/lang/String;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (index); - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); - return (Java.Lang.Object) JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } - } - - } -} \ No newline at end of file diff --git a/source/com.google.crypto.tink/tink-android/Transforms/Metadata.xml b/source/com.google.crypto.tink/tink-android/Transforms/Metadata.xml index a7f0fdb9b..2ddd8d7a8 100644 --- a/source/com.google.crypto.tink/tink-android/Transforms/Metadata.xml +++ b/source/com.google.crypto.tink/tink-android/Transforms/Metadata.xml @@ -232,16 +232,7 @@ - - - Java.Lang.Object - - Java.Lang.Object + java.lang.Object + - - System.Collections.ICollection - - --> - - + System.Collections.ICollection + + + + java.lang.Object + + - - - - Date: Thu, 19 Dec 2024 20:52:49 +0100 Subject: [PATCH 013/140] com.google.android.gms.play-services-base --- .../play-services-base/Additions/Additions.cs | 47 -------------- .../Additions/BitmapTeleporter.cs | 26 -------- .../Additions/DataBufferAdditions.cs | 8 --- .../Additions/IPendingResultExtensions.cs | 0 .../play-services-base/Additions/Statuses.cs | 9 --- .../Transforms/Metadata.xml | 62 +++++++------------ 6 files changed, 24 insertions(+), 128 deletions(-) delete mode 100644 source/com.google.android.gms/play-services-base/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-base/Additions/BitmapTeleporter.cs delete mode 100644 source/com.google.android.gms/play-services-base/Additions/DataBufferAdditions.cs delete mode 100644 source/com.google.android.gms/play-services-base/Additions/IPendingResultExtensions.cs delete mode 100644 source/com.google.android.gms/play-services-base/Additions/Statuses.cs diff --git a/source/com.google.android.gms/play-services-base/Additions/Additions.cs b/source/com.google.android.gms/play-services-base/Additions/Additions.cs deleted file mode 100644 index 7e9e79e7d..000000000 --- a/source/com.google.android.gms/play-services-base/Additions/Additions.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using Android.Runtime; - -namespace Android.Gms.Common -{ - public partial class SignInButton - { - static IntPtr id_setEnabled_Z; - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.android.gms.common']/class[@name='SignInButton']/method[@name='setEnabled' and count(parameter)=1 and parameter[1][@type='boolean']]" - [Register("setEnabled", "(Z)V", "")] - public unsafe void SetEnabled(bool enabled) - { - if (id_setEnabled_Z == IntPtr.Zero) - id_setEnabled_Z = JNIEnv.GetMethodID(class_ref, "setEnabled", "(Z)V"); - try - { - JValue* __args = stackalloc JValue[1]; - __args[0] = new JValue(enabled); - JNIEnv.CallVoidMethod(((global::Java.Lang.Object)this).Handle, id_setEnabled_Z, __args); - } - finally - { - } - } - } -} -namespace Android.Gms.Common.Data -{ - public partial class DataHolder - { - static IntPtr id_finalize; - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.android.gms.common.data']/class[@name='DataHolder']/method[@name='finalize' and count(parameter)=0]" - [Register("finalize", "()V", "")] - protected unsafe void Finalize() - { - if (id_finalize == IntPtr.Zero) - id_finalize = JNIEnv.GetMethodID(class_ref, "finalize", "()V"); - try - { - JNIEnv.CallVoidMethod(((global::Java.Lang.Object)this).Handle, id_finalize); - } - finally - { - } - } - } -} diff --git a/source/com.google.android.gms/play-services-base/Additions/BitmapTeleporter.cs b/source/com.google.android.gms/play-services-base/Additions/BitmapTeleporter.cs deleted file mode 100644 index b5ce83378..000000000 --- a/source/com.google.android.gms/play-services-base/Additions/BitmapTeleporter.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Threading.Tasks; -using Android.Gms.Extensions; -using Android.Runtime; - -namespace Android.Gms.Common.Data -{ - public partial class BitmapTeleporter - { - static IntPtr id_describeContents; - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.android.gms.common.data']/class[@name='BitmapTeleporter']/method[@name='describeContents' and count(parameter)=0]" - [Register("describeContents", "()I", "")] - public unsafe int DescribeContents() - { - if (id_describeContents == IntPtr.Zero) - id_describeContents = JNIEnv.GetMethodID(class_ref, "describeContents", "()I"); - try - { - return JNIEnv.CallIntMethod(((global::Java.Lang.Object)this).Handle, id_describeContents); - } - finally - { - } - } - } -} \ No newline at end of file diff --git a/source/com.google.android.gms/play-services-base/Additions/DataBufferAdditions.cs b/source/com.google.android.gms/play-services-base/Additions/DataBufferAdditions.cs deleted file mode 100644 index 3f7eb7e4e..000000000 --- a/source/com.google.android.gms/play-services-base/Additions/DataBufferAdditions.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using System.Linq; -using System.Collections.Generic; - -namespace Android.Gms.Common.Data -{ -} - diff --git a/source/com.google.android.gms/play-services-base/Additions/IPendingResultExtensions.cs b/source/com.google.android.gms/play-services-base/Additions/IPendingResultExtensions.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/source/com.google.android.gms/play-services-base/Additions/Statuses.cs b/source/com.google.android.gms/play-services-base/Additions/Statuses.cs deleted file mode 100644 index d6246495e..000000000 --- a/source/com.google.android.gms/play-services-base/Additions/Statuses.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Android.Gms.Common.Apis -{ - - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.android.gms.common.api']/class[@name='Status']" - //[global::Android.Runtime.Register ("com/google/android/gms/common/api/Status", DoNotGenerateAcw=true)] - //public sealed partial class Statuses : Android.Gms.Common.Apis.IResult - //{ - //} -} diff --git a/source/com.google.android.gms/play-services-base/Transforms/Metadata.xml b/source/com.google.android.gms/play-services-base/Transforms/Metadata.xml index 61073a2d2..da735b66f 100644 --- a/source/com.google.android.gms/play-services-base/Transforms/Metadata.xml +++ b/source/com.google.android.gms/play-services-base/Transforms/Metadata.xml @@ -62,39 +62,16 @@ false InternalAbstractDataBuffer - - - - - - - - - - - - - - - - - - - - - - - false - + + none + + + FinalizeNative + + + none + + + false + From 92a51502b7c9a16cf41287754d0b9108f920bfcf Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 19 Dec 2024 20:55:09 +0100 Subject: [PATCH 014/140] com.google.android.gms.play-services-maps --- .../play-services-maps/Transforms/Metadata.xml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/source/com.google.android.gms/play-services-maps/Transforms/Metadata.xml b/source/com.google.android.gms/play-services-maps/Transforms/Metadata.xml index 8ec881665..9b53eb60b 100644 --- a/source/com.google.android.gms/play-services-maps/Transforms/Metadata.xml +++ b/source/com.google.android.gms/play-services-maps/Transforms/Metadata.xml @@ -22,19 +22,6 @@ marker location - - - - - - - - - - - - - source size @@ -75,10 +62,6 @@ - - - - Date: Thu, 19 Dec 2024 20:57:24 +0100 Subject: [PATCH 015/140] com.google.android.gms.play-services-maps --- .../play-services-maps/Transforms/Metadata.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/com.google.android.gms/play-services-maps/Transforms/Metadata.xml b/source/com.google.android.gms/play-services-maps/Transforms/Metadata.xml index 9b53eb60b..7576b3f36 100644 --- a/source/com.google.android.gms/play-services-maps/Transforms/Metadata.xml +++ b/source/com.google.android.gms/play-services-maps/Transforms/Metadata.xml @@ -32,6 +32,7 @@ + Date: Fri, 20 Dec 2024 09:22:11 +0100 Subject: [PATCH 016/140] com.google.protobuf.protobuf-lite fixes and generated code removal --- .../Additions/LazyStringArrayList.cs | 121 ------------------ .../protobuf-lite/Additions/MapFieldLite.cs | 26 ---- ...arin.Protobuf.Lite.AbstractProtobufList.cs | 17 +++ .../protobuf-lite/Transforms/Metadata.xml | 82 ++++++------ 4 files changed, 63 insertions(+), 183 deletions(-) delete mode 100644 source/com.google.protobuf/protobuf-lite/Additions/LazyStringArrayList.cs delete mode 100644 source/com.google.protobuf/protobuf-lite/Additions/MapFieldLite.cs create mode 100644 source/com.google.protobuf/protobuf-lite/Additions/Xamarin.Protobuf.Lite.AbstractProtobufList.cs diff --git a/source/com.google.protobuf/protobuf-lite/Additions/LazyStringArrayList.cs b/source/com.google.protobuf/protobuf-lite/Additions/LazyStringArrayList.cs deleted file mode 100644 index 70a38a7b4..000000000 --- a/source/com.google.protobuf/protobuf-lite/Additions/LazyStringArrayList.cs +++ /dev/null @@ -1,121 +0,0 @@ -using System; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.Protobuf.Lite -{ - - public partial class LazyStringArrayList - { - static Delegate cb_get_I; -#pragma warning disable 0169 - static Delegate GetGet_IHandler() - { - if (cb_get_I == null) - cb_get_I = JNINativeWrapper.CreateDelegate((Func)n_Get_I); - return cb_get_I; - } - - static IntPtr n_Get_I(IntPtr jnienv, IntPtr native__this, int index) - { - global::Xamarin.Protobuf.Lite.LazyStringArrayList __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewString((string)__this.Get(index)); - } -#pragma warning restore 0169 - - static IntPtr id_get_I; - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.protobuf']/class[@name='LazyStringArrayList']/method[@name='get' and count(parameter)=1 and parameter[1][@type='int']]" - [Register("get", "(I)Ljava/lang/String;", "GetGet_IHandler")] - public override unsafe global::Java.Lang.Object Get(int index) - { - if (id_get_I == IntPtr.Zero) - id_get_I = JNIEnv.GetMethodID(class_ref, "get", "(I)Ljava/lang/String;"); - try - { - JValue* __args = stackalloc JValue[1]; - __args[0] = new JValue(index); - - if (((object)this).GetType() == ThresholdType) - return JNIEnv.GetString(JNIEnv.CallObjectMethod(((global::Java.Lang.Object)this).Handle, id_get_I, __args), JniHandleOwnership.TransferLocalRef); - else - return JNIEnv.GetString(JNIEnv.CallNonvirtualObjectMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "get", "(I)Ljava/lang/String;"), __args), JniHandleOwnership.TransferLocalRef); - } - finally - { - } - } - - - static Delegate cb_addAll_Ljava_util_Collection_; -#pragma warning disable 0169 - static Delegate GetAddAll_Ljava_util_Collection_Handler () - { - if (cb_addAll_Ljava_util_Collection_ == null) - cb_addAll_Ljava_util_Collection_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_Z) n_AddAll_Ljava_util_Collection_); - return cb_addAll_Ljava_util_Collection_; - } - - static bool n_AddAll_Ljava_util_Collection_ (IntPtr jnienv, IntPtr native__this, IntPtr native_c) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var c = global::Android.Runtime.JavaCollection.FromJniHandle (native_c, JniHandleOwnership.DoNotTransfer); - bool __ret = __this.AddAll (c); - return __ret; - } -#pragma warning restore 0169 - - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.protobuf']/class[@name='LazyStringArrayList']/method[@name='addAll' and count(parameter)=1 and parameter[1][@type='java.util.Collection<? extends java.lang.String>']]" - [Register ("addAll", "(Ljava/util/Collection;)Z", "GetAddAll_Ljava_util_Collection_Handler")] - public unsafe bool AddAll (global::System.Collections.Generic.ICollection c) - { - const string __id = "addAll.(Ljava/util/Collection;)Z"; - IntPtr native_c = global::Android.Runtime.JavaCollection.ToLocalJniHandle (c); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (native_c); - var __rm = _members.InstanceMethods.InvokeVirtualBooleanMethod (__id, this, __args); - return __rm; - } finally { - JNIEnv.DeleteLocalRef (native_c); - global::System.GC.KeepAlive (c); - } - } - - - static Delegate cb_addAll_ILjava_util_Collection_; -#pragma warning disable 0169 - static Delegate GetAddAll_ILjava_util_Collection_Handler () - { - if (cb_addAll_ILjava_util_Collection_ == null) - cb_addAll_ILjava_util_Collection_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPIL_Z) n_AddAll_ILjava_util_Collection_); - return cb_addAll_ILjava_util_Collection_; - } - - static bool n_AddAll_ILjava_util_Collection_ (IntPtr jnienv, IntPtr native__this, int index, IntPtr native_c) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var c = global::Android.Runtime.JavaCollection.FromJniHandle (native_c, JniHandleOwnership.DoNotTransfer); - bool __ret = __this.AddAll (index, c); - return __ret; - } -#pragma warning restore 0169 - - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.protobuf']/class[@name='LazyStringArrayList']/method[@name='addAll' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='java.util.Collection<? extends java.lang.String>']]" - [Register ("addAll", "(ILjava/util/Collection;)Z", "GetAddAll_ILjava_util_Collection_Handler")] - public unsafe bool AddAll (int index, global::System.Collections.Generic.ICollection c) - { - const string __id = "addAll.(ILjava/util/Collection;)Z"; - IntPtr native_c = global::Android.Runtime.JavaCollection.ToLocalJniHandle (c); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue (index); - __args [1] = new JniArgumentValue (native_c); - var __rm = _members.InstanceMethods.InvokeVirtualBooleanMethod (__id, this, __args); - return __rm; - } finally { - JNIEnv.DeleteLocalRef (native_c); - global::System.GC.KeepAlive (c); - } - } - } -} diff --git a/source/com.google.protobuf/protobuf-lite/Additions/MapFieldLite.cs b/source/com.google.protobuf/protobuf-lite/Additions/MapFieldLite.cs deleted file mode 100644 index 30ea77f4e..000000000 --- a/source/com.google.protobuf/protobuf-lite/Additions/MapFieldLite.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using Android.Runtime; - -namespace Xamarin.Protobuf.Lite -{ - - public partial class MapFieldLite - { - static IntPtr id_entrySet; - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.protobuf']/class[@name='MapFieldLite']/method[@name='entrySet' and count(parameter)=0]" - // [Register("entrySet", "()Ljava/util/Set;", "")] - public unsafe global::System.Collections.ICollection EntrySet() - { - if (id_entrySet == IntPtr.Zero) - id_entrySet = JNIEnv.GetMethodID(class_ref, "entrySet", "()Ljava/util/Set;"); - try - { - return (System.Collections.ICollection) - global::Android.Runtime.JavaSet.FromJniHandle(JNIEnv.CallObjectMethod(((global::Java.Lang.Object)this).Handle, id_entrySet), JniHandleOwnership.TransferLocalRef); - } - finally - { - } - } - } -} diff --git a/source/com.google.protobuf/protobuf-lite/Additions/Xamarin.Protobuf.Lite.AbstractProtobufList.cs b/source/com.google.protobuf/protobuf-lite/Additions/Xamarin.Protobuf.Lite.AbstractProtobufList.cs new file mode 100644 index 000000000..6933fe03b --- /dev/null +++ b/source/com.google.protobuf/protobuf-lite/Additions/Xamarin.Protobuf.Lite.AbstractProtobufList.cs @@ -0,0 +1,17 @@ +using System; + +namespace Xamarin.Protobuf.Lite +{ + + // Metadata.xml XPath class reference: path="/api/package[@name='com.google.protobuf']/class[@name='AbstractProtobufList']" + // [global::Android.Runtime.Register ("com/google/protobuf/AbstractProtobufList", DoNotGenerateAcw=true)] + // [global::Java.Interop.JavaTypeParameters (new string [] {"E"})] + public abstract partial class AbstractProtobufList // : global::Java.Util.AbstractList, global::Xamarin.Protobuf.Lite.Internal.IProtobufList + { + public global::Xamarin.Protobuf.Lite.Internal.IProtobufList? MutableCopyWithCapacity (int p0) + { + throw new NotImplementedException(); + } + + } +} \ No newline at end of file diff --git a/source/com.google.protobuf/protobuf-lite/Transforms/Metadata.xml b/source/com.google.protobuf/protobuf-lite/Transforms/Metadata.xml index 2ebf346ed..90deb407c 100644 --- a/source/com.google.protobuf/protobuf-lite/Transforms/Metadata.xml +++ b/source/com.google.protobuf/protobuf-lite/Transforms/Metadata.xml @@ -86,9 +86,9 @@ - System.Collections.ICollection + java.util.Set - - - - - - - - - - - public - - --> - --> - - @@ -339,8 +308,49 @@ > void - + + + java.util.Collection + + + java.lang.Object + + + + Xamarin.Protobuf.Lite.Internal.IProtobufList + + + Xamarin.Protobuf.Lite.Internal.IProtobufList + + + Xamarin.Protobuf.Lite.Internal.IProtobufList + + + Xamarin.Protobuf.Lite.Internal.IProtobufList + + + Xamarin.Protobuf.Lite.Internal.IProtobufList + From 93b34d519b71a419746601764862248b2c3ce504 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 21 Dec 2024 16:21:16 +0100 Subject: [PATCH 017/140] com.google.protobuf.protobuf-javalite fixes and generated code cleanup --- .../protobuf-javalite/Additions/Additions.cs | 76 ----- .../protobuf-javalite/Transforms/Metadata.xml | 311 +++++++++++++----- 2 files changed, 229 insertions(+), 158 deletions(-) delete mode 100644 source/com.google.protobuf/protobuf-javalite/Additions/Additions.cs diff --git a/source/com.google.protobuf/protobuf-javalite/Additions/Additions.cs b/source/com.google.protobuf/protobuf-javalite/Additions/Additions.cs deleted file mode 100644 index 8cf33ed31..000000000 --- a/source/com.google.protobuf/protobuf-javalite/Additions/Additions.cs +++ /dev/null @@ -1,76 +0,0 @@ -#nullable restore -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.Protobuf.Lite -{ - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.protobuf']/class[@name='LazyStringArrayList']" - // [global::Android.Runtime.Register ("com/google/protobuf/LazyStringArrayList", DoNotGenerateAcw=true)] - public partial class LazyStringArrayList // : global::Java.Util.AbstractList - { - // changed - // cb_remove_I to cb_remove_Is - static Delegate cb_remove_Is; -#pragma warning disable 0169 - static Delegate GetRemove_IsHandler () - { - if (cb_remove_Is == null) - cb_remove_Is = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_Remove_Is)); - return cb_remove_Is; - } - - static IntPtr n_Remove_Is (IntPtr jnienv, IntPtr native__this, int index) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewString (__this.RemoveAndReturnString (index)); - } -#pragma warning restore 0169 - - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.protobuf']/class[@name='LazyStringArrayList']/method[@name='remove' and count(parameter)=1 and parameter[1][@type='int']]" - [Register ("remove", "(I)Ljava/lang/String;", "GetRemove_IsHandler")] - public virtual unsafe string RemoveAndReturnString (int index) - { - const string __id = "remove.(I)Ljava/lang/String;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (index); - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } - } - - - static Delegate cb_remove_I; -#pragma warning disable 0169 - static Delegate GetRemove_IHandler () - { - if (cb_remove_I == null) - cb_remove_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_Remove_I)); - return cb_remove_I; - } - - static IntPtr n_Remove_I (IntPtr jnienv, IntPtr native__this, int index) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle (__this.Remove (index)); - } -#pragma warning restore 0169 - - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.protobuf']/class[@name='LazyStringArrayList']/method[@name='remove' and count(parameter)=1 and parameter[1][@type='int']]" - [Register ("remove", "(I)Ljava/lang/Object;", "GetRemove_IHandler")] - public override unsafe global::Java.Lang.Object Remove (int index) - { - const string __id = "remove.(I)Ljava/lang/Object;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (index); - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } - } - } -} \ No newline at end of file diff --git a/source/com.google.protobuf/protobuf-javalite/Transforms/Metadata.xml b/source/com.google.protobuf/protobuf-javalite/Transforms/Metadata.xml index 37310fd62..a0b026d92 100644 --- a/source/com.google.protobuf/protobuf-javalite/Transforms/Metadata.xml +++ b/source/com.google.protobuf/protobuf-javalite/Transforms/Metadata.xml @@ -1,26 +1,5 @@  - - - - - - - - - - - - System.Collections.ICollection + java.util.Set - - - - - - - - - - - - Java.Lang.Object - - - - - - - - - NullValueData - - - - - - - - - - --> + + Xamarin.Protobuf.Lite.Internal.IProtobufList + + + Xamarin.Protobuf.Lite.Internal.IProtobufList + + + Xamarin.Protobuf.Lite.Internal.IProtobufList + + + Xamarin.Protobuf.Lite.Internal.IProtobufList + + + Xamarin.Protobuf.Lite.Internal.IProtobufList + + + + Java.Lang.Object + + + Java.Lang.Object + + + Java.Lang.Object + + + Xamarin.Protobuf.Lite.IMessageLiteBuilder + + + Java.Lang.Object + + + Java.Lang.Object + + + Java.Lang.Object + + + bool + + + java.util.Collection + + + + java.lang.Object + + + + + Java.Util.IIterator + + + none + + + + + + + + + + + + + + + + + none + + + KindCase + + + + + CardinalityData + + + CardinalityData + + + new + + + CardinalityData + + + CardinalityData + + + + + KindData + + + new + + + KindData + + + KindData + + + + KindCaseData + + + KindCaseData + + + KindCaseData + + \ No newline at end of file From 55db5a8f5057d120471ba3676c9fc8739a294c5f Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 21 Dec 2024 20:19:28 +0100 Subject: [PATCH 018/140] com.google.firebase.protolite-well-known-types fixes --- .../Transforms/Metadata.xml | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/source/com.google.firebase/protolite-well-known-types/Transforms/Metadata.xml b/source/com.google.firebase/protolite-well-known-types/Transforms/Metadata.xml index 276e72bfb..cc1107e79 100644 --- a/source/com.google.firebase/protolite-well-known-types/Transforms/Metadata.xml +++ b/source/com.google.firebase/protolite-well-known-types/Transforms/Metadata.xml @@ -121,4 +121,109 @@ /> + + + HistoryData + + + HistoryData + + + HistoryData + + + HistoryData + + + + + + ValueTypeData + + + ValueTypeData + + + ValueTypeData + + + ValueTypeData + + + + MetricKindData + + + MetricKindData + + + MetricKindData + + + MetricKindData + + + + + ValueTypeData + + + ValueTypeData + + + ValueTypeData + + + ValueTypeData + + + From 6d23067626d4dca2c23751830b0db4f650a4e4bc Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 22 Dec 2024 18:17:46 +0100 Subject: [PATCH 019/140] com.google.firebase.firebase-perf fixes --- .../firebase-perf/Transforms/Metadata.xml | 131 +++++++++++++++++- 1 file changed, 130 insertions(+), 1 deletion(-) diff --git a/source/com.google.firebase/firebase-perf/Transforms/Metadata.xml b/source/com.google.firebase/firebase-perf/Transforms/Metadata.xml index 2f702b096..fca320017 100644 --- a/source/com.google.firebase/firebase-perf/Transforms/Metadata.xml +++ b/source/com.google.firebase/firebase-perf/Transforms/Metadata.xml @@ -19,7 +19,7 @@ Firebase.Perf.Provider - > + @@ -157,4 +157,133 @@ + + MobileSubtypeData + + + MobileSubtypeData + + + MobileSubtypeData + + + MobileSubtypeData + + + + + NetworkTypeData + + + NetworkTypeData + + + NetworkTypeData + + + NetworkTypeData + + + + + HttpMethodData + + + HttpMethodData + + + HttpMethodData + + + HttpMethodData + + + + + NetworkClientErrorReasonData + + + NetworkClientErrorReasonData + + + NetworkClientErrorReasonData + + + NetworkClientErrorReasonData + + + + + DispatchDestinationData + + + DispatchDestinationData + + + DispatchDestinationData + + + DispatchDestinationData + + From 4f0036d4cfedcded289c69fc8d2591a6f4507515 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 30 Dec 2024 15:36:40 +0100 Subject: [PATCH 020/140] com.google.firebase.firebase-firestore --- .../firebase-firestore/Additions/Additions.cs | 31 - .../Firebase.Firestore.LoadBundleTask.cs | 20 + .../Transforms/Metadata.xml | 1385 +++++++++++++++-- 3 files changed, 1318 insertions(+), 118 deletions(-) delete mode 100644 source/com.google.firebase/firebase-firestore/Additions/Additions.cs create mode 100644 source/com.google.firebase/firebase-firestore/Additions/Firebase.Firestore.LoadBundleTask.cs diff --git a/source/com.google.firebase/firebase-firestore/Additions/Additions.cs b/source/com.google.firebase/firebase-firestore/Additions/Additions.cs deleted file mode 100644 index 505f302a0..000000000 --- a/source/com.google.firebase/firebase-firestore/Additions/Additions.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using Android.Runtime; -using Android.Gms.Extensions; - - -namespace Firebase.Firestore -{ - - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.firebase.firestore']/class[@name='LoadBundleTask']" - //[global::Android.Runtime.Register("com/google/firebase/firestore/LoadBundleTask", DoNotGenerateAcw = true)] - public partial class LoadBundleTask // : global::Android.Gms.Tasks.Task - { - protected override unsafe global::Java.Lang.Object RawResult - { - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.android.gms.tasks']/class[@name='Task']/method[@name='getResult' and count(parameter)=0]" - [Register("getResult", "()Ljava/lang/Object;", "GetGetResultHandler")] - get - { - const string __id = "getResult.()Ljava/lang/Object;"; - try - { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod(__id, this, null); - return (Java.Lang.Object)global::Java.Lang.Object.GetObject(__rm.Handle, JniHandleOwnership.TransferLocalRef); - } - finally - { - } - } - } - } -} diff --git a/source/com.google.firebase/firebase-firestore/Additions/Firebase.Firestore.LoadBundleTask.cs b/source/com.google.firebase/firebase-firestore/Additions/Firebase.Firestore.LoadBundleTask.cs new file mode 100644 index 000000000..d323cfaf0 --- /dev/null +++ b/source/com.google.firebase/firebase-firestore/Additions/Firebase.Firestore.LoadBundleTask.cs @@ -0,0 +1,20 @@ +using System; +using Android.Runtime; +using Android.Gms.Tasks; +using System.Runtime.CompilerServices; +using Android.Gms.Extensions; +using System.Diagnostics.CodeAnalysis; + +namespace Firebase.Firestore +{ + + // Metadata.xml XPath class reference: path="/api/package[@name='com.google.firebase.firestore']/class[@name='LoadBundleTask']" + // [global::Android.Runtime.Register ("com/google/firebase/firestore/LoadBundleTask", DoNotGenerateAcw=true)] + public partial class LoadBundleTask // : global::Android.Gms.Tasks.Task + { + [Android.Runtime.Preserve] + protected virtual Java.Lang.Object RawResult { + get { return base.RawResult; } + } + } +} \ No newline at end of file diff --git a/source/com.google.firebase/firebase-firestore/Transforms/Metadata.xml b/source/com.google.firebase/firebase-firestore/Transforms/Metadata.xml index 5e994e5d8..0c336ed26 100644 --- a/source/com.google.firebase/firebase-firestore/Transforms/Metadata.xml +++ b/source/com.google.firebase/firebase-firestore/Transforms/Metadata.xml @@ -285,37 +285,6 @@ Java.Lang.Object - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Java.Lang.Object + + + Java.Lang.Object + + + + + Firebase.Firestore.Ktx + + + + + OperationCaseData + OperationCaseData + + + OperationCaseData + + ValueTypeCaseData + ValueTypeCaseData - - + + ValueTypeCaseData + + - Java.Lang.Object + MatchingDocumentsData - Java.Lang.Object + MatchingDocumentsData + + + MatchingDocumentsData + + + MatchingDocumentsData + + + MatchingDocumentsData - Firebase.Firestore.Ktx + ConsistencySelectorCaseDataData + + + ConsistencySelectorCaseDataData + + + ConsistencySelectorCaseDataData + + + + + ReadWriteDataData + + + ReadWriteDataData + + + ReadWriteDataData + + + ReadWriteDataData + + + + + SumData + + + SumData + + + SumData + + + SumData + + + + + AvgData + + + AvgData + + + AvgData + + + AvgData + + + AvgData + + + + + + + ReadOnlyDataData + + + ReadOnlyDataData + + + ReadOnlyDataData + + + ReadOnlyDataData + + + + + OperandTypeCaseData + + + OperandTypeCaseData + + + OperandTypeCaseData + + + + + ModeCaseDataData + + + ModeCaseDataData + + + ModeCaseDataData + + + + + TargetChangeTypeData + + + TargetChangeTypeData + + + TargetChangeTypeData + + + TargetChangeTypeData + + + + + QueryTypeCaseData + + + QueryTypeCaseData + + + QueryTypeCaseData + + + QueryTypeCaseData + + + QueryTypeCaseData + + + + + QueryTypeCaseData + + + QueryTypeCaseData + + + QueryTypeCaseData + + + + + TargetTypeCaseData + + + TargetTypeCaseData + + + TargetTypeCaseData + + + + + ResumeTypeCaseData + + + ResumeTypeCaseData + + + ResumeTypeCaseData + + + + + FilterTypeCaseData + + + FilterTypeCaseData + + + FilterTypeCaseData + + + + + TargetTypeCaseData + + + TargetTypeCaseData + + + TargetTypeCaseData + + + + + ConsistencySelectorCaseData + + + ConsistencySelectorCaseData + + + ConsistencySelectorCaseData + + + ConsistencySelectorCaseData + + + ConsistencySelectorCaseData + + + ConsistencySelectorCaseData + + + + UpdateDocumentData + + + UpdateDocumentData + + + UpdateDocumentData + + + UpdateDocumentData + + + UpdateDocumentData + + + + + RunQueryData + + + RunQueryData + + + RunQueryData + + + RunQueryData + + + RunQueryData + + + + + RollbackData + + + RollbackData + + + RollbackData + + + RollbackData + + + RollbackData + + + + + ListenData + + + ListenData + + + ListenData + + + ListenData + + + ListenData + + + + + RemoveListenData + + + RemoveListenData + + + RemoveListenData + + + RemoveListenData + + + RemoveListenData + + + + + ListDocumentsData + + + ListDocumentsData + + + ListDocumentsData + + + ListDocumentsData + + + ListDocumentsData + + + + + ListCollectionIdsData + + + ListCollectionIdsData + + + ListCollectionIdsData + + + ListCollectionIdsData + + + ListCollectionIdsData + + + + + GetDocumentData + + + GetDocumentData + + + GetDocumentData + + + GetDocumentData + + + GetDocumentData + + + + + DeleteDocumentData + + + DeleteDocumentData + + + DeleteDocumentData + + + DeleteDocumentData + + + DeleteDocumentData + + + + + CreateDocumentData + + + CreateDocumentData + + + CreateDocumentData + + + CreateDocumentData + + + CreateDocumentData + + + + + CommitData + + + CommitData + + + CommitData + + + CommitData + + + CommitData + + + + + BeginTransactionData + + + BeginTransactionData + + + BeginTransactionData + + + BeginTransactionData + + + BeginTransactionData + + + + + BatchGetDocumentsData + + + BatchGetDocumentsData + + + BatchGetDocumentsData + + + BatchGetDocumentsData + + + BatchGetDocumentsData + + + + + ActionCaseData + + + ActionCaseData + + + ActionCaseData + + + + + QueryTypeCaseData + + + QueryTypeCaseData + + + QueryTypeCaseData + + + + + ConsistencySelectorCaseData + + + ConsistencySelectorCaseData + + + ConsistencySelectorCaseData + + + + + QueryTypeCaseData + + + + + ActionCaseData + + + ActionCaseData + + + ActionCaseData + + + + + ResponseTypeCaseData + + + ResponseTypeCaseData + + + ResponseTypeCaseData + + + + + ConditionTypeCaseData + + + ConditionTypeCaseData + + + ConditionTypeCaseData + + + + + TransformTypeCaseData + + + TransformTypeCaseData + + + TransformTypeCaseData + + + TransformTypeCaseData + + + + + ResultCaseData + + + ResultCaseData + + + ResultCaseData + + + + + TargetChangeCase + + + TargetChangeCase + + + TargetChangeCase + + + + + ConsistencySelectorCaseData + + + ConsistencySelectorCaseData + + + ConsistencySelectorCaseData + + + + + TargetChangeCaseData + + + TargetChangeCaseData + + + + + TargetChangeCaseData + + + TargetChangeCaseData + + + TargetChangeCaseData + + + + + DocumentTypeCaseData + + + DocumentTypeCaseData + + + DocumentTypeCaseData + + + + + IndexFieldsData + + + IndexFieldsData + + + IndexFieldsData + + + IndexFieldsData + + + + + ValueModeCaseData + + + ValueModeCaseData + + + ValueModeCaseData + + + + + OrderData + + + OrderData + + + OrderData + + + OrderData + + + + + ArrayConfigData + + + ArrayConfigData + + + ArrayConfigData + + + ArrayConfigData + + + ArrayConfigData + + + + + QueryScopeData + + + QueryScopeData + + + QueryScopeData + + + QueryScopeData + + + QueryScopeData + + + + + ElementTypeCaseData + + + ElementTypeCaseData + + + ElementTypeCaseData + + + + + + + QueryTypeCaseData + + + QueryTypeCaseData + + + QueryTypeCaseData From 873508886b4fa714e84eee3e40bc842254c5eb77 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 30 Dec 2024 16:39:07 +0100 Subject: [PATCH 021/140] com.google.firebase.firebase-firestore final fixes and cleanup --- .../performance-timings.cake.cake-timer.csv | 7 ++ .../performance-timings.cake.stopwatch.csv | 7 ++ .../Firebase.Firestore.LoadBundleTask.cs | 20 ------ .../Transforms/Metadata.xml | 66 +++++++++++++++++++ 4 files changed, 80 insertions(+), 20 deletions(-) create mode 100644 data/timings/20241230-154632/performance-timings.cake.cake-timer.csv create mode 100644 data/timings/20241230-154632/performance-timings.cake.stopwatch.csv delete mode 100644 source/com.google.firebase/firebase-firestore/Additions/Firebase.Firestore.LoadBundleTask.cs diff --git a/data/timings/20241230-154632/performance-timings.cake.cake-timer.csv b/data/timings/20241230-154632/performance-timings.cake.cake-timer.csv new file mode 100644 index 000000000..7ff503753 --- /dev/null +++ b/data/timings/20241230-154632/performance-timings.cake.cake-timer.csv @@ -0,0 +1,7 @@ + #TimingDataCake, data.timestamp, data.task, data.duration + #TimingDataCake, 20241230-153719.26, inject-variables, 00:00:00 + #TimingDataCake, 20241230-153720.63, javadocs-gps, 00:00:01.3624489 + #TimingDataCake, 20241230-153843.77, binderate, 00:01:23.1432200 + #TimingDataCake, 20241230-153844.1, metadata-verify, 00:00:00.3327316 + #TimingDataCake, 20241230-153905.62, libs-native, 00:00:21.5126355 + #TimingDataCake, 20241230-154632.43, libs, 00:07:26.7990019 diff --git a/data/timings/20241230-154632/performance-timings.cake.stopwatch.csv b/data/timings/20241230-154632/performance-timings.cake.stopwatch.csv new file mode 100644 index 000000000..e4fca4ac0 --- /dev/null +++ b/data/timings/20241230-154632/performance-timings.cake.stopwatch.csv @@ -0,0 +1,7 @@ + #TimingDataStopwatch, data.timestamp, data.task, data.duration + #TimingDataStopwatch, 20241230-153719.26, inject-variables, 00:00:00.0003172 + #TimingDataStopwatch, 20241230-153720.63, javadocs-gps, 00:00:01.3627711 + #TimingDataStopwatch, 20241230-153843.77, binderate, 00:01:24.5059941 + #TimingDataStopwatch, 20241230-153844.1, metadata-verify, 00:01:24.8387294 + #TimingDataStopwatch, 20241230-153905.62, libs-native, 00:01:46.3513845 + #TimingDataStopwatch, 20241230-154632.43, libs, 00:09:13.1504700 diff --git a/source/com.google.firebase/firebase-firestore/Additions/Firebase.Firestore.LoadBundleTask.cs b/source/com.google.firebase/firebase-firestore/Additions/Firebase.Firestore.LoadBundleTask.cs deleted file mode 100644 index d323cfaf0..000000000 --- a/source/com.google.firebase/firebase-firestore/Additions/Firebase.Firestore.LoadBundleTask.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using Android.Runtime; -using Android.Gms.Tasks; -using System.Runtime.CompilerServices; -using Android.Gms.Extensions; -using System.Diagnostics.CodeAnalysis; - -namespace Firebase.Firestore -{ - - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.firebase.firestore']/class[@name='LoadBundleTask']" - // [global::Android.Runtime.Register ("com/google/firebase/firestore/LoadBundleTask", DoNotGenerateAcw=true)] - public partial class LoadBundleTask // : global::Android.Gms.Tasks.Task - { - [Android.Runtime.Preserve] - protected virtual Java.Lang.Object RawResult { - get { return base.RawResult; } - } - } -} \ No newline at end of file diff --git a/source/com.google.firebase/firebase-firestore/Transforms/Metadata.xml b/source/com.google.firebase/firebase-firestore/Transforms/Metadata.xml index 0c336ed26..9e6e33628 100644 --- a/source/com.google.firebase/firebase-firestore/Transforms/Metadata.xml +++ b/source/com.google.firebase/firebase-firestore/Transforms/Metadata.xml @@ -1683,4 +1683,70 @@ + + + StateData + + + StateData + + + StateData + + + StateData + + + + + LimitTypeData + + + LimitTypeData + + + LimitTypeData + + + LimitTypeData + + + + + RawResult + + + protected + + \ No newline at end of file From 2fcd50494e60641b273672dbdaee70b8133d860b Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 30 Dec 2024 18:56:30 +0100 Subject: [PATCH 022/140] com.google.mlkit.common generated code cleanup --- .../common/Additions/Additions.cs | 32 ------------ ....Common.SDKInternal.OptionalModuleUtils.cs | 49 ------------------- .../common/Transforms/Metadata.xml | 18 ++----- 3 files changed, 4 insertions(+), 95 deletions(-) delete mode 100644 source/com.google.mlkit/common/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/common/Additions/Xamarin.Google.MLKit.Common.SDKInternal.OptionalModuleUtils.cs diff --git a/source/com.google.mlkit/common/Additions/Additions.cs b/source/com.google.mlkit/common/Additions/Additions.cs deleted file mode 100644 index 00f770259..000000000 --- a/source/com.google.mlkit/common/Additions/Additions.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -using Android.Runtime; -using Java.Interop; - - -namespace Xamarin.Google.MLKit.Common.Internal -{ - - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.mlkit.common.internal']/class[@name='CommonComponentRegistrar']" - // [global::Android.Runtime.Register ("com/google/mlkit/common/internal/CommonComponentRegistrar", DoNotGenerateAcw=true)] - public partial class CommonComponentRegistrar //: global::Java.Lang.Object, global::Firebase.Components.IComponentRegistrar { - { - public unsafe global::System.Collections.Generic.IList Components - { - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.mlkit.common.internal']/class[@name='CommonComponentRegistrar']/method[@name='getComponents' and count(parameter)=0]" - // [Register ("getComponents", "()Ljava/util/List;", "")] - get { - const string __id = "getComponents.()Ljava/util/List;"; - try { - var __rm = _members.InstanceMethods.InvokeNonvirtualObjectMethod (__id, this, null); - return (System.Collections.Generic.IList) global::Android.Runtime.JavaList.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } - } - } - - } -} \ No newline at end of file diff --git a/source/com.google.mlkit/common/Additions/Xamarin.Google.MLKit.Common.SDKInternal.OptionalModuleUtils.cs b/source/com.google.mlkit/common/Additions/Xamarin.Google.MLKit.Common.SDKInternal.OptionalModuleUtils.cs deleted file mode 100644 index 70c7c7c89..000000000 --- a/source/com.google.mlkit/common/Additions/Xamarin.Google.MLKit.Common.SDKInternal.OptionalModuleUtils.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.Google.MLKit.Common.SDKInternal { - - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.mlkit.common.sdkinternal']/class[@name='OptionalModuleUtils']" - // [global::Android.Runtime.Register ("com/google/mlkit/common/sdkinternal/OptionalModuleUtils", DoNotGenerateAcw=true)] - public partial class OptionalModuleUtils : global::Java.Lang.Object - { - /* - Issue?? - - unable to change [return] type of the property - - 1. Does nothing - - - System.Collections.Generic.IList < global::Android.Gms.Common.Feature > - - - 2. Removes property completely - - - System.Collections.Generic.IList < global::Android.Gms.Common.Feature > - - - 3. Workaround - copy code + remove-node + change code - - */ - // Metadata.xml XPath field reference: path="/api/package[@name='com.google.mlkit.common.sdkinternal']/class[@name='OptionalModuleUtils']/field[@name='EMPTY_FEATURES']" - [Register ("EMPTY_FEATURES")] - public static IList EmptyFeatures { - get { - const string __id = "EMPTY_FEATURES.[Lcom/google/android/gms/common/Feature;"; - - var __v = _members.StaticFields.GetObjectValue (__id); - return global::Android.Runtime.JavaArray.FromJniHandle (__v.Handle, JniHandleOwnership.TransferLocalRef); - } - } - } -} \ No newline at end of file diff --git a/source/com.google.mlkit/common/Transforms/Metadata.xml b/source/com.google.mlkit/common/Transforms/Metadata.xml index 54ba30929..f22343178 100644 --- a/source/com.google.mlkit/common/Transforms/Metadata.xml +++ b/source/com.google.mlkit/common/Transforms/Metadata.xml @@ -8,22 +8,12 @@ public - - - + path="/api/package[@name='com.google.mlkit.common.internal']/class[@name='CommonComponentRegistrar']" + /> - + /> + From b75448ca067fe8997c7e7c2d40718e539be053ab Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 30 Dec 2024 18:57:09 +0100 Subject: [PATCH 023/140] com.google.firebase.firebase-storage generaed code removal --- .../firebase-storage/Additions/Additions.cs | 36 ------------------- .../firebase-storage/Transforms/Metadata.xml | 2 -- 2 files changed, 38 deletions(-) diff --git a/source/com.google.firebase/firebase-storage/Additions/Additions.cs b/source/com.google.firebase/firebase-storage/Additions/Additions.cs index 7451c3547..76450d925 100644 --- a/source/com.google.firebase/firebase-storage/Additions/Additions.cs +++ b/source/com.google.firebase/firebase-storage/Additions/Additions.cs @@ -70,41 +70,5 @@ public System.Threading.Tasks.Task DeleteAsync () } } - public partial class StorageException - { - static Delegate cb_getMessage; -#pragma warning disable 0169 - static Delegate GetGetMessageHandler () - { - if (cb_getMessage == null) - cb_getMessage = JNINativeWrapper.CreateDelegate ((Func) n_GetMessage); - return cb_getMessage; - } - - static IntPtr n_GetMessage (IntPtr jnienv, IntPtr native__this) - { - global::Firebase.Storage.StorageException __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewString (__this.Message); - } -#pragma warning restore 0169 - - static IntPtr id_getMessage; - public override unsafe string Message { - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.firebase.storage']/class[@name='StorageException']/method[@name='getMessage' and count(parameter)=0]" - [Register ("getMessage", "()Ljava/lang/String;", "GetGetMessageHandler")] - get { - if (id_getMessage == IntPtr.Zero) - id_getMessage = JNIEnv.GetMethodID (class_ref, "getMessage", "()Ljava/lang/String;"); - try { - - if (GetType () == ThresholdType) - return JNIEnv.GetString (JNIEnv.CallObjectMethod (((global::Java.Lang.Throwable) this).Handle, id_getMessage), JniHandleOwnership.TransferLocalRef); - else - return JNIEnv.GetString (JNIEnv.CallNonvirtualObjectMethod (((global::Java.Lang.Throwable) this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "getMessage", "()Ljava/lang/String;")), JniHandleOwnership.TransferLocalRef); - } finally { - } - } - } - } } diff --git a/source/com.google.firebase/firebase-storage/Transforms/Metadata.xml b/source/com.google.firebase/firebase-storage/Transforms/Metadata.xml index 3c26c0126..7b1c0214f 100644 --- a/source/com.google.firebase/firebase-storage/Transforms/Metadata.xml +++ b/source/com.google.firebase/firebase-storage/Transforms/Metadata.xml @@ -24,8 +24,6 @@ Firebase.Storage.CancellableTask public - - From c94fb8b0c7a1666645be538673c964dbc8100213 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 30 Dec 2024 19:20:14 +0100 Subject: [PATCH 024/140] com.google.mlkit.object-detection-custom cleanup --- ....Custom.Internal.CustomObjectsRegistrar.cs | 32 ------------------- .../Transforms/Metadata.xml | 2 +- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 source/com.google.mlkit/object-detection-custom/Additions/Xamarin.Google.MLKit.Vision.Objects.Custom.Internal.CustomObjectsRegistrar.cs diff --git a/source/com.google.mlkit/object-detection-custom/Additions/Xamarin.Google.MLKit.Vision.Objects.Custom.Internal.CustomObjectsRegistrar.cs b/source/com.google.mlkit/object-detection-custom/Additions/Xamarin.Google.MLKit.Vision.Objects.Custom.Internal.CustomObjectsRegistrar.cs deleted file mode 100644 index fa093303c..000000000 --- a/source/com.google.mlkit/object-detection-custom/Additions/Xamarin.Google.MLKit.Vision.Objects.Custom.Internal.CustomObjectsRegistrar.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - - -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.Google.MLKit.Vision.Objects.Custom.Internal -{ - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.mlkit.vision.objects.custom.internal']/class[@name='CustomObjectsRegistrar']" - //[global::Android.Runtime.Register ("com/google/mlkit/vision/objects/custom/internal/CustomObjectsRegistrar", DoNotGenerateAcw=true)] - public partial class CustomObjectsRegistrar : global::Java.Lang.Object, global::Firebase.Components.IComponentRegistrar - { - public unsafe global::System.Collections.Generic.IList Components - { - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.mlkit.vision.objects.custom.internal']/class[@name='CustomObjectsRegistrar']/method[@name='getComponents' and count(parameter)=0]" - [Register ("getComponents", "()Ljava/util/List;", "")] - get { - const string __id = "getComponents.()Ljava/util/List;"; - try { - var __rm = _members.InstanceMethods.InvokeNonvirtualObjectMethod (__id, this, null); - return (System.Collections.Generic.IList) global::Android.Runtime.JavaList.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } - } - } - } -} \ No newline at end of file diff --git a/source/com.google.mlkit/object-detection-custom/Transforms/Metadata.xml b/source/com.google.mlkit/object-detection-custom/Transforms/Metadata.xml index 268ead148..eb35d2b8d 100644 --- a/source/com.google.mlkit/object-detection-custom/Transforms/Metadata.xml +++ b/source/com.google.mlkit/object-detection-custom/Transforms/Metadata.xml @@ -72,7 +72,7 @@ --> Date: Mon, 30 Dec 2024 19:20:48 +0100 Subject: [PATCH 025/140] com.google.mlkit.image-labeling-automl generated code cleanup --- .../Additions/AutoMLImageLabelerOptions.net80.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.net80.cs b/source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.net80.cs index ceec30714..f9d7526fa 100644 --- a/source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.net80.cs +++ b/source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.net80.cs @@ -5,6 +5,7 @@ #if ! NET9_0_OR_GREATER namespace Xamarin.Google.MLKit.Vision.Label.AutoML { + /* // Metadata.xml XPath class reference: path="/api/package[@name='com.google.mlkit.vision.label.automl']/class[@name='AutoMLImageLabelerOptions']" //[global::Android.Runtime.Register("com/google/mlkit/vision/label/automl/AutoMLImageLabelerOptions", DoNotGenerateAcw = true)] @@ -79,5 +80,6 @@ static IntPtr n_SetConfidenceThreshold_F(IntPtr jnienv, IntPtr native__this, flo } } + */ } #endif From 5347aa70f38d574f06333abbbaf5414ddbd3ba8a Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 30 Dec 2024 19:26:19 +0100 Subject: [PATCH 026/140] com.google.mlkit.object-detection generated code removal --- ...faults.Internal.DefaultObjectsRegistrar.cs | 27 ------------------- .../object-detection/Transforms/Metadata.xml | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 source/com.google.mlkit/object-detection/Additions/Xamarin.Google.MLKit.Vision.Objects.Defaults.Internal.DefaultObjectsRegistrar.cs diff --git a/source/com.google.mlkit/object-detection/Additions/Xamarin.Google.MLKit.Vision.Objects.Defaults.Internal.DefaultObjectsRegistrar.cs b/source/com.google.mlkit/object-detection/Additions/Xamarin.Google.MLKit.Vision.Objects.Defaults.Internal.DefaultObjectsRegistrar.cs deleted file mode 100644 index b4e697033..000000000 --- a/source/com.google.mlkit/object-detection/Additions/Xamarin.Google.MLKit.Vision.Objects.Defaults.Internal.DefaultObjectsRegistrar.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.Google.MLKit.Vision.Objects.Defaults.Internal -{ - - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.mlkit.vision.objects.defaults.internal']/class[@name='DefaultObjectsRegistrar']" - // [global::Android.Runtime.Register ("com/google/mlkit/vision/objects/defaults/internal/DefaultObjectsRegistrar", DoNotGenerateAcw=true)] - public partial class DefaultObjectsRegistrar //: global::Java.Lang.Object, global::Firebase.Components.IComponentRegistrar - { - public unsafe System.Collections.Generic.IList Components - { - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.mlkit.vision.objects.defaults.internal']/class[@name='DefaultObjectsRegistrar']/method[@name='getComponents' and count(parameter)=0]" - [Register ("getComponents", "()Ljava/util/List;", "")] - get { - const string __id = "getComponents.()Ljava/util/List;"; - try { - var __rm = _members.InstanceMethods.InvokeNonvirtualObjectMethod (__id, this, null); - return (System.Collections.Generic.IList) global::Android.Runtime.JavaList.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } - } - } - } -} \ No newline at end of file diff --git a/source/com.google.mlkit/object-detection/Transforms/Metadata.xml b/source/com.google.mlkit/object-detection/Transforms/Metadata.xml index 6477e4051..e5fdcb45c 100644 --- a/source/com.google.mlkit/object-detection/Transforms/Metadata.xml +++ b/source/com.google.mlkit/object-detection/Transforms/Metadata.xml @@ -1,7 +1,7 @@  Date: Mon, 30 Dec 2024 19:31:21 +0100 Subject: [PATCH 027/140] com.google.mlkit.vision-common generated code cleanup --- .../vision-common/Additions/Additions.cs | 28 ------------------- .../vision-common/Transforms/Metadata.xml | 2 +- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 source/com.google.mlkit/vision-common/Additions/Additions.cs diff --git a/source/com.google.mlkit/vision-common/Additions/Additions.cs b/source/com.google.mlkit/vision-common/Additions/Additions.cs deleted file mode 100644 index 32eb0f52b..000000000 --- a/source/com.google.mlkit/vision-common/Additions/Additions.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.Google.MLKit.Vision.Common.Internal -{ - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.mlkit.vision.common.internal']/class[@name='VisionCommonRegistrar']" - //[global::Android.Runtime.Register ("com/google/mlkit/vision/common/internal/VisionCommonRegistrar", DoNotGenerateAcw=true)] - public partial class VisionCommonRegistrar //: global::Java.Lang.Object, global::Firebase.Components.IComponentRegistrar { - { - - public unsafe global::System.Collections.Generic.IList Components - { - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.mlkit.vision.common.internal']/class[@name='VisionCommonRegistrar']/method[@name='getComponents' and count(parameter)=0]" - [Register ("getComponents", "()Ljava/util/List;", "")] - get { - const string __id = "getComponents.()Ljava/util/List;"; - try { - var __rm = _members.InstanceMethods.InvokeNonvirtualObjectMethod (__id, this, null); - return (global::System.Collections.Generic.IList ) global::Android.Runtime.JavaList.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } - } - } - - } -} diff --git a/source/com.google.mlkit/vision-common/Transforms/Metadata.xml b/source/com.google.mlkit/vision-common/Transforms/Metadata.xml index 0627e6886..208833ec6 100644 --- a/source/com.google.mlkit/vision-common/Transforms/Metadata.xml +++ b/source/com.google.mlkit/vision-common/Transforms/Metadata.xml @@ -10,7 +10,7 @@ --> From 7a013322d9ed8bf7535c1823e13cfbe2e5a40db0 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 1 Jan 2025 17:36:17 +0100 Subject: [PATCH 028/140] tensorflow cleanuo --- ...low.Lite.Support.Common.TensorProcessor.cs | 46 ------------------ ...rFlow.Lite.Support.Image.ImageProcessor.cs | 47 ------------------- .../Transforms/Metadata.xml | 3 +- 3 files changed, 1 insertion(+), 95 deletions(-) delete mode 100644 source/org.tensorflow/tensorflow-lite-support-api/Additions/Xamarin.TensorFlow.Lite.Support.Common.TensorProcessor.cs delete mode 100644 source/org.tensorflow/tensorflow-lite-support-api/Additions/Xamarin.TensorFlow.Lite.Support.Image.ImageProcessor.cs diff --git a/source/org.tensorflow/tensorflow-lite-support-api/Additions/Xamarin.TensorFlow.Lite.Support.Common.TensorProcessor.cs b/source/org.tensorflow/tensorflow-lite-support-api/Additions/Xamarin.TensorFlow.Lite.Support.Common.TensorProcessor.cs deleted file mode 100644 index 358521dda..000000000 --- a/source/org.tensorflow/tensorflow-lite-support-api/Additions/Xamarin.TensorFlow.Lite.Support.Common.TensorProcessor.cs +++ /dev/null @@ -1,46 +0,0 @@ -#nullable restore -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.TensorFlow.Lite.Support.Common -{ - - // Metadata.xml XPath class reference: path="/api/package[@name='org.tensorflow.lite.support.common']/class[@name='TensorProcessor']" - // [global::Android.Runtime.Register ("org/tensorflow/lite/support/common/TensorProcessor", DoNotGenerateAcw=true)] - public partial class TensorProcessor // : global::Xamarin.TensorFlow.Lite.Support.Common.SequentialProcessor - { - // [global::Android.Runtime.Register ("org/tensorflow/lite/support/common/TensorProcessor$Builder", DoNotGenerateAcw=true)] - public new partial class Builder // : global::Java.Lang.Object - { - static Delegate cb_buildTensorProcessor; -#pragma warning disable 0169 - static Delegate GetBuildTensorProcessorHandler () - { - if (cb_buildTensorProcessor == null) - cb_buildTensorProcessor = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_BuildTensorProcessor)); - return cb_buildTensorProcessor; - } - - static IntPtr n_BuildTensorProcessor (IntPtr jnienv, IntPtr native__this) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle (__this.BuildTensorProcessor ()); - } -#pragma warning restore 0169 - - // Metadata.xml XPath method reference: path="/api/package[@name='org.tensorflow.lite.support.common']/class[@name='TensorProcessor.Builder']/method[@name='build' and count(parameter)=0]" - [Register ("build", "()Lorg/tensorflow/lite/support/common/TensorProcessor;", "GetBuildTensorProcessorHandler")] - public virtual unsafe global::Xamarin.TensorFlow.Lite.Support.Common.TensorProcessor BuildTensorProcessor () - { - const string __id = "build.()Lorg/tensorflow/lite/support/common/TensorProcessor;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } - } - } - } -} \ No newline at end of file diff --git a/source/org.tensorflow/tensorflow-lite-support-api/Additions/Xamarin.TensorFlow.Lite.Support.Image.ImageProcessor.cs b/source/org.tensorflow/tensorflow-lite-support-api/Additions/Xamarin.TensorFlow.Lite.Support.Image.ImageProcessor.cs deleted file mode 100644 index dbb1e2085..000000000 --- a/source/org.tensorflow/tensorflow-lite-support-api/Additions/Xamarin.TensorFlow.Lite.Support.Image.ImageProcessor.cs +++ /dev/null @@ -1,47 +0,0 @@ -#nullable restore -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.TensorFlow.Lite.Support.Image -{ - - // Metadata.xml XPath class reference: path="/api/package[@name='org.tensorflow.lite.support.image']/class[@name='ImageProcessor']" - // [global::Android.Runtime.Register ("org/tensorflow/lite/support/image/ImageProcessor", DoNotGenerateAcw=true)] - public partial class ImageProcessor // : global::Xamarin.TensorFlow.Lite.Support.Common.SequentialProcessor - { - // Metadata.xml XPath class reference: path="/api/package[@name='org.tensorflow.lite.support.image']/class[@name='ImageProcessor.Builder']" - // [global::Android.Runtime.Register ("org/tensorflow/lite/support/image/ImageProcessor$Builder", DoNotGenerateAcw=true)] - public new partial class Builder // : global::Java.Lang.Object - { - static Delegate cb_buildImageProcessor; -#pragma warning disable 0169 - static Delegate GetBuildImageProcessorHandler () - { - if (cb_buildImageProcessor == null) - cb_buildImageProcessor = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_BuildImageProcessor)); - return cb_buildImageProcessor; - } - - static IntPtr n_BuildImageProcessor (IntPtr jnienv, IntPtr native__this) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle (__this.BuildImageProcessor ()); - } -#pragma warning restore 0169 - - // Metadata.xml XPath method reference: path="/api/package[@name='org.tensorflow.lite.support.image']/class[@name='ImageProcessor.Builder']/method[@name='build' and count(parameter)=0]" - [Register ("build", "()Lorg/tensorflow/lite/support/image/ImageProcessor;", "GetBuildImageProcessorHandler")] - public virtual unsafe global::Xamarin.TensorFlow.Lite.Support.Image.ImageProcessor BuildImageProcessor () - { - const string __id = "build.()Lorg/tensorflow/lite/support/image/ImageProcessor;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } - } - } - } -} \ No newline at end of file diff --git a/source/org.tensorflow/tensorflow-lite-support-api/Transforms/Metadata.xml b/source/org.tensorflow/tensorflow-lite-support-api/Transforms/Metadata.xml index 2d522c9a6..95f602986 100644 --- a/source/org.tensorflow/tensorflow-lite-support-api/Transforms/Metadata.xml +++ b/source/org.tensorflow/tensorflow-lite-support-api/Transforms/Metadata.xml @@ -131,8 +131,7 @@ BuildImageProcessor --> - + From ee024ca2473784b277b4a48446d74d96549dcd54 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 1 Jan 2025 17:36:44 +0100 Subject: [PATCH 029/140] compose.animations cleanup --- .../animation-core/Additions/Additions.cs | 6 - ...X.Compose.Animation.Core.IAnimationSpec.cs | 106 ----------------- ...pose.Animation.Core.IDecayAnimationSpec.cs | 107 ------------------ ...ose.Animation.Core.IFiniteAnimationSpec.cs | 106 ----------------- ...e.Animation.Core.InfiniteRepeatableSpec.cs | 33 ------ ...X.Compose.Animation.Core.RepeatableSpec.cs | 32 ------ ...ndroidX.Compose.Animation.Core.SnapSpec.cs | 31 ----- .../animation-core/Transforms/Metadata.xml | 1 - 8 files changed, 422 deletions(-) delete mode 100644 source/androidx.compose.animation/animation-core/Additions/Additions.cs delete mode 100644 source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IAnimationSpec.cs delete mode 100644 source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IDecayAnimationSpec.cs delete mode 100644 source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IFiniteAnimationSpec.cs delete mode 100644 source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.InfiniteRepeatableSpec.cs delete mode 100644 source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.RepeatableSpec.cs delete mode 100644 source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.SnapSpec.cs diff --git a/source/androidx.compose.animation/animation-core/Additions/Additions.cs b/source/androidx.compose.animation/animation-core/Additions/Additions.cs deleted file mode 100644 index aa70205d8..000000000 --- a/source/androidx.compose.animation/animation-core/Additions/Additions.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -delegate IntPtr _JniMarshal_PPL_L (IntPtr jnienv, IntPtr klass, IntPtr p0); diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IAnimationSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IAnimationSpec.cs deleted file mode 100644 index 8d0a72c21..000000000 --- a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IAnimationSpec.cs +++ /dev/null @@ -1,106 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -/* -namespace AndroidX.Compose.Animation.Core { - - // Metadata.xml XPath interface reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='AnimationSpec']" - [Register ("androidx/compose/animation/core/AnimationSpec", "", "AndroidX.Compose.Animation.Core.IAnimationSpecInvoker")] - [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] - public partial interface IAnimationSpec : IJavaObject, IJavaPeerable { - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='AnimationSpec']/method[@name='vectorize' and count(parameter)=1 and parameter[1][@type='androidx.compose.animation.core.TwoWayConverter<T, V>']]" - [Register ("vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedAnimationSpec;", "GetVectorize_Landroidx_compose_animation_core_TwoWayConverter_Handler:AndroidX.Compose.Animation.Core.IAnimationSpecInvoker, Xamarin.AndroidX.Compose.Animation.Animation.Core")] - [global::Java.Interop.JavaTypeParameters (new string [] {"V extends androidx.compose.animation.core.AnimationVector"})] - global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter); - - } - - [global::Android.Runtime.Register ("androidx/compose/animation/core/AnimationSpec", DoNotGenerateAcw=true)] - internal partial class IAnimationSpecInvoker : global::Java.Lang.Object, IAnimationSpec { - static readonly JniPeerMembers _members = new XAPeerMembers ("androidx/compose/animation/core/AnimationSpec", typeof (IAnimationSpecInvoker)); - - static IntPtr java_class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } - - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] - [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] - public override global::Java.Interop.JniPeerMembers JniPeerMembers { - get { return _members; } - } - - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] - [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] - protected override IntPtr ThresholdClass { - get { return class_ref; } - } - - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] - [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] - protected override global::System.Type ThresholdType { - get { return _members.ManagedPeerType; } - } - - IntPtr class_ref; - - public static IAnimationSpec GetObject (IntPtr handle, JniHandleOwnership transfer) - { - return global::Java.Lang.Object.GetObject (handle, transfer); - } - - static IntPtr Validate (IntPtr handle) - { - if (!JNIEnv.IsInstanceOf (handle, java_class_ref)) - throw new InvalidCastException ($"Unable to convert instance of type '{JNIEnv.GetClassNameFromInstance (handle)}' to type 'androidx.compose.animation.core.AnimationSpec'."); - return handle; - } - - protected override void Dispose (bool disposing) - { - if (this.class_ref != IntPtr.Zero) - JNIEnv.DeleteGlobalRef (this.class_ref); - this.class_ref = IntPtr.Zero; - base.Dispose (disposing); - } - - public IAnimationSpecInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Validate (handle), transfer) - { - IntPtr local_ref = JNIEnv.GetObjectClass (((global::Java.Lang.Object) this).Handle); - this.class_ref = JNIEnv.NewGlobalRef (local_ref); - JNIEnv.DeleteLocalRef (local_ref); - } - - static Delegate cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; -#pragma warning disable 0169 - static Delegate GetVectorize_Landroidx_compose_animation_core_TwoWayConverter_Handler () - { - if (cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ == null) - cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_L) n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_); - return cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; - } - - static IntPtr n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_converter) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var converter = (global::AndroidX.Compose.Animation.Core.ITwoWayConverter)global::Java.Lang.Object.GetObject (native_converter, JniHandleOwnership.DoNotTransfer); - IntPtr __ret = JNIEnv.ToLocalJniHandle (__this.Vectorize (converter)); - return __ret; - } -#pragma warning restore 0169 - - IntPtr id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; - public unsafe global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter) - { - if (id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ == IntPtr.Zero) - id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ = JNIEnv.GetMethodID (class_ref, "vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedAnimationSpec;"); - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue ((converter == null) ? IntPtr.Zero : ((global::Java.Lang.Object) converter).Handle); - var __ret = (Java.Lang.Object) global::Java.Lang.Object.GetObject (JNIEnv.CallObjectMethod (((global::Java.Lang.Object) this).Handle, id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_, __args), JniHandleOwnership.TransferLocalRef); - return __ret; - } - - } -} -*/ \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IDecayAnimationSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IDecayAnimationSpec.cs deleted file mode 100644 index 18e8aaf32..000000000 --- a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IDecayAnimationSpec.cs +++ /dev/null @@ -1,107 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -/* -namespace AndroidX.Compose.Animation.Core { - - // Metadata.xml XPath interface reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='DecayAnimationSpec']" - [Register ("androidx/compose/animation/core/DecayAnimationSpec", "", "AndroidX.Compose.Animation.Core.IDecayAnimationSpecInvoker")] - [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] - public partial interface IDecayAnimationSpec : IJavaObject, IJavaPeerable { - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='DecayAnimationSpec']/method[@name='vectorize' and count(parameter)=1 and parameter[1][@type='androidx.compose.animation.core.TwoWayConverter<T, V>']]" - [Register ("vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedDecayAnimationSpec;", "GetVectorize_Landroidx_compose_animation_core_TwoWayConverter_Handler:AndroidX.Compose.Animation.Core.IDecayAnimationSpecInvoker, Xamarin.AndroidX.Compose.Animation.Animation.Core")] - [global::Java.Interop.JavaTypeParameters (new string [] {"V extends androidx.compose.animation.core.AnimationVector"})] - global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter typeConverter); - - } - - [global::Android.Runtime.Register ("androidx/compose/animation/core/DecayAnimationSpec", DoNotGenerateAcw=true)] - internal partial class IDecayAnimationSpecInvoker : global::Java.Lang.Object, IDecayAnimationSpec { - - static readonly JniPeerMembers _members = new XAPeerMembers ("androidx/compose/animation/core/DecayAnimationSpec", typeof (IDecayAnimationSpecInvoker)); - - static IntPtr java_class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } - - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] - [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] - public override global::Java.Interop.JniPeerMembers JniPeerMembers { - get { return _members; } - } - - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] - [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] - protected override IntPtr ThresholdClass { - get { return class_ref; } - } - - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] - [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] - protected override global::System.Type ThresholdType { - get { return _members.ManagedPeerType; } - } - - IntPtr class_ref; - - public static IDecayAnimationSpec GetObject (IntPtr handle, JniHandleOwnership transfer) - { - return global::Java.Lang.Object.GetObject (handle, transfer); - } - - static IntPtr Validate (IntPtr handle) - { - if (!JNIEnv.IsInstanceOf (handle, java_class_ref)) - throw new InvalidCastException ($"Unable to convert instance of type '{JNIEnv.GetClassNameFromInstance (handle)}' to type 'androidx.compose.animation.core.DecayAnimationSpec'."); - return handle; - } - - protected override void Dispose (bool disposing) - { - if (this.class_ref != IntPtr.Zero) - JNIEnv.DeleteGlobalRef (this.class_ref); - this.class_ref = IntPtr.Zero; - base.Dispose (disposing); - } - - public IDecayAnimationSpecInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Validate (handle), transfer) - { - IntPtr local_ref = JNIEnv.GetObjectClass (((global::Java.Lang.Object) this).Handle); - this.class_ref = JNIEnv.NewGlobalRef (local_ref); - JNIEnv.DeleteLocalRef (local_ref); - } - - static Delegate cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; -#pragma warning disable 0169 - static Delegate GetVectorize_Landroidx_compose_animation_core_TwoWayConverter_Handler () - { - if (cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ == null) - cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_L) n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_); - return cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; - } - - static IntPtr n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_typeConverter) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var typeConverter = (global::AndroidX.Compose.Animation.Core.ITwoWayConverter)global::Java.Lang.Object.GetObject (native_typeConverter, JniHandleOwnership.DoNotTransfer); - IntPtr __ret = JNIEnv.ToLocalJniHandle (__this.Vectorize (typeConverter)); - return __ret; - } -#pragma warning restore 0169 - - IntPtr id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; - public unsafe global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter typeConverter) - { - if (id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ == IntPtr.Zero) - id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ = JNIEnv.GetMethodID (class_ref, "vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedDecayAnimationSpec;"); - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue ((typeConverter == null) ? IntPtr.Zero : ((global::Java.Lang.Object) typeConverter).Handle); - var __ret = (Java.Lang.Object) global::Java.Lang.Object.GetObject (JNIEnv.CallObjectMethod (((global::Java.Lang.Object) this).Handle, id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_, __args), JniHandleOwnership.TransferLocalRef); - return __ret; - } - - } -} -*/ diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IFiniteAnimationSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IFiniteAnimationSpec.cs deleted file mode 100644 index f1da9e03b..000000000 --- a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IFiniteAnimationSpec.cs +++ /dev/null @@ -1,106 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -/* -namespace AndroidX.Compose.Animation.Core { - - // Metadata.xml XPath interface reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='FiniteAnimationSpec']" - [Register ("androidx/compose/animation/core/FiniteAnimationSpec", "", "AndroidX.Compose.Animation.Core.IFiniteAnimationSpecInvoker")] - [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] - public partial interface IFiniteAnimationSpec : global::AndroidX.Compose.Animation.Core.IAnimationSpec { - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='FiniteAnimationSpec']/method[@name='vectorize' and count(parameter)=1 and parameter[1][@type='androidx.compose.animation.core.TwoWayConverter<T, V>']]" - [Register ("vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedFiniteAnimationSpec;", "GetVectorize_Landroidx_compose_animation_core_TwoWayConverter_Handler:AndroidX.Compose.Animation.Core.IFiniteAnimationSpecInvoker, Xamarin.AndroidX.Compose.Animation.Animation.Core")] - [global::Java.Interop.JavaTypeParameters (new string [] {"V extends androidx.compose.animation.core.AnimationVector"})] - global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter); - - } - - [global::Android.Runtime.Register ("androidx/compose/animation/core/FiniteAnimationSpec", DoNotGenerateAcw=true)] - internal partial class IFiniteAnimationSpecInvoker : global::Java.Lang.Object, IFiniteAnimationSpec { - static readonly JniPeerMembers _members = new XAPeerMembers ("androidx/compose/animation/core/FiniteAnimationSpec", typeof (IFiniteAnimationSpecInvoker)); - - static IntPtr java_class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } - - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] - [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] - public override global::Java.Interop.JniPeerMembers JniPeerMembers { - get { return _members; } - } - - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] - [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] - protected override IntPtr ThresholdClass { - get { return class_ref; } - } - - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] - [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] - protected override global::System.Type ThresholdType { - get { return _members.ManagedPeerType; } - } - - IntPtr class_ref; - - public static IFiniteAnimationSpec GetObject (IntPtr handle, JniHandleOwnership transfer) - { - return global::Java.Lang.Object.GetObject (handle, transfer); - } - - static IntPtr Validate (IntPtr handle) - { - if (!JNIEnv.IsInstanceOf (handle, java_class_ref)) - throw new InvalidCastException ($"Unable to convert instance of type '{JNIEnv.GetClassNameFromInstance (handle)}' to type 'androidx.compose.animation.core.FiniteAnimationSpec'."); - return handle; - } - - protected override void Dispose (bool disposing) - { - if (this.class_ref != IntPtr.Zero) - JNIEnv.DeleteGlobalRef (this.class_ref); - this.class_ref = IntPtr.Zero; - base.Dispose (disposing); - } - - public IFiniteAnimationSpecInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Validate (handle), transfer) - { - IntPtr local_ref = JNIEnv.GetObjectClass (((global::Java.Lang.Object) this).Handle); - this.class_ref = JNIEnv.NewGlobalRef (local_ref); - JNIEnv.DeleteLocalRef (local_ref); - } - - static Delegate cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; -#pragma warning disable 0169 - static Delegate GetVectorize_Landroidx_compose_animation_core_TwoWayConverter_Handler () - { - if (cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ == null) - cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_L) n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_); - return cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; - } - - static IntPtr n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_converter) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var converter = (global::AndroidX.Compose.Animation.Core.ITwoWayConverter)global::Java.Lang.Object.GetObject (native_converter, JniHandleOwnership.DoNotTransfer); - IntPtr __ret = JNIEnv.ToLocalJniHandle (__this.Vectorize (converter)); - return __ret; - } -#pragma warning restore 0169 - - IntPtr id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; - public unsafe global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter) - { - if (id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ == IntPtr.Zero) - id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ = JNIEnv.GetMethodID (class_ref, "vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedFiniteAnimationSpec;"); - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue ((converter == null) ? IntPtr.Zero : ((global::Java.Lang.Object) converter).Handle); - var __ret = (Java.Lang.Object) global::Java.Lang.Object.GetObject (JNIEnv.CallObjectMethod (((global::Java.Lang.Object) this).Handle, id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_, __args), JniHandleOwnership.TransferLocalRef); - return __ret; - } - - } -} -*/ diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.InfiniteRepeatableSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.InfiniteRepeatableSpec.cs deleted file mode 100644 index e16b54774..000000000 --- a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.InfiniteRepeatableSpec.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -/* -namespace AndroidX.Compose.Animation.Core -{ - - // Metadata.xml XPath class reference: path="/api/package[@name='androidx.compose.animation.core']/class[@name='InfiniteRepeatableSpec']" - // [global::Android.Runtime.Register ("androidx/compose/animation/core/InfiniteRepeatableSpec", DoNotGenerateAcw=true)] - // [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] - public sealed partial class InfiniteRepeatableSpec //: global::Java.Lang.Object, global::AndroidX.Compose.Animation.Core.IAnimationSpec - { - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.compose.animation.core']/class[@name='InfiniteRepeatableSpec']/method[@name='vectorize' and count(parameter)=1 and parameter[1][@type='androidx.compose.animation.core.TwoWayConverter<T, V>']]" - [Register ("vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedAnimationSpec;", "")] - [global::Java.Interop.JavaTypeParameters (new string [] {"V extends androidx.compose.animation.core.AnimationVector"})] - public unsafe global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter) - { - const string __id = "vectorize.(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedAnimationSpec;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((converter == null) ? IntPtr.Zero : ((global::Java.Lang.Object) converter).Handle); - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); - return (Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - global::System.GC.KeepAlive (converter); - } - } - - } -} -*/ diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.RepeatableSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.RepeatableSpec.cs deleted file mode 100644 index 76ce79b90..000000000 --- a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.RepeatableSpec.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -/* -namespace AndroidX.Compose.Animation.Core -{ - - // Metadata.xml XPath class reference: path="/api/package[@name='androidx.compose.animation.core']/class[@name='RepeatableSpec']" - // [global::Android.Runtime.Register ("androidx/compose/animation/core/RepeatableSpec", DoNotGenerateAcw=true)] - // [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] - public sealed partial class RepeatableSpec // : global::Java.Lang.Object, global::AndroidX.Compose.Animation.Core.IFiniteAnimationSpec - { - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.compose.animation.core']/class[@name='RepeatableSpec']/method[@name='vectorize' and count(parameter)=1 and parameter[1][@type='androidx.compose.animation.core.TwoWayConverter<T, V>']]" - [Register ("vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedFiniteAnimationSpec;", "")] - [global::Java.Interop.JavaTypeParameters (new string [] {"V extends androidx.compose.animation.core.AnimationVector"})] - public unsafe global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter) - { - const string __id = "vectorize.(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedFiniteAnimationSpec;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((converter == null) ? IntPtr.Zero : ((global::Java.Lang.Object) converter).Handle); - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); - return (Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - global::System.GC.KeepAlive (converter); - } - } - } -} -*/ \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.SnapSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.SnapSpec.cs deleted file mode 100644 index adcb60592..000000000 --- a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.SnapSpec.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -/* -namespace AndroidX.Compose.Animation.Core -{ - // Metadata.xml XPath class reference: path="/api/package[@name='androidx.compose.animation.core']/class[@name='SnapSpec']" - // [global::Android.Runtime.Register ("androidx/compose/animation/core/SnapSpec", DoNotGenerateAcw=true)] - // [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] - public sealed partial class SnapSpec //: global::Java.Lang.Object, global::AndroidX.Compose.Animation.Core.IDurationBasedAnimationSpec - { - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.compose.animation.core']/class[@name='SnapSpec']/method[@name='vectorize' and count(parameter)=1 and parameter[1][@type='androidx.compose.animation.core.TwoWayConverter<T, V>']]" - [Register ("vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedDurationBasedAnimationSpec;", "")] - [global::Java.Interop.JavaTypeParameters (new string [] {"V extends androidx.compose.animation.core.AnimationVector"})] - public unsafe global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter) - { - const string __id = "vectorize.(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedDurationBasedAnimationSpec;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((converter == null) ? IntPtr.Zero : ((global::Java.Lang.Object) converter).Handle); - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); - return (Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - global::System.GC.KeepAlive (converter); - } - } - } -} -*/ \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml b/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml index a7da39fba..2a5d3dfc7 100644 --- a/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml +++ b/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml @@ -1,5 +1,4 @@  - - - - + \ No newline at end of file From 4ed8c1974f09939f6325c5865fc13dec5eb33689 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 1 Jan 2025 19:11:05 +0100 Subject: [PATCH 033/140] androidx.compose.runtime.runtime-android cleanup --- ...pose.Runtime.Snapshots.SnapshotStateMap.cs | 25 ------ .../runtime-android/Transforms/Metadata.xml | 8 +- .../dynamicanimation/Additions/Additions.cs | 86 ------------------- 3 files changed, 4 insertions(+), 115 deletions(-) delete mode 100644 source/androidx.compose.runtime/runtime-android/Additions/AndroidX.Compose.Runtime.Snapshots.SnapshotStateMap.cs delete mode 100644 source/androidx.dynamicanimation/dynamicanimation/Additions/Additions.cs diff --git a/source/androidx.compose.runtime/runtime-android/Additions/AndroidX.Compose.Runtime.Snapshots.SnapshotStateMap.cs b/source/androidx.compose.runtime/runtime-android/Additions/AndroidX.Compose.Runtime.Snapshots.SnapshotStateMap.cs deleted file mode 100644 index 6dd2032c5..000000000 --- a/source/androidx.compose.runtime/runtime-android/Additions/AndroidX.Compose.Runtime.Snapshots.SnapshotStateMap.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace AndroidX.Compose.Runtime.Snapshots -{ - // Metadata.xml XPath class reference: path="/api/package[@name='androidx.compose.runtime.snapshots']/class[@name='SnapshotStateMap']" - // [global::Android.Runtime.Register ("androidx/compose/runtime/snapshots/SnapshotStateMap", DoNotGenerateAcw=true)] - // [global::Java.Interop.JavaTypeParameters (new string [] {"K", "V"})] - // public sealed partial class SnapshotStateMap //: global::Java.Lang.Object, global::AndroidX.Compose.Runtime.Snapshots.IStateObject, global::Java.Util.IMap, global::Kotlin.Jvm.Internal.Markers.IKMutableMap - // { - // // Metadata.xml XPath method reference: path="/api/package[@name='androidx.compose.runtime.snapshots']/class[@name='SnapshotStateMap']/method[@name='entrySet' and count(parameter)=0]" - // [Register ("entrySet", "()Ljava/util/Set;", "")] - // public unsafe global::System.Collections.ICollection EntrySet () - // { - // const string __id = "entrySet.()Ljava/util/Set;"; - // try { - // var __rm = _members.InstanceMethods.InvokeNonvirtualObjectMethod (__id, this, null); - // return (System.Collections.ICollection) global::Android.Runtime.JavaSet.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef); - // } finally { - // } - // } - // } -} \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-android/Transforms/Metadata.xml b/source/androidx.compose.runtime/runtime-android/Transforms/Metadata.xml index 825cee0ff..e24207c23 100644 --- a/source/androidx.compose.runtime/runtime-android/Transforms/Metadata.xml +++ b/source/androidx.compose.runtime/runtime-android/Transforms/Metadata.xml @@ -1,7 +1,8 @@  + - System.Collections.ICollection - --> - + \ No newline at end of file diff --git a/source/androidx.dynamicanimation/dynamicanimation/Additions/Additions.cs b/source/androidx.dynamicanimation/dynamicanimation/Additions/Additions.cs deleted file mode 100644 index 9473462a3..000000000 --- a/source/androidx.dynamicanimation/dynamicanimation/Additions/Additions.cs +++ /dev/null @@ -1,86 +0,0 @@ -// using System; -// using Android.Runtime; - -// namespace AndroidX.DynamicAnimation.Animation -// { -// internal static class __JniCtorUtil -// { -// internal static unsafe void CtorImpl(Java.Lang.Object sender, Type classType, IntPtr classRef, IntPtr methodId, string jniSignature, JValue* args, Action setHandle) -// { -// if (sender.Handle != IntPtr.Zero) -// return; - -// try -// { -// if (((object)sender).GetType() != classType) -// { -// setHandle( -// global::Android.Runtime.JNIEnv.StartCreateInstance(((object)sender).GetType(), jniSignature, args), -// JniHandleOwnership.TransferLocalRef); -// global::Android.Runtime.JNIEnv.FinishCreateInstance(((global::Java.Lang.Object)sender).Handle, jniSignature, args); -// return; -// } - -// if (methodId == IntPtr.Zero) -// methodId = JNIEnv.GetMethodID(classRef, "", jniSignature); -// setHandle( -// global::Android.Runtime.JNIEnv.StartCreateInstance(classRef, methodId, args), -// JniHandleOwnership.TransferLocalRef); -// JNIEnv.FinishCreateInstance(((global::Java.Lang.Object)sender).Handle, classRef, methodId, args); -// } -// finally -// { -// } -// } -// } - -// public partial class SpringAnimation -// { -// private const string CTOR_1 = "(Ljava/lang/Object;Landroid/support/animation/FloatPropertyCompat;)V"; -// static IntPtr id_ctor_1; - -// [Register(".ctor", CTOR_1, "")] -// public unsafe SpringAnimation(global::Java.Lang.Object @object, FloatPropertyCompat @property) -// : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer) -// { -// JValue* __args = stackalloc JValue[2]; -// __args[0] = new JValue(@object); -// __args[1] = new JValue(@property); - -// __JniCtorUtil.CtorImpl(this, typeof(SpringAnimation), class_ref, id_ctor_1, CTOR_1, __args, SetHandle); -// } - - -// private const string JNI_CTOR_2 = "(Ljava/lang/Object;Landroid/support/animation/FloatPropertyCompat;F)V"; -// static IntPtr id_ctor_2; - -// [Register(".ctor", JNI_CTOR_2, "")] -// public unsafe SpringAnimation(global::Java.Lang.Object @object, FloatPropertyCompat @property, float finalPosition) -// : base(IntPtr.Zero, JniHandleOwnership.DoNotTransfer) -// { -// JValue* __args = stackalloc JValue[3]; -// __args[0] = new JValue(@object); -// __args[1] = new JValue(@property); -// __args[2] = new JValue(finalPosition); - -// __JniCtorUtil.CtorImpl(this, typeof(SpringAnimation), class_ref, id_ctor_2, JNI_CTOR_2, __args, SetHandle); -// } -// } - -// public partial class FlingAnimation -// { -// private const string JNI_CTOR_1 = "(Ljava/lang/Object;Landroid/support/animation/FloatPropertyCompat;)V"; -// static IntPtr id_ctor_1; - -// [Register(".ctor", JNI_CTOR_1, "")] -// public unsafe FlingAnimation(global::Java.Lang.Object @object, FloatPropertyCompat @property) -// : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer) -// { -// JValue* __args = stackalloc JValue[2]; -// __args[0] = new JValue(@object); -// __args[1] = new JValue(@property); - -// __JniCtorUtil.CtorImpl(this, typeof(FlingAnimation), class_ref, id_ctor_1, JNI_CTOR_1, __args, SetHandle); -// } -// } -// } From 6ddf6f001b2c80a20b2fb0f8a9c0b0ced567133e Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 1 Jan 2025 20:57:22 +0100 Subject: [PATCH 034/140] androidx.leanback.leanback cleanup --- .../leanback/Additions/ConstantState.cs | 81 ------------------- .../leanback/Transforms/Metadata.xml | 14 +++- 2 files changed, 10 insertions(+), 85 deletions(-) diff --git a/source/androidx.leanback/leanback/Additions/ConstantState.cs b/source/androidx.leanback/leanback/Additions/ConstantState.cs index 3b2c6871d..621c6b1a4 100644 --- a/source/androidx.leanback/leanback/Additions/ConstantState.cs +++ b/source/androidx.leanback/leanback/Additions/ConstantState.cs @@ -18,87 +18,6 @@ public partial class ConstantState } } - //static IntPtr id_setColorFilter; - //[Register ("setColorFilter", "(Landroid.graphics.ColorFilter;)V", "")] - //public override void SetColorFilter (Android.Graphics.ColorFilter filter) - //{ - // if (id_setColorFilter == IntPtr.Zero) - // id_setColorFilter = JNIEnv.GetMethodID (class_ref, "setColorFilter", "(Landroid.graphics.ColorFilter;)V"); - // try { - // JNIEnv.CallVoidMethod (Handle, id_setColorFilter, new JValue (filter)); - // } finally { - // } - //} } } } - - -//namespace AndroidX.Leanback.Animation { -// -// // Metadata.xml XPath class reference: path="/api/package[@name='AndroidX.Leanback.leanback.animation']/class[@name='UntargetableAnimatorSet']" -// public partial class UntargetableAnimatorSet -// { -//// static IntPtr id_getStartDelay; -//// static IntPtr id_setStartDelay_J; -//// -//// public override unsafe long StartDelay { -//// // Metadata.xml XPath method reference: path="/api/package[@name='AndroidX.Leanback.leanback.animation']/class[@name='UntargetableAnimatorSet']/method[@name='getStartDelay' and count(parameter)=0]" -//// [Register ("getStartDelay", "()J", "GetGetStartDelayHandler")] -//// get { -//// if (id_getStartDelay == IntPtr.Zero) -//// id_getStartDelay = JNIEnv.GetMethodID (class_ref, "getStartDelay", "()J"); -//// try { -//// -//// if (GetType () == ThresholdType) -//// return JNIEnv.CallLongMethod (Handle, id_getStartDelay); -//// else -//// return JNIEnv.CallNonvirtualLongMethod (Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "getStartDelay", "()J")); -//// } finally { -//// } -//// } -//// // Metadata.xml XPath method reference: path="/api/package[@name='AndroidX.Leanback.leanback.animation']/class[@name='UntargetableAnimatorSet']/method[@name='setStartDelay' and count(parameter)=1 and parameter[1][@type='long']]" -//// [Register ("setStartDelay", "(J)V", "GetSetStartDelay_JHandler")] -//// set { -//// if (id_setStartDelay_J == IntPtr.Zero) -//// id_setStartDelay_J = JNIEnv.GetMethodID (class_ref, "setStartDelay", "(J)V"); -//// try { -//// JValue* __args = stackalloc JValue [1]; -//// __args [0] = new JValue (value); -//// -//// if (GetType () == ThresholdType) -//// JNIEnv.CallVoidMethod (Handle, id_setStartDelay_J, __args); -//// else -//// JNIEnv.CallNonvirtualVoidMethod (Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setStartDelay", "(J)V"), __args); -//// } finally { -//// } -//// } -//// } -// -// -// static IntPtr id_getStartDelay; -// static IntPtr id_setStartDelay; -// -// public override long StartDelay { -// [Register ("getStartDelay", "()J", "GetGetStartDelayHandler")] -// get { -// if (id_getStartDelay == IntPtr.Zero) -// id_getStartDelay = JNIEnv.GetMethodID (class_ref, "getStartDelay", "()J"); -// -// return JNIEnv.CallLongMethod (Handle, id_getStartDelay); -// } -// -// -// [Register ("setStartDelay", "(J)V", "")] -// set { -// if (id_setStartDelay == IntPtr.Zero) -// id_setStartDelay = JNIEnv.GetMethodID (class_ref, "setStartDelay", "(J)V"); -// try { -// JNIEnv.CallVoidMethod (Handle, id_setStartDelay, new JValue ((long) value)); -// } finally { -// } -// } -// } -// -// } -//} \ No newline at end of file diff --git a/source/androidx.leanback/leanback/Transforms/Metadata.xml b/source/androidx.leanback/leanback/Transforms/Metadata.xml index 6b853ca04..6016f09fd 100644 --- a/source/androidx.leanback/leanback/Transforms/Metadata.xml +++ b/source/androidx.leanback/leanback/Transforms/Metadata.xml @@ -63,7 +63,9 @@ + @@ -267,9 +269,13 @@ > protected - - + + + androidx.leanback.widget.Row + + \ No newline at end of file From 2a80d19294cda42a63d6105eff810ff1aadae076 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 1 Jan 2025 21:18:39 +0100 Subject: [PATCH 035/140] androidx.legacy.legacy-support-core-ui cleanup --- .../Additions/Additions.cs | 45 ------------------- .../Transforms/Metadata.xml | 4 +- 2 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 source/androidx.legacy/legacy-support-core-ui/Additions/Additions.cs diff --git a/source/androidx.legacy/legacy-support-core-ui/Additions/Additions.cs b/source/androidx.legacy/legacy-support-core-ui/Additions/Additions.cs deleted file mode 100644 index 24930a912..000000000 --- a/source/androidx.legacy/legacy-support-core-ui/Additions/Additions.cs +++ /dev/null @@ -1,45 +0,0 @@ -//using System; -//using System.Collections.Generic; -//using Android.Runtime; - -//namespace AndroidX.Legacy.View -//{ -// // Metadata.xml XPath class reference: path="/api/package[@name='android.support.v4.view']/class[@name='PagerTabStrip']" -// public partial class PagerTabStrip -// { -// static Delegate cb_setBackgroundColor_I; -//#pragma warning disable 0169 -// static Delegate GetSetBackgroundColor_IHandler () -// { -// if (cb_setBackgroundColor_I == null) -// cb_setBackgroundColor_I = JNINativeWrapper.CreateDelegate ((Action)n_SetBackgroundColor_I); -// return cb_setBackgroundColor_I; -// } - -// static void n_SetBackgroundColor_I (IntPtr jnienv, IntPtr native__this, int color) -// { -// global::Android.Support.V4.View.PagerTabStrip __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); -// __this.SetBackgroundColor (color); -// } -//#pragma warning restore 0169 - -// static IntPtr id_setBackgroundColor_I; -// // Metadata.xml XPath method reference: path="/api/package[@name='android.support.v4.view']/class[@name='PagerTabStrip']/method[@name='setBackgroundColor' and count(parameter)=1 and parameter[1][@type='int']]" -// [Register ("setBackgroundColor", "(I)V", "GetSetBackgroundColor_IHandler")] -// public unsafe void SetBackgroundColor (int color) -// { -// if (id_setBackgroundColor_I == IntPtr.Zero) -// id_setBackgroundColor_I = JNIEnv.GetMethodID (class_ref, "setBackgroundColor", "(I)V"); -// try { -// JValue* __args = stackalloc JValue [1]; -// __args [0] = new JValue (color); - -// if (GetType () == ThresholdType) -// JNIEnv.CallVoidMethod (Handle, id_setBackgroundColor_I, __args); -// else -// JNIEnv.CallNonvirtualVoidMethod (Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setBackgroundColor", "(I)V"), __args); -// } finally { -// } -// } -// } -//} \ No newline at end of file diff --git a/source/androidx.legacy/legacy-support-core-ui/Transforms/Metadata.xml b/source/androidx.legacy/legacy-support-core-ui/Transforms/Metadata.xml index d999df55d..2accbee5d 100644 --- a/source/androidx.legacy/legacy-support-core-ui/Transforms/Metadata.xml +++ b/source/androidx.legacy/legacy-support-core-ui/Transforms/Metadata.xml @@ -19,9 +19,11 @@ not found (most likely came in during Android.Support -> AndroidX) public --> - + public Java.Lang.Object From dd692a9cb210744e03e94c937d3165a9d9cd9490 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 2 Jan 2025 12:43:17 +0100 Subject: [PATCH 036/140] androidx.media3.media3-exoplayer-hls cleanup --- ...dia3.ExoPlayer.Hls.Playlist.HlsPlaylist.cs | 32 ++++++------------- .../Transforms/Metadata.xml | 14 ++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/source/androidx.media3/media3-exoplayer-hls/Additions/AndroidX.Media3.ExoPlayer.Hls.Playlist.HlsPlaylist.cs b/source/androidx.media3/media3-exoplayer-hls/Additions/AndroidX.Media3.ExoPlayer.Hls.Playlist.HlsPlaylist.cs index d412537f9..4dc0b2387 100644 --- a/source/androidx.media3/media3-exoplayer-hls/Additions/AndroidX.Media3.ExoPlayer.Hls.Playlist.HlsPlaylist.cs +++ b/source/androidx.media3/media3-exoplayer-hls/Additions/AndroidX.Media3.ExoPlayer.Hls.Playlist.HlsPlaylist.cs @@ -1,32 +1,18 @@ +#nullable restore using System; using System.Collections.Generic; using Android.Runtime; -using AndroidX.Media3.Common; using Java.Interop; -namespace AndroidX.Media3.ExoPlayer.Hls.Playlist; -public partial class HlsPlaylist +namespace AndroidX.Media3.ExoPlayer.Hls.Playlist { - public abstract global::Java.Lang.Object? Copy (global::System.Collections.Generic.IList? p0); -} -internal partial class HlsPlaylistInvoker -{ - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.media3.exoplayer.hls.playlist']/class[@name='HlsPlaylist']/method[@name='copy' and count(parameter)=1 and parameter[1][@type='java.util.List<androidx.media3.common.StreamKey>']]" - [Register ("copy", "(Ljava/util/List;)Ljava/lang/Object;", "GetCopy_Ljava_util_List_Handler")] - public override unsafe global::Java.Lang.Object? Copy (global::System.Collections.Generic.IList? streamKeys) - { - const string __id = "copy.(Ljava/util/List;)Ljava/lang/Object;"; - IntPtr native_streamKeys = global::Android.Runtime.JavaList.ToLocalJniHandle (streamKeys); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (native_streamKeys); - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - JNIEnv.DeleteLocalRef (native_streamKeys); - global::System.GC.KeepAlive (streamKeys); - } - } + public abstract partial class HlsPlaylist + { + public unsafe global::Java.Lang.Object? Copy (global::System.Collections.Generic.IList? streamKeys) + { + throw new NotImplementedException(); + } + } } \ No newline at end of file diff --git a/source/androidx.media3/media3-exoplayer-hls/Transforms/Metadata.xml b/source/androidx.media3/media3-exoplayer-hls/Transforms/Metadata.xml index d82555e45..04f6ef6ca 100644 --- a/source/androidx.media3/media3-exoplayer-hls/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-exoplayer-hls/Transforms/Metadata.xml @@ -88,4 +88,18 @@ true + + + new + + + new + + \ No newline at end of file From f0a3eb3089371d262a9af5d43ed1191937cae1f0 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 2 Jan 2025 13:47:40 +0100 Subject: [PATCH 037/140] androidx.media3.media3-ui cleanup --- .../media3-ui/Additions/DefaultTimeBar.cs | 42 ------------------- .../media3-ui/Transforms/Metadata.xml | 18 ++++++++ 2 files changed, 18 insertions(+), 42 deletions(-) delete mode 100644 source/androidx.media3/media3-ui/Additions/DefaultTimeBar.cs diff --git a/source/androidx.media3/media3-ui/Additions/DefaultTimeBar.cs b/source/androidx.media3/media3-ui/Additions/DefaultTimeBar.cs deleted file mode 100644 index 3a0adf996..000000000 --- a/source/androidx.media3/media3-ui/Additions/DefaultTimeBar.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using Android.Runtime; -using Java.Interop; - -namespace AndroidX.Media3.UI; - -public partial class DefaultTimeBar -{ - // This method cannot be bound because it has a base type method of the same - // name that has been changed to a property. We need "SetEnabled" to match - // an implemented interface name. - static Delegate? cb_setEnabled_Z; - -#pragma warning disable 0169 - static Delegate GetSetEnabled_ZHandler () - { - if (cb_setEnabled_Z == null) - cb_setEnabled_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPZ_V (n_SetEnabled_Z)); - return cb_setEnabled_Z; - } - - static void n_SetEnabled_Z (IntPtr jnienv, IntPtr native__this, bool enabled) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - __this.SetEnabled (enabled); - } -#pragma warning restore 0169 - - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.media3.ui']/class[@name='DefaultTimeBar']/method[@name='setDuration' and count(parameter)=1 and parameter[1][@type='long']]" - [Register ("setEnabled", "(Z)V", "GetSetEnabled_ZHandler")] - public virtual unsafe void SetEnabled (bool enabled) - { - const string __id = "setEnabled.(Z)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (enabled); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - } - } - -} \ No newline at end of file diff --git a/source/androidx.media3/media3-ui/Transforms/Metadata.xml b/source/androidx.media3/media3-ui/Transforms/Metadata.xml index 3c4c82e4d..5313e1d2f 100644 --- a/source/androidx.media3/media3-ui/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-ui/Transforms/Metadata.xml @@ -3,4 +3,22 @@ + + + + + + + + + none + \ No newline at end of file From cb7834222ee3737793d54408b19f83b048079bb9 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 2 Jan 2025 15:50:04 +0100 Subject: [PATCH 038/140] Update published-namespaces.txt --- published-namespaces.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/published-namespaces.txt b/published-namespaces.txt index 9ba02595a..aa6d6159c 100644 --- a/published-namespaces.txt +++ b/published-namespaces.txt @@ -977,6 +977,7 @@ Google.Ads.Mediation Google.Ads.Mediation.Admob Google.Ads.Nonagon.Util.Logging.Csi Google.Android.Gms.Ads.Nonagon.SignalGeneration +Google.Android.Gms.Maps.Internal Google.Android.Libraries.AppActions.Service Google.Android.Libraries.Places.Api.Auth Google.Android.Material.Animation @@ -1037,6 +1038,7 @@ Google.Android.Material.Transition Google.Android.Material.Transition.Platform Google.AndroidLibraries.BarHopper Google.Api +Google.Apphosting.DataStore.Testing Google.Assistant.AppActions.Suggestions Google.Assistant.AppActions.Suggestions.Client Google.Assistant.AppActions.Widgets @@ -1432,9 +1434,7 @@ Xamarin.Google.MLKit.Vision.MediaPipe.Segmentation Xamarin.Google.MLKit.Vision.MediaPipe.Utils Xamarin.Google.MLKit.Vision.Objects Xamarin.Google.MLKit.Vision.Objects.Custom -Xamarin.Google.MLKit.Vision.Objects.Custom.Internal Xamarin.Google.MLKit.Vision.Objects.Defaults -Xamarin.Google.MLKit.Vision.Objects.Defaults.Internal Xamarin.Google.MLKit.Vision.Objects.Internal Xamarin.Google.MLKit.Vision.Pose Xamarin.Google.MLKit.Vision.Pose.Accurate From 2e57607f0123a704de25cc3cea24d38c34433f4b Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 2 Jan 2025 16:48:59 +0100 Subject: [PATCH 039/140] androidx.preference.preference cleanup --- .../preference/Additions/Additions.cs | 11 -------- .../Additions/PreferenceGroupAdapter.cs | 25 ------------------- 2 files changed, 36 deletions(-) delete mode 100644 source/androidx.preference/preference/Additions/Additions.cs delete mode 100644 source/androidx.preference/preference/Additions/PreferenceGroupAdapter.cs diff --git a/source/androidx.preference/preference/Additions/Additions.cs b/source/androidx.preference/preference/Additions/Additions.cs deleted file mode 100644 index 02d529bb6..000000000 --- a/source/androidx.preference/preference/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace AndroidX.Preference -{ - public partial class PreferenceGroupAdapter - { - } -} diff --git a/source/androidx.preference/preference/Additions/PreferenceGroupAdapter.cs b/source/androidx.preference/preference/Additions/PreferenceGroupAdapter.cs deleted file mode 100644 index cc0635aa8..000000000 --- a/source/androidx.preference/preference/Additions/PreferenceGroupAdapter.cs +++ /dev/null @@ -1,25 +0,0 @@ -// using System; - -// namespace AndroidX.Preference -// { -// public partial class PreferenceGroupAdapter -// { - -// //public void OnBindViewHolder(global::AndroidX.RecyclerView.Widget.RecyclerView.ViewHolder holder, int position) -// //{ -// // this.OnBindViewHolder((global::Java.Lang.Object)holder, position); -// //} - -// public override void OnBindViewHolder (Java.Lang.Object holder, int position) -// { -// this.OnBindViewHolder((global::Android.Views.ViewGroup)holder, position); - -// return; -// } - -// public Java.Lang.Object OnCreateViewHolder (Java.Lang.Object holder, int position) -// { -// return this.OnCreateViewHolder((global::Android.Views.ViewGroup)holder, position); -// } -// } -// } From 6d080afea51a26d3678e091e4c85c2c60ea69abf Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 2 Jan 2025 16:50:04 +0100 Subject: [PATCH 040/140] androidx.recyclerview cleanup --- .../recyclerview-selection/Additions/Additions.cs | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 source/androidx.recyclerview/recyclerview-selection/Additions/Additions.cs diff --git a/source/androidx.recyclerview/recyclerview-selection/Additions/Additions.cs b/source/androidx.recyclerview/recyclerview-selection/Additions/Additions.cs deleted file mode 100644 index 379b6fbf5..000000000 --- a/source/androidx.recyclerview/recyclerview-selection/Additions/Additions.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace AndroidX.RecyclerView.Selection -{ -} \ No newline at end of file From ed5dd2700cb03c7d65cd11bcc27b6b42559d76b7 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 2 Jan 2025 23:38:00 +0100 Subject: [PATCH 041/140] com.google.android.gms.play-services-games cleanup --- .../Additions/Android.Gms.Games.GamesClass.cs | 35 +++++++------------ .../Transforms/Metadata.xml | 15 +++----- 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/source/com.google.android.gms/play-services-games/Additions/Android.Gms.Games.GamesClass.cs b/source/com.google.android.gms/play-services-games/Additions/Android.Gms.Games.GamesClass.cs index af6cb1d11..2fc114d02 100644 --- a/source/com.google.android.gms/play-services-games/Additions/Android.Gms.Games.GamesClass.cs +++ b/source/com.google.android.gms/play-services-games/Additions/Android.Gms.Games.GamesClass.cs @@ -1,32 +1,23 @@ +#nullable restore using System; using System.Collections.Generic; using Android.Runtime; using Java.Interop; -namespace Android.Gms.Games { +namespace Android.Gms.Games +{ - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.android.gms.games']/class[@name='Games']" - // [global::Android.Runtime.Register ("com/google/android/gms/games/Games", DoNotGenerateAcw=true)] - public sealed partial class GamesClass // : global::Java.Lang.Object - { - public sealed partial class GamesOptions // : global::Java.Lang.Object, global::Android.Gms.Auth.Api.SignIn.IGoogleSignInOptionsExtension, global::Android.Gms.Common.Apis.Api.IApiOptionsHasGoogleSignInAccountOptions, global::Android.Gms.Common.Apis.Api.IApiOptionsOptional - { - public unsafe global::System.Collections.Generic.IList ImpliedScopes - { - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.android.gms.games']/class[@name='Games.GamesOptions']/method[@name='getImpliedScopes' and count(parameter)=0]" - [Register ("getImpliedScopes", "()Ljava/util/List;", "")] + public sealed partial class GamesClass + { + public sealed partial class GamesOptions + { + public System.Collections.Generic.IList ImpliedScopes + { get - { - const string __id = "getImpliedScopes.()Ljava/util/List;"; - try { - var __rm = _members.InstanceMethods.InvokeNonvirtualObjectMethod (__id, this, null); - return - (global::System.Collections.Generic.IList ) - global::Android.Runtime.JavaList.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + { + return (System.Collections.Generic.IList ) this.ImpliedScopesBound; } } - } - } + } + } } diff --git a/source/com.google.android.gms/play-services-games/Transforms/Metadata.xml b/source/com.google.android.gms/play-services-games/Transforms/Metadata.xml index 33a027eb9..39e1ecd92 100644 --- a/source/com.google.android.gms/play-services-games/Transforms/Metadata.xml +++ b/source/com.google.android.gms/play-services-games/Transforms/Metadata.xml @@ -200,9 +200,6 @@ - - - @@ -518,17 +515,13 @@ - - + + From c34fc7f2c726b374cf66264c6d3cf54b8ccc7628 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 3 Jan 2025 17:33:50 +0100 Subject: [PATCH 042/140] androidx.media3.session cleanup and fixes --- .../media3-session/Transforms/Metadata.xml | 81 +++++++++++++++++-- 1 file changed, 75 insertions(+), 6 deletions(-) diff --git a/source/androidx.media3/media3-session/Transforms/Metadata.xml b/source/androidx.media3/media3-session/Transforms/Metadata.xml index 3aadb21e7..a4a7ca004 100644 --- a/source/androidx.media3/media3-session/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-session/Transforms/Metadata.xml @@ -1,4 +1,16 @@ + + + + SetExtrasWithBundleAsBuilder - override - + + + OnGetSeesionFromMediaLibraryService + + + new + + + BuildAsMediaSession + + + public + + + + + + + + + + + + + \ No newline at end of file From ca1333df365f81958de4a009a34d75f3f8c02896 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 11 Jan 2025 16:47:09 +0100 Subject: [PATCH 043/140] cleanup --- .../Additions/Additions.cs | 0 .../androidx.car/car/Additions/Additions.cs | 37 ---- .../collection-ktx/Additions/Additions.cs | 11 -- .../Additions/Additions.cs | 9 - .../foundation-layout/Additions/Additions.cs | 4 - .../foundation/Additions/Additions.cs | 5 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../material-ripple/Additions/Additions.cs | 4 - .../material/Additions/Additions.cs | 4 - .../runtime-livedata/Additions/Additions.cs | 5 - .../runtime-rxjava2/Additions/Additions.cs | 5 - .../runtime-rxjava3/Additions/Additions.cs | 5 - .../runtime-saveable/Additions/Additions.cs | 5 - .../runtime/Additions/Additions.cs | 5 - .../ui-text/Additions/Additions.cs | 29 ---- .../ui-tooling-data/Additions/Additions.cs | 4 - .../ui-tooling-preview/Additions/Additions.cs | 4 - .../ui-tooling/Additions/Additions.cs | 4 - .../ui-unit/Additions/Additions.cs | 4 - .../ui-util/Additions/Additions.cs | 4 - .../ui-viewbinding/Additions/Additions.cs | 4 - .../ui/Additions/Additions.cs | 4 - .../compose-runtime/Additions/Additions.cs | 4 - ...ndroidX.ConstraintLayout.Core.Additions.cs | 7 - .../core-animation/Additions/Additions.cs | 1 - .../Additions/Additions.cs | 8 - .../core-ktx/Additions/Additions.cs | 11 -- .../core-role/Additions/Additions.cs | 1 - .../core-splashscreen/Additions/Additions.cs | 4 - .../Additions/Additions.cs | 9 - .../databinding-common/Additions/Additions.cs | 9 - .../Additions/Additions.cs | 8 - .../viewbinding/Additions/Additions.cs | 8 - ...e.Handlers.ReplaceFileCorruptionHandler.cs | 8 - .../AndroidX.DataStore.Core.IDataMigration.cs | 8 - .../AndroidX.DataStore.Core.ISerializer.cs | 14 -- .../emoji-appcompat/Additions/Additions.cs | 1 - .../emoji-bundled/Additions/Additions.cs | 1 - .../Additions/Additions.cs | 4 - .../emoji2/Additions/Additions.cs | 4 - .../fragment-ktx/Additions/Additions.cs | 11 -- .../heifwriter/Additions/Additions.cs | 0 .../interpolator/Additions/Additions.cs | 0 .../leanback/Additions/GuidedActionAdapter.cs | 14 -- .../leanback/Additions/ItemBridgeAdapter.cs | 14 -- .../leanback/Additions/StreamingTextView.cs | 163 ------------------ .../Additions/Additions.cs | 7 - .../Additions/Additions.cs | 3 - .../Additions/Additions.cs | 11 -- .../Additions/Additions.cs | 11 -- .../lifecycle-process/Additions/Additions.cs | 6 - .../Additions/Additions.cs | 11 -- .../Additions/Additions.cs | 6 - .../Additions/Additions.cs | 11 -- .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 11 -- .../Additions/Additions.cs | 6 - .../Additions/Additions.cs | 11 -- .../Additions/Additions.cs | 11 -- .../Additions/Additions.cs | 11 -- .../navigation-ui-ktx/Additions/Additions.cs | 11 -- .../paging-common-ktx/Additions/Additions.cs | 11 -- .../paging-runtime-ktx/Additions/Additions.cs | 11 -- .../paging-rxjava2-ktx/Additions/Additions.cs | 11 -- .../paging-rxjava2/Additions/Additions.cs | 11 -- .../palette-ktx/Additions/Additions.cs | 11 -- .../palette/Additions/Additions.cs | 5 - .../preference-ktx/Additions/Additions.cs | 8 - .../print/Additions/Additions.cs | 6 - .../profileinstaller/Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../room-ktx/Additions/Additions.cs | 11 -- .../room-rxjava2/Additions/Additions.cs | 11 -- .../room-rxjava3/Additions/Additions.cs | 11 -- .../savedstate-ktx/Additions/Additions.cs | 11 -- .../slidingpanelayout/Additions/Additions.cs | 0 .../startup-runtime/Additions/Additions.cs | 5 - .../Additions/Additions.cs | 12 -- .../vectordrawable/Additions/Additions.cs | 29 ---- .../Additions/Additions.cs | 6 - .../webkit/Additions/Additions.cs | 6 - .../work-runtime-ktx/Additions/Additions.cs | 11 -- .../installreferrer/Additions/Additions.cs | 4 - .../volley-cronet/Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../accompanist-insets/Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../accompanist-pager/Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 58 ------- .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/PendingResultExtensions.cs | 11 -- .../Additions/TaskExtensions.cs | 7 - .../Additions/DataBufferAdditions.cs | 8 - .../Additions/IPendingResultExtensions.cs | 9 - .../Additions/SocketFactoryCreator.cs | 8 - .../Additions/UnsupportedApiCallException.cs | 9 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/BugWorkarounds.cs | 1 - .../Additions/Additions.cs | 5 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../play-services-pal/Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../play-services-pay/Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 5 - .../Additions/IPendingResultExtensions.cs | 8 - .../places-compat/Additions/Additions.cs | 4 - .../places/Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - ....TextField.MaterialAutoCompleteTextView.cs | 0 .../image/Additions/Additions.cs | 4 - .../feature-delivery/Additions/Additions.cs | 4 - .../integrity/Additions/Additions.cs | 4 - .../recaptcha/Additions/Additions.cs | 4 - .../tv-ads/Additions/Additions.cs | 4 - .../firebase-abt/Additions/TaskExtensions.cs | 7 - .../firebase-ads/Additions/Additions.cs | 5 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/TaskExtensions.cs | 14 -- .../Additions/Additions.cs | 5 - .../firebase-core/Additions/Additions.cs | 5 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 5 - .../Additions/Additions.cs | 4 - .../firebase-encoders/Additions/Additions.cs | 4 - .../firebase-iid/Additions/Additions.cs | 6 - .../Additions/Additions.cs | 6 - .../Additions/Additions.cs | 4 - .../firebase-sessions/Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../barcode-scanning/Additions/Barcode.cs | 8 - .../Additions/Additions.cs | 4 - .../face-detection/Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/CustomImageLabelerOptions.cs | 8 - .../Additions/Additions.cs | 4 - .../Additions/ImageLabelerOptions.cs | 7 - .../language-id-common/Additions/Additions.cs | 4 - .../language-id/Additions/Additions.cs | 4 - .../linkfirebase/Additions/Additions.cs | 4 - .../mediapipe-internal/Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../pose-detection/Additions/Additions.cs | 4 - .../smart-reply-common/Additions/Additions.cs | 4 - .../smart-reply/Additions/Additions.cs | 4 - .../translate/Additions/Additions.cs | 4 - .../vision-interfaces/Additions/Additions.cs | 4 - .../Additions/Additions.cs | 4 - .../napier/Additions/Additions.cs | 4 - .../template-artifact/Additions/Additions.cs | 11 -- 177 files changed, 1298 deletions(-) delete mode 100644 source/androidx.asynclayoutinflater/asynclayoutinflater/Additions/Additions.cs delete mode 100644 source/androidx.car/car/Additions/Additions.cs delete mode 100644 source/androidx.collection/collection-ktx/Additions/Additions.cs delete mode 100644 source/androidx.compose.foundation/foundation-layout-android/Additions/Additions.cs delete mode 100644 source/androidx.compose.foundation/foundation-layout/Additions/Additions.cs delete mode 100644 source/androidx.compose.foundation/foundation/Additions/Additions.cs delete mode 100644 source/androidx.compose.material/material-icons-core/Additions/Additions.cs delete mode 100644 source/androidx.compose.material/material-icons-extended/Additions/Additions.cs delete mode 100644 source/androidx.compose.material/material-ripple/Additions/Additions.cs delete mode 100644 source/androidx.compose.material/material/Additions/Additions.cs delete mode 100644 source/androidx.compose.runtime/runtime-livedata/Additions/Additions.cs delete mode 100644 source/androidx.compose.runtime/runtime-rxjava2/Additions/Additions.cs delete mode 100644 source/androidx.compose.runtime/runtime-rxjava3/Additions/Additions.cs delete mode 100644 source/androidx.compose.runtime/runtime-saveable/Additions/Additions.cs delete mode 100644 source/androidx.compose.runtime/runtime/Additions/Additions.cs delete mode 100644 source/androidx.compose.ui/ui-text/Additions/Additions.cs delete mode 100644 source/androidx.compose.ui/ui-tooling-data/Additions/Additions.cs delete mode 100644 source/androidx.compose.ui/ui-tooling-preview/Additions/Additions.cs delete mode 100644 source/androidx.compose.ui/ui-tooling/Additions/Additions.cs delete mode 100644 source/androidx.compose.ui/ui-unit/Additions/Additions.cs delete mode 100644 source/androidx.compose.ui/ui-util/Additions/Additions.cs delete mode 100644 source/androidx.compose.ui/ui-viewbinding/Additions/Additions.cs delete mode 100644 source/androidx.compose.ui/ui/Additions/Additions.cs delete mode 100644 source/androidx.compose/compose-runtime/Additions/Additions.cs delete mode 100644 source/androidx.constraintlayout/constraintlayout-core/Additions/AndroidX.ConstraintLayout.Core.Additions.cs delete mode 100644 source/androidx.core/core-animation/Additions/Additions.cs delete mode 100644 source/androidx.core/core-google-shortcuts/Additions/Additions.cs delete mode 100644 source/androidx.core/core-ktx/Additions/Additions.cs delete mode 100644 source/androidx.core/core-role/Additions/Additions.cs delete mode 100644 source/androidx.core/core-splashscreen/Additions/Additions.cs delete mode 100644 source/androidx.databinding/databinding-adapters/Additions/Additions.cs delete mode 100644 source/androidx.databinding/databinding-common/Additions/Additions.cs delete mode 100644 source/androidx.databinding/databinding-runtime/Additions/Additions.cs delete mode 100644 source/androidx.databinding/viewbinding/Additions/Additions.cs delete mode 100644 source/androidx.emoji/emoji-appcompat/Additions/Additions.cs delete mode 100644 source/androidx.emoji/emoji-bundled/Additions/Additions.cs delete mode 100644 source/androidx.emoji2/emoji2-views-helper/Additions/Additions.cs delete mode 100644 source/androidx.emoji2/emoji2/Additions/Additions.cs delete mode 100644 source/androidx.fragment/fragment-ktx/Additions/Additions.cs delete mode 100644 source/androidx.heifwriter/heifwriter/Additions/Additions.cs delete mode 100644 source/androidx.interpolator/interpolator/Additions/Additions.cs delete mode 100644 source/androidx.leanback/leanback/Additions/GuidedActionAdapter.cs delete mode 100644 source/androidx.leanback/leanback/Additions/ItemBridgeAdapter.cs delete mode 100644 source/androidx.leanback/leanback/Additions/StreamingTextView.cs delete mode 100644 source/androidx.legacy/legacy-preference-v14/Additions/Additions.cs delete mode 100644 source/androidx.lifecycle/lifecycle-common-java8/Additions/Additions.cs delete mode 100644 source/androidx.lifecycle/lifecycle-livedata-core-ktx/Additions/Additions.cs delete mode 100644 source/androidx.lifecycle/lifecycle-livedata-ktx/Additions/Additions.cs delete mode 100644 source/androidx.lifecycle/lifecycle-process/Additions/Additions.cs delete mode 100644 source/androidx.lifecycle/lifecycle-reactivestreams-ktx/Additions/Additions.cs delete mode 100644 source/androidx.lifecycle/lifecycle-reactivestreams/Additions/Additions.cs delete mode 100644 source/androidx.lifecycle/lifecycle-runtime-ktx/Additions/Additions.cs delete mode 100644 source/androidx.lifecycle/lifecycle-viewmodel-compose/Additions/Additions.cs delete mode 100644 source/androidx.lifecycle/lifecycle-viewmodel-ktx/Additions/Additions.cs delete mode 100644 source/androidx.localbroadcastmanager/localbroadcastmanager/Additions/Additions.cs delete mode 100644 source/androidx.navigation/navigation-common-ktx/Additions/Additions.cs delete mode 100644 source/androidx.navigation/navigation-fragment-ktx/Additions/Additions.cs delete mode 100644 source/androidx.navigation/navigation-runtime-ktx/Additions/Additions.cs delete mode 100644 source/androidx.navigation/navigation-ui-ktx/Additions/Additions.cs delete mode 100644 source/androidx.paging/paging-common-ktx/Additions/Additions.cs delete mode 100644 source/androidx.paging/paging-runtime-ktx/Additions/Additions.cs delete mode 100644 source/androidx.paging/paging-rxjava2-ktx/Additions/Additions.cs delete mode 100644 source/androidx.paging/paging-rxjava2/Additions/Additions.cs delete mode 100644 source/androidx.palette/palette-ktx/Additions/Additions.cs delete mode 100644 source/androidx.palette/palette/Additions/Additions.cs delete mode 100644 source/androidx.preference/preference-ktx/Additions/Additions.cs delete mode 100644 source/androidx.print/print/Additions/Additions.cs delete mode 100644 source/androidx.profileinstaller/profileinstaller/Additions/Additions.cs delete mode 100644 source/androidx.resourceinspection/resourceinspection-annotation/Additions/Additions.cs delete mode 100644 source/androidx.room/room-ktx/Additions/Additions.cs delete mode 100644 source/androidx.room/room-rxjava2/Additions/Additions.cs delete mode 100644 source/androidx.room/room-rxjava3/Additions/Additions.cs delete mode 100644 source/androidx.savedstate/savedstate-ktx/Additions/Additions.cs delete mode 100644 source/androidx.slidingpanelayout/slidingpanelayout/Additions/Additions.cs delete mode 100644 source/androidx.startup/startup-runtime/Additions/Additions.cs delete mode 100644 source/androidx.vectordrawable/vectordrawable-animated/Additions/Additions.cs delete mode 100644 source/androidx.vectordrawable/vectordrawable/Additions/Additions.cs delete mode 100644 source/androidx.versionedparcelable/versionedparcelable/Additions/Additions.cs delete mode 100644 source/androidx.webkit/webkit/Additions/Additions.cs delete mode 100644 source/androidx.work/work-runtime-ktx/Additions/Additions.cs delete mode 100644 source/com.android.installreferrer/installreferrer/Additions/Additions.cs delete mode 100644 source/com.android.volley/volley-cronet/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-appcompat-theme/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-drawablepainter/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-flowlayout/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-insets-ui/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-insets/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-navigation-animation/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-navigation-material/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-pager-indicators/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-pager/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-permissions/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-placeholder-material/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-placeholder/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-swiperefresh/Additions/Additions.cs delete mode 100644 source/com.google.accompanist/accompanist-systemuicontroller/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-ads-lite/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-appset/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-auth-blockstore/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-awareness/Additions/PendingResultExtensions.cs delete mode 100644 source/com.google.android.gms/play-services-awareness/Additions/TaskExtensions.cs delete mode 100644 source/com.google.android.gms/play-services-basement/Additions/DataBufferAdditions.cs delete mode 100644 source/com.google.android.gms/play-services-basement/Additions/IPendingResultExtensions.cs delete mode 100644 source/com.google.android.gms/play-services-basement/Additions/SocketFactoryCreator.cs delete mode 100644 source/com.google.android.gms/play-services-basement/Additions/UnsupportedApiCallException.cs delete mode 100644 source/com.google.android.gms/play-services-cast-tv/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-cloud-messaging/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-code-scanner/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-location/Additions/BugWorkarounds.cs delete mode 100644 source/com.google.android.gms/play-services-mlkit-face-detection/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-mlkit-image-labeling/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-mlkit-language-id/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-mlkit-text-recognition/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-pal/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-password-complexity/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-pay/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-recaptcha/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-streamprotect/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-tflite-impl/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-tflite-support/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-vision-face-contour-internal/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-vision-image-labeling-internal/Additions/Additions.cs delete mode 100644 source/com.google.android.gms/play-services-wallet/Additions/IPendingResultExtensions.cs delete mode 100644 source/com.google.android.libraries.places/places-compat/Additions/Additions.cs delete mode 100644 source/com.google.android.libraries.places/places/Additions/Additions.cs delete mode 100644 source/com.google.android.material/compose-theme-adapter/Additions/Additions.cs delete mode 100644 source/com.google.android.material/material/Additions/Google.Android.Material.TextField.MaterialAutoCompleteTextView.cs delete mode 100644 source/com.google.android.odml/image/Additions/Additions.cs delete mode 100644 source/com.google.android.play/feature-delivery/Additions/Additions.cs delete mode 100644 source/com.google.android.play/integrity/Additions/Additions.cs delete mode 100644 source/com.google.android.recaptcha/recaptcha/Additions/Additions.cs delete mode 100644 source/com.google.android.tv/tv-ads/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-abt/Additions/TaskExtensions.cs delete mode 100644 source/com.google.firebase/firebase-ads/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-analytics-ktx/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-annotations/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-appcheck-debug/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-appcheck-interop/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-common-ktx/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-common/Additions/TaskExtensions.cs delete mode 100644 source/com.google.firebase/firebase-components/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-core/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-crashlytics-ndk/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-crashlytics/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-encoders-proto/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-encoders/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-iid/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-installations-interop/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-installations/Additions/Additions.cs delete mode 100644 source/com.google.firebase/firebase-sessions/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/barcode-scanning-common/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/barcode-scanning/Additions/Barcode.cs delete mode 100644 source/com.google.mlkit/digital-ink-recognition/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/face-detection/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/image-labeling-common/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/image-labeling-custom-common/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/image-labeling-custom/Additions/CustomImageLabelerOptions.cs delete mode 100644 source/com.google.mlkit/image-labeling-default-common/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/image-labeling/Additions/ImageLabelerOptions.cs delete mode 100644 source/com.google.mlkit/language-id-common/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/language-id/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/linkfirebase/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/mediapipe-internal/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/object-detection-common/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/pose-detection-accurate/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/pose-detection-common/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/pose-detection/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/smart-reply-common/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/smart-reply/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/translate/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/vision-interfaces/Additions/Additions.cs delete mode 100644 source/com.google.mlkit/vision-internal-vkp/Additions/Additions.cs delete mode 100644 source/io.github.aakira/napier/Additions/Additions.cs delete mode 100644 source/template-group-id/template-artifact/Additions/Additions.cs diff --git a/source/androidx.asynclayoutinflater/asynclayoutinflater/Additions/Additions.cs b/source/androidx.asynclayoutinflater/asynclayoutinflater/Additions/Additions.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/source/androidx.car/car/Additions/Additions.cs b/source/androidx.car/car/Additions/Additions.cs deleted file mode 100644 index 6e34190de..000000000 --- a/source/androidx.car/car/Additions/Additions.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -#if ! NET9_0_OR_GREATER - -namespace AndroidX.Car.Widget -{ - - /* - // Metadata.xml XPath class reference: path="/api/package[@name='androidx.car.widget']/class[@name='ListItemAdapter']" - //[global::Android.Runtime.Register("androidx/car/widget/ListItemAdapter", DoNotGenerateAcw = true)] - public partial class ListItemAdapter //: global::AndroidX.RecyclerView.Widget.RecyclerView.Adapter, global::AndroidX.Car.Widget.PagedListView.IDividerVisibilityManager, global::AndroidX.Car.Widget.PagedListView.IItemCap - { - - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.car.widget']/class[@name='ListItemAdapter']/method[@name='onBindViewHolder' and count(parameter)=2 and parameter[1][@type='androidx.car.widget.ListItem.ViewHolder'] and parameter[2][@type='int']]" - [Register("onBindViewHolder", "(Landroidx/car/widget/ListItem$ViewHolder;I)V", "")] - public override unsafe void OnBindViewHolder(global::AndroidX.RecyclerView.Widget.RecyclerView.ViewHolder holder, int position) - { - const string __id = "onBindViewHolder.(Landroidx/car/widget/ListItem$ViewHolder;I)V"; - try - { - JniArgumentValue* __args = stackalloc JniArgumentValue[2]; - __args[0] = new JniArgumentValue((holder == null) ? IntPtr.Zero : ((global::Java.Lang.Object)holder).Handle); - __args[1] = new JniArgumentValue(position); - _members.InstanceMethods.InvokeNonvirtualVoidMethod(__id, this, __args); - } - finally - { - } - } - } - */ -} - -#endif \ No newline at end of file diff --git a/source/androidx.collection/collection-ktx/Additions/Additions.cs b/source/androidx.collection/collection-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.collection/collection-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.compose.foundation/foundation-layout-android/Additions/Additions.cs b/source/androidx.compose.foundation/foundation-layout-android/Additions/Additions.cs deleted file mode 100644 index e74f5bb7c..000000000 --- a/source/androidx.compose.foundation/foundation-layout-android/Additions/Additions.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace AndroidX.Compose.Foundation.Layout -{ -} - diff --git a/source/androidx.compose.foundation/foundation-layout/Additions/Additions.cs b/source/androidx.compose.foundation/foundation-layout/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/androidx.compose.foundation/foundation-layout/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/androidx.compose.foundation/foundation/Additions/Additions.cs b/source/androidx.compose.foundation/foundation/Additions/Additions.cs deleted file mode 100644 index 26375c851..000000000 --- a/source/androidx.compose.foundation/foundation/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - diff --git a/source/androidx.compose.material/material-icons-core/Additions/Additions.cs b/source/androidx.compose.material/material-icons-core/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/androidx.compose.material/material-icons-core/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/androidx.compose.material/material-icons-extended/Additions/Additions.cs b/source/androidx.compose.material/material-icons-extended/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/androidx.compose.material/material-icons-extended/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/androidx.compose.material/material-ripple/Additions/Additions.cs b/source/androidx.compose.material/material-ripple/Additions/Additions.cs deleted file mode 100644 index 5d31c614b..000000000 --- a/source/androidx.compose.material/material-ripple/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; \ No newline at end of file diff --git a/source/androidx.compose.material/material/Additions/Additions.cs b/source/androidx.compose.material/material/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/androidx.compose.material/material/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/androidx.compose.runtime/runtime-livedata/Additions/Additions.cs b/source/androidx.compose.runtime/runtime-livedata/Additions/Additions.cs deleted file mode 100644 index 26375c851..000000000 --- a/source/androidx.compose.runtime/runtime-livedata/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - diff --git a/source/androidx.compose.runtime/runtime-rxjava2/Additions/Additions.cs b/source/androidx.compose.runtime/runtime-rxjava2/Additions/Additions.cs deleted file mode 100644 index 26375c851..000000000 --- a/source/androidx.compose.runtime/runtime-rxjava2/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - diff --git a/source/androidx.compose.runtime/runtime-rxjava3/Additions/Additions.cs b/source/androidx.compose.runtime/runtime-rxjava3/Additions/Additions.cs deleted file mode 100644 index 26375c851..000000000 --- a/source/androidx.compose.runtime/runtime-rxjava3/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - diff --git a/source/androidx.compose.runtime/runtime-saveable/Additions/Additions.cs b/source/androidx.compose.runtime/runtime-saveable/Additions/Additions.cs deleted file mode 100644 index 26375c851..000000000 --- a/source/androidx.compose.runtime/runtime-saveable/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - diff --git a/source/androidx.compose.runtime/runtime/Additions/Additions.cs b/source/androidx.compose.runtime/runtime/Additions/Additions.cs deleted file mode 100644 index 26375c851..000000000 --- a/source/androidx.compose.runtime/runtime/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - diff --git a/source/androidx.compose.ui/ui-text/Additions/Additions.cs b/source/androidx.compose.ui/ui-text/Additions/Additions.cs deleted file mode 100644 index c63cd86f9..000000000 --- a/source/androidx.compose.ui/ui-text/Additions/Additions.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -/* -namespace AndroidX.Compose.UI.Text -{ - public sealed partial class AnnotatedString - { - public Java.Lang.ICharSequence SubSequenceFormatted (int start, int end) - { - throw new NotImplementedException(); - } - } -} - -namespace AndroidX.Compose.UI.Text.Font -{ - - public sealed partial class FontListFontFamily - { - public System.Collections.IList SubList (int fromIndex, int toIndex) - { - return (System.Collections.IList) this.SubList(fromIndex, toIndex); - } - } -} -*/ \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling-data/Additions/Additions.cs b/source/androidx.compose.ui/ui-tooling-data/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/androidx.compose.ui/ui-tooling-data/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/androidx.compose.ui/ui-tooling-preview/Additions/Additions.cs b/source/androidx.compose.ui/ui-tooling-preview/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/androidx.compose.ui/ui-tooling-preview/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/androidx.compose.ui/ui-tooling/Additions/Additions.cs b/source/androidx.compose.ui/ui-tooling/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/androidx.compose.ui/ui-tooling/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/androidx.compose.ui/ui-unit/Additions/Additions.cs b/source/androidx.compose.ui/ui-unit/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/androidx.compose.ui/ui-unit/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/androidx.compose.ui/ui-util/Additions/Additions.cs b/source/androidx.compose.ui/ui-util/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/androidx.compose.ui/ui-util/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/androidx.compose.ui/ui-viewbinding/Additions/Additions.cs b/source/androidx.compose.ui/ui-viewbinding/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/androidx.compose.ui/ui-viewbinding/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/androidx.compose.ui/ui/Additions/Additions.cs b/source/androidx.compose.ui/ui/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/androidx.compose.ui/ui/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/androidx.compose/compose-runtime/Additions/Additions.cs b/source/androidx.compose/compose-runtime/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/androidx.compose/compose-runtime/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/androidx.constraintlayout/constraintlayout-core/Additions/AndroidX.ConstraintLayout.Core.Additions.cs b/source/androidx.constraintlayout/constraintlayout-core/Additions/AndroidX.ConstraintLayout.Core.Additions.cs deleted file mode 100644 index 2a1c4a464..000000000 --- a/source/androidx.constraintlayout/constraintlayout-core/Additions/AndroidX.ConstraintLayout.Core.Additions.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; - -namespace AndroidX.ConstraintLayout.Core -{ -} diff --git a/source/androidx.core/core-animation/Additions/Additions.cs b/source/androidx.core/core-animation/Additions/Additions.cs deleted file mode 100644 index 5f282702b..000000000 --- a/source/androidx.core/core-animation/Additions/Additions.cs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/source/androidx.core/core-google-shortcuts/Additions/Additions.cs b/source/androidx.core/core-google-shortcuts/Additions/Additions.cs deleted file mode 100644 index 4860c7dd4..000000000 --- a/source/androidx.core/core-google-shortcuts/Additions/Additions.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ -} diff --git a/source/androidx.core/core-ktx/Additions/Additions.cs b/source/androidx.core/core-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.core/core-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.core/core-role/Additions/Additions.cs b/source/androidx.core/core-role/Additions/Additions.cs deleted file mode 100644 index 5f282702b..000000000 --- a/source/androidx.core/core-role/Additions/Additions.cs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/source/androidx.core/core-splashscreen/Additions/Additions.cs b/source/androidx.core/core-splashscreen/Additions/Additions.cs deleted file mode 100644 index 949c22173..000000000 --- a/source/androidx.core/core-splashscreen/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using System.Collections; -using Android.Runtime; - diff --git a/source/androidx.databinding/databinding-adapters/Additions/Additions.cs b/source/androidx.databinding/databinding-adapters/Additions/Additions.cs deleted file mode 100644 index 45167487e..000000000 --- a/source/androidx.databinding/databinding-adapters/Additions/Additions.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX.DataBinding.Adapters -{ - -} \ No newline at end of file diff --git a/source/androidx.databinding/databinding-common/Additions/Additions.cs b/source/androidx.databinding/databinding-common/Additions/Additions.cs deleted file mode 100644 index 6a2576f33..000000000 --- a/source/androidx.databinding/databinding-common/Additions/Additions.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX.DataBinding -{ - -} \ No newline at end of file diff --git a/source/androidx.databinding/databinding-runtime/Additions/Additions.cs b/source/androidx.databinding/databinding-runtime/Additions/Additions.cs deleted file mode 100644 index a5445d671..000000000 --- a/source/androidx.databinding/databinding-runtime/Additions/Additions.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX.DataBinding -{ -} diff --git a/source/androidx.databinding/viewbinding/Additions/Additions.cs b/source/androidx.databinding/viewbinding/Additions/Additions.cs deleted file mode 100644 index e198096cc..000000000 --- a/source/androidx.databinding/viewbinding/Additions/Additions.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX.ViewBinding -{ -} diff --git a/source/androidx.datastore/datastore-android/Additions/AndroidX.DataStore.Core.Handlers.ReplaceFileCorruptionHandler.cs b/source/androidx.datastore/datastore-android/Additions/AndroidX.DataStore.Core.Handlers.ReplaceFileCorruptionHandler.cs index 3b38a3f81..40170d6d7 100644 --- a/source/androidx.datastore/datastore-android/Additions/AndroidX.DataStore.Core.Handlers.ReplaceFileCorruptionHandler.cs +++ b/source/androidx.datastore/datastore-android/Additions/AndroidX.DataStore.Core.Handlers.ReplaceFileCorruptionHandler.cs @@ -1,11 +1,3 @@ -/* -generated/androidx.datastore.datastore-core-jvm/obj/Release/net7.0-android/generated/src/AndroidX.DataStore.Core.Handlers.ReplaceFileCorruptionHandler.cs -generated/androidx.datastore.datastore-core-jvm/obj/Release/net6.0-android/generated/src/AndroidX.DataStore.Core.Handlers.ReplaceFileCorruptionHandler.cs -generated/androidx.datastore.datastore-core-jvm/obj/Release/monoandroid12.0/generated/src/AndroidX.DataStore.Core.Handlers.ReplaceFileCorruptionHandler.cs -generated/androidx.datastore.datastore-core-android/obj/Release/net7.0-android/generated/src/AndroidX.DataStore.Core.Handlers.ReplaceFileCorruptionHandler.cs -generated/androidx.datastore.datastore-core-android/obj/Release/net6.0-android/generated/src/AndroidX.DataStore.Core.Handlers.ReplaceFileCorruptionHandler.cs -generated/androidx.datastore.datastore-core-android/obj/Release/monoandroid12.0/generated/src/AndroidX.DataStore.Core.Handlers.ReplaceFileCorruptionHandler.cs -*/ namespace AndroidX.DataStore.Core.Internal { diff --git a/source/androidx.datastore/datastore-android/Additions/AndroidX.DataStore.Core.IDataMigration.cs b/source/androidx.datastore/datastore-android/Additions/AndroidX.DataStore.Core.IDataMigration.cs index 1d5e9712d..a00786ddd 100644 --- a/source/androidx.datastore/datastore-android/Additions/AndroidX.DataStore.Core.IDataMigration.cs +++ b/source/androidx.datastore/datastore-android/Additions/AndroidX.DataStore.Core.IDataMigration.cs @@ -1,12 +1,4 @@ -/* -generated/androidx.datastore.datastore-core-jvm/obj/Release/net7.0-android/generated/src/AndroidX.DataStore.Core.IDataMigration.cs -generated/androidx.datastore.datastore-core-jvm/obj/Release/net6.0-android/generated/src/AndroidX.DataStore.Core.IDataMigration.cs -generated/androidx.datastore.datastore-core-jvm/obj/Release/monoandroid12.0/generated/src/AndroidX.DataStore.Core.IDataMigration.cs -generated/androidx.datastore.datastore-core-android/obj/Release/net7.0-android/generated/src/AndroidX.DataStore.Core.IDataMigration.cs -generated/androidx.datastore.datastore-core-android/obj/Release/net6.0-android/generated/src/AndroidX.DataStore.Core.IDataMigration.cs -generated/androidx.datastore.datastore-core-android/obj/Release/monoandroid12.0/generated/src/AndroidX.DataStore.Core.IDataMigration.cs -*/ namespace AndroidX.DataStore.Core.Internal { diff --git a/source/androidx.datastore/datastore-android/Additions/AndroidX.DataStore.Core.ISerializer.cs b/source/androidx.datastore/datastore-android/Additions/AndroidX.DataStore.Core.ISerializer.cs index 076f208a6..7d6c56e45 100644 --- a/source/androidx.datastore/datastore-android/Additions/AndroidX.DataStore.Core.ISerializer.cs +++ b/source/androidx.datastore/datastore-android/Additions/AndroidX.DataStore.Core.ISerializer.cs @@ -1,17 +1,3 @@ -/* -generated/androidx.datastore.datastore-core-jvm/obj/Release/net7.0-android/generated/src/AndroidX.DataStore.Core.ISerializer.cs -generated/androidx.datastore.datastore-core-jvm/obj/Release/net6.0-android/generated/src/AndroidX.DataStore.Core.ISerializer.cs -generated/androidx.datastore.datastore-core-jvm/obj/Release/monoandroid12.0/generated/src/AndroidX.DataStore.Core.ISerializer.cs -generated/androidx.datastore.datastore-core-android/obj/Release/net7.0-android/generated/src/AndroidX.DataStore.Core.ISerializer.cs -generated/androidx.datastore.datastore-core-android/obj/Release/net6.0-android/generated/src/AndroidX.DataStore.Core.ISerializer.cs -generated/androidx.datastore.datastore-core-android/obj/Release/monoandroid12.0/generated/src/AndroidX.DataStore.Core.ISerializer.cs -generated/org.jetbrains.kotlinx.kotlinx-serialization-core-jvm/obj/Release/net7.0-android/generated/src/KotlinX.Serialization.ISerializer.cs -generated/org.jetbrains.kotlinx.kotlinx-serialization-core-jvm/obj/Release/net7.0-android/generated/src/KotlinX.Serialization.Modules.ISerializersModuleCollector.cs -generated/org.jetbrains.kotlinx.kotlinx-serialization-core-jvm/obj/Release/net6.0-android/generated/src/KotlinX.Serialization.ISerializer.cs -generated/org.jetbrains.kotlinx.kotlinx-serialization-core-jvm/obj/Release/net6.0-android/generated/src/KotlinX.Serialization.Modules.ISerializersModuleCollector.cs -generated/org.jetbrains.kotlinx.kotlinx-serialization-core-jvm/obj/Release/monoandroid12.0/generated/src/KotlinX.Serialization.ISerializer.cs -generated/org.jetbrains.kotlinx.kotlinx-serialization-core-jvm/obj/Release/monoandroid12.0/generated/src/KotlinX.Serialization.Modules.ISerializersModuleCollector.cs -*/ namespace AndroidX.DataStore.Core.Internal { diff --git a/source/androidx.emoji/emoji-appcompat/Additions/Additions.cs b/source/androidx.emoji/emoji-appcompat/Additions/Additions.cs deleted file mode 100644 index 5f282702b..000000000 --- a/source/androidx.emoji/emoji-appcompat/Additions/Additions.cs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/source/androidx.emoji/emoji-bundled/Additions/Additions.cs b/source/androidx.emoji/emoji-bundled/Additions/Additions.cs deleted file mode 100644 index 5f282702b..000000000 --- a/source/androidx.emoji/emoji-bundled/Additions/Additions.cs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/source/androidx.emoji2/emoji2-views-helper/Additions/Additions.cs b/source/androidx.emoji2/emoji2-views-helper/Additions/Additions.cs deleted file mode 100644 index d44eff0e9..000000000 --- a/source/androidx.emoji2/emoji2-views-helper/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; diff --git a/source/androidx.emoji2/emoji2/Additions/Additions.cs b/source/androidx.emoji2/emoji2/Additions/Additions.cs deleted file mode 100644 index d44eff0e9..000000000 --- a/source/androidx.emoji2/emoji2/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; diff --git a/source/androidx.fragment/fragment-ktx/Additions/Additions.cs b/source/androidx.fragment/fragment-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.fragment/fragment-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.heifwriter/heifwriter/Additions/Additions.cs b/source/androidx.heifwriter/heifwriter/Additions/Additions.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/source/androidx.interpolator/interpolator/Additions/Additions.cs b/source/androidx.interpolator/interpolator/Additions/Additions.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/source/androidx.leanback/leanback/Additions/GuidedActionAdapter.cs b/source/androidx.leanback/leanback/Additions/GuidedActionAdapter.cs deleted file mode 100644 index b34dc45cd..000000000 --- a/source/androidx.leanback/leanback/Additions/GuidedActionAdapter.cs +++ /dev/null @@ -1,14 +0,0 @@ -// using System; - -// namespace AndroidX.Leanback.Widget -// { -// public partial class GuidedActionAdapter -// { -// public override void OnBindViewHolder(Java.Lang.Object holder, int position) -// { -// this.OnBindViewHolder((global::Android.Views.ViewGroup)holder, position); - -// return; -// } -// } -// } diff --git a/source/androidx.leanback/leanback/Additions/ItemBridgeAdapter.cs b/source/androidx.leanback/leanback/Additions/ItemBridgeAdapter.cs deleted file mode 100644 index 79e44477c..000000000 --- a/source/androidx.leanback/leanback/Additions/ItemBridgeAdapter.cs +++ /dev/null @@ -1,14 +0,0 @@ -// using System; - -// namespace AndroidX.Leanback.Widget -// { -// public partial class ItemBridgeAdapter -// { -// public override void OnBindViewHolder (Java.Lang.Object holder, int position) -// { -// this.OnBindViewHolder((global::Android.Views.ViewGroup)holder, position); - -// return; -// } -// } -// } diff --git a/source/androidx.leanback/leanback/Additions/StreamingTextView.cs b/source/androidx.leanback/leanback/Additions/StreamingTextView.cs deleted file mode 100644 index ba67f37bd..000000000 --- a/source/androidx.leanback/leanback/Additions/StreamingTextView.cs +++ /dev/null @@ -1,163 +0,0 @@ -//using System; -//using Android.Runtime; -// -//namespace AndroidX.Leanback.Leanback.Widget -//{ -// public partial class StreamingTextView : Android.Widget.EditText -// { -// -// static IntPtr id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_; -// // Metadata.xml XPath constructor reference: path="/api/package[@name='AndroidX.Leanback.leanback.widget']/class[@name='StreamingTextView']/constructor[@name='StreamingTextView' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='android.util.AttributeSet']]" -// [Register (".ctor", "(Landroid/content/Context;Landroid/util/AttributeSet;)V", "")] -// public StreamingTextView (global::Android.Content.Context p0, global::Android.Util.IAttributeSet p1) : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer) -// { -// if (Handle != IntPtr.Zero) -// return; -// -// if (GetType () != typeof (StreamingTextView)) { -// SetHandle ( -// global::Android.Runtime.JNIEnv.StartCreateInstance (GetType (), "(Landroid/content/Context;Landroid/util/AttributeSet;)V", new JValue (p0), new JValue (p1)), -// JniHandleOwnership.TransferLocalRef); -// global::Android.Runtime.JNIEnv.FinishCreateInstance (Handle, "(Landroid/content/Context;Landroid/util/AttributeSet;)V", new JValue (p0), new JValue (p1)); -// return; -// } -// -// if (id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_ == IntPtr.Zero) -// id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_ = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;Landroid/util/AttributeSet;)V"); -// SetHandle ( -// global::Android.Runtime.JNIEnv.StartCreateInstance (class_ref, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_, new JValue (p0), new JValue (p1)), -// JniHandleOwnership.TransferLocalRef); -// JNIEnv.FinishCreateInstance (Handle, class_ref, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_, new JValue (p0), new JValue (p1)); -// } -// -// -// -// static IntPtr id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I; -// // Metadata.xml XPath constructor reference: path="/api/package[@name='AndroidX.Leanback.leanback.widget']/class[@name='StreamingTextView']/constructor[@name='StreamingTextView' and count(parameter)=3 and parameter[1][@type='android.content.Context'] and parameter[2][@type='android.util.AttributeSet'] and parameter[3][@type='int']]" -// [Register (".ctor", "(Landroid/content/Context;Landroid/util/AttributeSet;I)V", "")] -// public StreamingTextView (global::Android.Content.Context p0, global::Android.Util.IAttributeSet p1, int p2) : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer) -// { -// if (Handle != IntPtr.Zero) -// return; -// -// if (GetType () != typeof (StreamingTextView)) { -// SetHandle ( -// global::Android.Runtime.JNIEnv.StartCreateInstance (GetType (), "(Landroid/content/Context;Landroid/util/AttributeSet;I)V", new JValue (p0), new JValue (p1), new JValue (p2)), -// JniHandleOwnership.TransferLocalRef); -// global::Android.Runtime.JNIEnv.FinishCreateInstance (Handle, "(Landroid/content/Context;Landroid/util/AttributeSet;I)V", new JValue (p0), new JValue (p1), new JValue (p2)); -// return; -// } -// -// if (id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I == IntPtr.Zero) -// id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;Landroid/util/AttributeSet;I)V"); -// SetHandle ( -// global::Android.Runtime.JNIEnv.StartCreateInstance (class_ref, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I, new JValue (p0), new JValue (p1), new JValue (p2)), -// JniHandleOwnership.TransferLocalRef); -// JNIEnv.FinishCreateInstance (Handle, class_ref, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I, new JValue (p0), new JValue (p1), new JValue (p2)); -// } -// -// -// internal static IntPtr java_class_handle; -// internal static IntPtr class_ref { -// get { -// return JNIEnv.FindClass ("android/support/v17/leanback/widget/StreamingTextView", ref java_class_handle); -// } -// } -// -// -// protected override IntPtr ThresholdClass { -// get { return class_ref; } -// } -// -// protected override global::System.Type ThresholdType { -// get { return typeof (StreamingTextView); } -// } -// -// -// static IntPtr id_onInitializeAccessibilityNodeInfo_Landroid_view_accessibility_AccessibilityNodeInfo_; -// // Metadata.xml XPath method reference: path="/api/package[@name='AndroidX.Leanback.leanback.widget']/class[@name='SearchEditText']/method[@name='onInitializeAccessibilityNodeInfo' and count(parameter)=1 and parameter[1][@type='android.view.accessibility.AccessibilityNodeInfo']]" -// [Register ("onInitializeAccessibilityNodeInfo", "(Landroid/view/accessibility/AccessibilityNodeInfo;)V", "GetOnInitializeAccessibilityNodeInfo_Landroid_view_accessibility_AccessibilityNodeInfo_Handler")] -// public void OnInitializeAccessibilityNodeInfo (global::Android.Views.Accessibility.AccessibilityNodeInfo p0) -// { -// if (id_onInitializeAccessibilityNodeInfo_Landroid_view_accessibility_AccessibilityNodeInfo_ == IntPtr.Zero) -// id_onInitializeAccessibilityNodeInfo_Landroid_view_accessibility_AccessibilityNodeInfo_ = JNIEnv.GetMethodID (class_ref, "onInitializeAccessibilityNodeInfo", "(Landroid/view/accessibility/AccessibilityNodeInfo;)V"); -// -// if (GetType () == ThresholdType) -// JNIEnv.CallVoidMethod (Handle, id_onInitializeAccessibilityNodeInfo_Landroid_view_accessibility_AccessibilityNodeInfo_, new JValue (p0)); -// else -// JNIEnv.CallNonvirtualVoidMethod (Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "onInitializeAccessibilityNodeInfo", "(Landroid/view/accessibility/AccessibilityNodeInfo;)V"), new JValue (p0)); -// } -// -// -// static IntPtr id_reset; -// // Metadata.xml XPath method reference: path="/api/package[@name='AndroidX.Leanback.leanback.widget']/class[@name='SearchEditText']/method[@name='reset' and count(parameter)=0]" -// [Register ("reset", "()V", "GetResetHandler")] -// public void Reset () -// { -// if (id_reset == IntPtr.Zero) -// id_reset = JNIEnv.GetMethodID (class_ref, "reset", "()V"); -// -// if (GetType () == ThresholdType) -// JNIEnv.CallVoidMethod (Handle, id_reset); -// else -// JNIEnv.CallNonvirtualVoidMethod (Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "reset", "()V")); -// } -// -// -// static IntPtr id_setFinalRecognizedText_Ljava_lang_CharSequence_; -// // Metadata.xml XPath method reference: path="/api/package[@name='AndroidX.Leanback.leanback.widget']/class[@name='SearchEditText']/method[@name='setFinalRecognizedText' and count(parameter)=1 and parameter[1][@type='java.lang.CharSequence']]" -// [Register ("setFinalRecognizedText", "(Ljava/lang/CharSequence;)V", "GetSetFinalRecognizedText_Ljava_lang_CharSequence_Handler")] -// public void SetFinalRecognizedText (global::Java.Lang.ICharSequence p0) -// { -// if (id_setFinalRecognizedText_Ljava_lang_CharSequence_ == IntPtr.Zero) -// id_setFinalRecognizedText_Ljava_lang_CharSequence_ = JNIEnv.GetMethodID (class_ref, "setFinalRecognizedText", "(Ljava/lang/CharSequence;)V"); -// IntPtr native_p0 = CharSequence.ToLocalJniHandle (p0); -// -// if (GetType () == ThresholdType) -// JNIEnv.CallVoidMethod (Handle, id_setFinalRecognizedText_Ljava_lang_CharSequence_, new JValue (native_p0)); -// else -// JNIEnv.CallNonvirtualVoidMethod (Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setFinalRecognizedText", "(Ljava/lang/CharSequence;)V"), new JValue (native_p0)); -// JNIEnv.DeleteLocalRef (native_p0); -// } -// -// -// static IntPtr id_updateRecognizedText_Ljava_lang_String_Ljava_lang_String_; -// // Metadata.xml XPath method reference: path="/api/package[@name='AndroidX.Leanback.leanback.widget']/class[@name='SearchEditText']/method[@name='updateRecognizedText' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='java.lang.String']]" -// [Register ("updateRecognizedText", "(Ljava/lang/String;Ljava/lang/String;)V", "GetUpdateRecognizedText_Ljava_lang_String_Ljava_lang_String_Handler")] -// public void UpdateRecognizedText (string p0, string p1) -// { -// if (id_updateRecognizedText_Ljava_lang_String_Ljava_lang_String_ == IntPtr.Zero) -// id_updateRecognizedText_Ljava_lang_String_Ljava_lang_String_ = JNIEnv.GetMethodID (class_ref, "updateRecognizedText", "(Ljava/lang/String;Ljava/lang/String;)V"); -// IntPtr native_p0 = JNIEnv.NewString (p0); -// IntPtr native_p1 = JNIEnv.NewString (p1); -// -// if (GetType () == ThresholdType) -// JNIEnv.CallVoidMethod (Handle, id_updateRecognizedText_Ljava_lang_String_Ljava_lang_String_, new JValue (native_p0), new JValue (native_p1)); -// else -// JNIEnv.CallNonvirtualVoidMethod (Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "updateRecognizedText", "(Ljava/lang/String;Ljava/lang/String;)V"), new JValue (native_p0), new JValue (native_p1)); -// JNIEnv.DeleteLocalRef (native_p0); -// JNIEnv.DeleteLocalRef (native_p1); -// } -// -// -// -// static IntPtr id_updateRecognizedText_Ljava_lang_String_Ljava_util_List_; -// // Metadata.xml XPath method reference: path="/api/package[@name='AndroidX.Leanback.leanback.widget']/class[@name='SearchEditText']/method[@name='updateRecognizedText' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='java.util.List']]" -// [Register ("updateRecognizedText", "(Ljava/lang/String;Ljava/util/List;)V", "GetUpdateRecognizedText_Ljava_lang_String_Ljava_util_List_Handler")] -// public void UpdateRecognizedText (string p0, global::System.Collections.IList p1) -// { -// if (id_updateRecognizedText_Ljava_lang_String_Ljava_util_List_ == IntPtr.Zero) -// id_updateRecognizedText_Ljava_lang_String_Ljava_util_List_ = JNIEnv.GetMethodID (class_ref, "updateRecognizedText", "(Ljava/lang/String;Ljava/util/List;)V"); -// IntPtr native_p0 = JNIEnv.NewString (p0); -// IntPtr native_p1 = global::Android.Runtime.JavaList.ToLocalJniHandle (p1); -// -// if (GetType () == ThresholdType) -// JNIEnv.CallVoidMethod (Handle, id_updateRecognizedText_Ljava_lang_String_Ljava_util_List_, new JValue (native_p0), new JValue (native_p1)); -// else -// JNIEnv.CallNonvirtualVoidMethod (Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "updateRecognizedText", "(Ljava/lang/String;Ljava/util/List;)V"), new JValue (native_p0), new JValue (native_p1)); -// JNIEnv.DeleteLocalRef (native_p0); -// JNIEnv.DeleteLocalRef (native_p1); -// } -// } -//} -// diff --git a/source/androidx.legacy/legacy-preference-v14/Additions/Additions.cs b/source/androidx.legacy/legacy-preference-v14/Additions/Additions.cs deleted file mode 100644 index 8056d4162..000000000 --- a/source/androidx.legacy/legacy-preference-v14/Additions/Additions.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System; -using Android.Runtime; - -namespace AndroidX.Legacy -{ - -} \ No newline at end of file diff --git a/source/androidx.lifecycle/lifecycle-common-java8/Additions/Additions.cs b/source/androidx.lifecycle/lifecycle-common-java8/Additions/Additions.cs deleted file mode 100644 index d46807ce2..000000000 --- a/source/androidx.lifecycle/lifecycle-common-java8/Additions/Additions.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System; -using Android.Runtime; - diff --git a/source/androidx.lifecycle/lifecycle-livedata-core-ktx/Additions/Additions.cs b/source/androidx.lifecycle/lifecycle-livedata-core-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.lifecycle/lifecycle-livedata-core-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.lifecycle/lifecycle-livedata-ktx/Additions/Additions.cs b/source/androidx.lifecycle/lifecycle-livedata-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.lifecycle/lifecycle-livedata-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.lifecycle/lifecycle-process/Additions/Additions.cs b/source/androidx.lifecycle/lifecycle-process/Additions/Additions.cs deleted file mode 100644 index b48cad50d..000000000 --- a/source/androidx.lifecycle/lifecycle-process/Additions/Additions.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System; - -namespace AndroidX.Lifecycle.Process -{ -} - diff --git a/source/androidx.lifecycle/lifecycle-reactivestreams-ktx/Additions/Additions.cs b/source/androidx.lifecycle/lifecycle-reactivestreams-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.lifecycle/lifecycle-reactivestreams-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.lifecycle/lifecycle-reactivestreams/Additions/Additions.cs b/source/androidx.lifecycle/lifecycle-reactivestreams/Additions/Additions.cs deleted file mode 100644 index 155072bc4..000000000 --- a/source/androidx.lifecycle/lifecycle-reactivestreams/Additions/Additions.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System; - -namespace AndroidX.Lifecycle.ReactiveStreams -{ -} - diff --git a/source/androidx.lifecycle/lifecycle-runtime-ktx/Additions/Additions.cs b/source/androidx.lifecycle/lifecycle-runtime-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.lifecycle/lifecycle-runtime-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.lifecycle/lifecycle-viewmodel-compose/Additions/Additions.cs b/source/androidx.lifecycle/lifecycle-viewmodel-compose/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/androidx.lifecycle/lifecycle-viewmodel-compose/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/androidx.lifecycle/lifecycle-viewmodel-ktx/Additions/Additions.cs b/source/androidx.lifecycle/lifecycle-viewmodel-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.lifecycle/lifecycle-viewmodel-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.localbroadcastmanager/localbroadcastmanager/Additions/Additions.cs b/source/androidx.localbroadcastmanager/localbroadcastmanager/Additions/Additions.cs deleted file mode 100644 index 36f5449ba..000000000 --- a/source/androidx.localbroadcastmanager/localbroadcastmanager/Additions/Additions.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System; - -namespace AndroidX.LocalBroadcastManager.LocalBroadcastManager -{ -} - diff --git a/source/androidx.navigation/navigation-common-ktx/Additions/Additions.cs b/source/androidx.navigation/navigation-common-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.navigation/navigation-common-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.navigation/navigation-fragment-ktx/Additions/Additions.cs b/source/androidx.navigation/navigation-fragment-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.navigation/navigation-fragment-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.navigation/navigation-runtime-ktx/Additions/Additions.cs b/source/androidx.navigation/navigation-runtime-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.navigation/navigation-runtime-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.navigation/navigation-ui-ktx/Additions/Additions.cs b/source/androidx.navigation/navigation-ui-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.navigation/navigation-ui-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.paging/paging-common-ktx/Additions/Additions.cs b/source/androidx.paging/paging-common-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.paging/paging-common-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.paging/paging-runtime-ktx/Additions/Additions.cs b/source/androidx.paging/paging-runtime-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.paging/paging-runtime-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.paging/paging-rxjava2-ktx/Additions/Additions.cs b/source/androidx.paging/paging-rxjava2-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.paging/paging-rxjava2-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.paging/paging-rxjava2/Additions/Additions.cs b/source/androidx.paging/paging-rxjava2/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.paging/paging-rxjava2/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.palette/palette-ktx/Additions/Additions.cs b/source/androidx.palette/palette-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.palette/palette-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.palette/palette/Additions/Additions.cs b/source/androidx.palette/palette/Additions/Additions.cs deleted file mode 100644 index 3b54e8768..000000000 --- a/source/androidx.palette/palette/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -namespace AndroidX.Palette.Pallete -{ -} - diff --git a/source/androidx.preference/preference-ktx/Additions/Additions.cs b/source/androidx.preference/preference-ktx/Additions/Additions.cs deleted file mode 100644 index 9117131ed..000000000 --- a/source/androidx.preference/preference-ktx/Additions/Additions.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace AndroidX -{ -} diff --git a/source/androidx.print/print/Additions/Additions.cs b/source/androidx.print/print/Additions/Additions.cs deleted file mode 100644 index f01cb31a8..000000000 --- a/source/androidx.print/print/Additions/Additions.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System; - -namespace AndroidX.Print.Print -{ -} - diff --git a/source/androidx.profileinstaller/profileinstaller/Additions/Additions.cs b/source/androidx.profileinstaller/profileinstaller/Additions/Additions.cs deleted file mode 100644 index d44eff0e9..000000000 --- a/source/androidx.profileinstaller/profileinstaller/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; diff --git a/source/androidx.resourceinspection/resourceinspection-annotation/Additions/Additions.cs b/source/androidx.resourceinspection/resourceinspection-annotation/Additions/Additions.cs deleted file mode 100644 index d44eff0e9..000000000 --- a/source/androidx.resourceinspection/resourceinspection-annotation/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; diff --git a/source/androidx.room/room-ktx/Additions/Additions.cs b/source/androidx.room/room-ktx/Additions/Additions.cs deleted file mode 100644 index 62a04f019..000000000 --- a/source/androidx.room/room-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class BB BB - // { - // } -} diff --git a/source/androidx.room/room-rxjava2/Additions/Additions.cs b/source/androidx.room/room-rxjava2/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.room/room-rxjava2/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.room/room-rxjava3/Additions/Additions.cs b/source/androidx.room/room-rxjava3/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.room/room-rxjava3/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.savedstate/savedstate-ktx/Additions/Additions.cs b/source/androidx.savedstate/savedstate-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.savedstate/savedstate-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/androidx.slidingpanelayout/slidingpanelayout/Additions/Additions.cs b/source/androidx.slidingpanelayout/slidingpanelayout/Additions/Additions.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/source/androidx.startup/startup-runtime/Additions/Additions.cs b/source/androidx.startup/startup-runtime/Additions/Additions.cs deleted file mode 100644 index 26375c851..000000000 --- a/source/androidx.startup/startup-runtime/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - diff --git a/source/androidx.vectordrawable/vectordrawable-animated/Additions/Additions.cs b/source/androidx.vectordrawable/vectordrawable-animated/Additions/Additions.cs deleted file mode 100644 index 95fe13e92..000000000 --- a/source/androidx.vectordrawable/vectordrawable-animated/Additions/Additions.cs +++ /dev/null @@ -1,12 +0,0 @@ -//using System; -//namespace AndroidX.VectorDrawable.VectorDrawable.Drawable -//{ -// // Metadata.xml XPath class reference: path="/api/package[@name='android.support.graphics.drawable']/class[@name='AnimatedVectorDrawableCompat']" -// public partial class AnimatedVectorDrawableCompat -// { -// public override void SetAlpha (int alpha) -// { -// Alpha = alpha; -// } -// } -//} diff --git a/source/androidx.vectordrawable/vectordrawable/Additions/Additions.cs b/source/androidx.vectordrawable/vectordrawable/Additions/Additions.cs deleted file mode 100644 index 619926368..000000000 --- a/source/androidx.vectordrawable/vectordrawable/Additions/Additions.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using Android.Runtime; - -namespace AndroidX.VectorDrawable.VectorDrawable -{ - //public partial class VectorDrawableCommon - //{ - // /* - // * Oddly, java_class_handle, class_ref, and ThresholdClass/ThresholdType were not being emitted - // * for this class, and since this class subclasses Drawable, it was trying to use the superclass's members - // * which are inaccessible. Adding these in manually *seems* to fix the issue - // */ - // internal static new IntPtr java_class_handle; - // internal static new IntPtr class_ref { - // get { - // return JNIEnv.FindClass ("android/support/graphics/drawable/VectorDrawableCommon", ref java_class_handle); - // } - // } - - // protected override IntPtr ThresholdClass { - // get { return class_ref; } - // } - - // protected override global::System.Type ThresholdType { - // get { return typeof (VectorDrawableCommon); } - // } - //} -} - diff --git a/source/androidx.versionedparcelable/versionedparcelable/Additions/Additions.cs b/source/androidx.versionedparcelable/versionedparcelable/Additions/Additions.cs deleted file mode 100644 index fe76c56b3..000000000 --- a/source/androidx.versionedparcelable/versionedparcelable/Additions/Additions.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System; - -namespace AndroidX.VersionedParcelable.VersionedParcelable -{ -} - diff --git a/source/androidx.webkit/webkit/Additions/Additions.cs b/source/androidx.webkit/webkit/Additions/Additions.cs deleted file mode 100644 index 685b084db..000000000 --- a/source/androidx.webkit/webkit/Additions/Additions.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System; - -namespace AndroidX.WebKit.WebKit -{ -} - diff --git a/source/androidx.work/work-runtime-ktx/Additions/Additions.cs b/source/androidx.work/work-runtime-ktx/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/androidx.work/work-runtime-ktx/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} diff --git a/source/com.android.installreferrer/installreferrer/Additions/Additions.cs b/source/com.android.installreferrer/installreferrer/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.android.installreferrer/installreferrer/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.android.volley/volley-cronet/Additions/Additions.cs b/source/com.android.volley/volley-cronet/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.android.volley/volley-cronet/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-appcompat-theme/Additions/Additions.cs b/source/com.google.accompanist/accompanist-appcompat-theme/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-appcompat-theme/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-drawablepainter/Additions/Additions.cs b/source/com.google.accompanist/accompanist-drawablepainter/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-drawablepainter/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-flowlayout/Additions/Additions.cs b/source/com.google.accompanist/accompanist-flowlayout/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-flowlayout/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-insets-ui/Additions/Additions.cs b/source/com.google.accompanist/accompanist-insets-ui/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-insets-ui/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-insets/Additions/Additions.cs b/source/com.google.accompanist/accompanist-insets/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-insets/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-navigation-animation/Additions/Additions.cs b/source/com.google.accompanist/accompanist-navigation-animation/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-navigation-animation/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-navigation-material/Additions/Additions.cs b/source/com.google.accompanist/accompanist-navigation-material/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-navigation-material/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-pager-indicators/Additions/Additions.cs b/source/com.google.accompanist/accompanist-pager-indicators/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-pager-indicators/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-pager/Additions/Additions.cs b/source/com.google.accompanist/accompanist-pager/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-pager/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-permissions/Additions/Additions.cs b/source/com.google.accompanist/accompanist-permissions/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-permissions/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-placeholder-material/Additions/Additions.cs b/source/com.google.accompanist/accompanist-placeholder-material/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-placeholder-material/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-placeholder/Additions/Additions.cs b/source/com.google.accompanist/accompanist-placeholder/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-placeholder/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-swiperefresh/Additions/Additions.cs b/source/com.google.accompanist/accompanist-swiperefresh/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-swiperefresh/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.accompanist/accompanist-systemuicontroller/Additions/Additions.cs b/source/com.google.accompanist/accompanist-systemuicontroller/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.accompanist/accompanist-systemuicontroller/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-ads-lite/Additions/Additions.cs b/source/com.google.android.gms/play-services-ads-lite/Additions/Additions.cs deleted file mode 100644 index c9d25d932..000000000 --- a/source/com.google.android.gms/play-services-ads-lite/Additions/Additions.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using Android.Runtime; -using Java.Interop; - -namespace Android.Gms.Ads.Formats -{ - public partial interface IShouldDelayBannerRenderingListener - { - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.android.gms.ads.formats']/interface[@name='ShouldDelayBannerRenderingListener']/method[@name='zzb' and count(parameter)=1 and parameter[1][@type='java.lang.Runnable']]" - //[Register("zzb", "(Ljava/lang/Runnable;)Z", "GetZzb_Ljava_lang_Runnable_Handler:Android.Gms.Ads.Formats.IShouldDelayBannerRenderingListenerInvoker, Xamarin.GooglePlayServices.Ads.Lite")] - //bool Zzb(global::Java.Lang.IRunnable p0); - } - - internal partial class IShouldDelayBannerRenderingListenerInvoker : global::Java.Lang.Object //, IShouldDelayBannerRenderingListener - { - // static Delegate cb_zzb_Ljava_lang_Runnable_; - //#pragma warning disable 0169 - // static Delegate GetZzb_Ljava_lang_Runnable_Handler() - // { - // if (cb_zzb_Ljava_lang_Runnable_ == null) - // cb_zzb_Ljava_lang_Runnable_ = JNINativeWrapper.CreateDelegate((_JniMarshal_PPL_Z)n_Zzb_Ljava_lang_Runnable_); - // return cb_zzb_Ljava_lang_Runnable_; - // } - - // static bool n_Zzb_Ljava_lang_Runnable_(IntPtr jnienv, IntPtr native__this, IntPtr native_p0) - // { - // var __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); - // var p0 = (global::Java.Lang.IRunnable)global::Java.Lang.Object.GetObject(native_p0, JniHandleOwnership.DoNotTransfer); - // bool __ret = __this.Zzb(p0); - // return __ret; - // } - //#pragma warning restore 0169 - - // IntPtr id_zzb_Ljava_lang_Runnable_; - // public unsafe bool Zzb(global::Java.Lang.IRunnable p0) - // { - // if (id_zzb_Ljava_lang_Runnable_ == IntPtr.Zero) - // id_zzb_Ljava_lang_Runnable_ = JNIEnv.GetMethodID(class_ref, "zzb", "(Ljava/lang/Runnable;)Z"); - // JValue* __args = stackalloc JValue[1]; - // __args[0] = new JValue((p0 == null) ? IntPtr.Zero : ((global::Java.Lang.Object)p0).Handle); - // var __ret = JNIEnv.CallBooleanMethod(((global::Java.Lang.Object)this).Handle, id_zzb_Ljava_lang_Runnable_, __args); - // return __ret; - // } - - //public unsafe bool Zzb(global::Java.Lang.IRunnable p0) - //{ - // throw new NotImplementedException(); - //} - } - - internal sealed partial class IShouldDelayBannerRenderingListenerImplementor - { - //public bool Zzb(global::Java.Lang.IRunnable p0) - //{ - // throw new NotImplementedException(); - //} - } -} diff --git a/source/com.google.android.gms/play-services-appset/Additions/Additions.cs b/source/com.google.android.gms/play-services-appset/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-appset/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-auth-blockstore/Additions/Additions.cs b/source/com.google.android.gms/play-services-auth-blockstore/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-auth-blockstore/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-awareness/Additions/PendingResultExtensions.cs b/source/com.google.android.gms/play-services-awareness/Additions/PendingResultExtensions.cs deleted file mode 100644 index 46728ab4a..000000000 --- a/source/com.google.android.gms/play-services-awareness/Additions/PendingResultExtensions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Threading.Tasks; -using Java.Interop; -using Android.Gms.Common.Apis; - -namespace Android.Gms.Awareness -{ -} - - - diff --git a/source/com.google.android.gms/play-services-awareness/Additions/TaskExtensions.cs b/source/com.google.android.gms/play-services-awareness/Additions/TaskExtensions.cs deleted file mode 100644 index 54b84464f..000000000 --- a/source/com.google.android.gms/play-services-awareness/Additions/TaskExtensions.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System; -using System.Threading.Tasks; -using Android.Gms.Extensions; - -namespace Android.Gms.Awareness -{ -} diff --git a/source/com.google.android.gms/play-services-basement/Additions/DataBufferAdditions.cs b/source/com.google.android.gms/play-services-basement/Additions/DataBufferAdditions.cs deleted file mode 100644 index 3f7eb7e4e..000000000 --- a/source/com.google.android.gms/play-services-basement/Additions/DataBufferAdditions.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using System.Linq; -using System.Collections.Generic; - -namespace Android.Gms.Common.Data -{ -} - diff --git a/source/com.google.android.gms/play-services-basement/Additions/IPendingResultExtensions.cs b/source/com.google.android.gms/play-services-basement/Additions/IPendingResultExtensions.cs deleted file mode 100644 index 664ed89eb..000000000 --- a/source/com.google.android.gms/play-services-basement/Additions/IPendingResultExtensions.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Threading.Tasks; -using Android.Gms.Common.Apis; -using Android.Gms.Common; -using Android.Runtime; - -namespace Android.Gms.Common.Apis -{ -} diff --git a/source/com.google.android.gms/play-services-basement/Additions/SocketFactoryCreator.cs b/source/com.google.android.gms/play-services-basement/Additions/SocketFactoryCreator.cs deleted file mode 100644 index 5a454d0ac..000000000 --- a/source/com.google.android.gms/play-services-basement/Additions/SocketFactoryCreator.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using System.Linq; -using System.Collections.Generic; -using Android.Runtime; - -namespace Android.Gms.Common.Net -{ -} diff --git a/source/com.google.android.gms/play-services-basement/Additions/UnsupportedApiCallException.cs b/source/com.google.android.gms/play-services-basement/Additions/UnsupportedApiCallException.cs deleted file mode 100644 index fa68121e3..000000000 --- a/source/com.google.android.gms/play-services-basement/Additions/UnsupportedApiCallException.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Linq; -using System.Collections.Generic; -using Android.Runtime; - -namespace Android.Gms.Common.Apis -{ -} - diff --git a/source/com.google.android.gms/play-services-cast-tv/Additions/Additions.cs b/source/com.google.android.gms/play-services-cast-tv/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-cast-tv/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-cloud-messaging/Additions/Additions.cs b/source/com.google.android.gms/play-services-cloud-messaging/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-cloud-messaging/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-code-scanner/Additions/Additions.cs b/source/com.google.android.gms/play-services-code-scanner/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-code-scanner/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-location/Additions/BugWorkarounds.cs b/source/com.google.android.gms/play-services-location/Additions/BugWorkarounds.cs deleted file mode 100644 index 5f282702b..000000000 --- a/source/com.google.android.gms/play-services-location/Additions/BugWorkarounds.cs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/source/com.google.android.gms/play-services-mlkit-face-detection/Additions/Additions.cs b/source/com.google.android.gms/play-services-mlkit-face-detection/Additions/Additions.cs deleted file mode 100644 index 26375c851..000000000 --- a/source/com.google.android.gms/play-services-mlkit-face-detection/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - diff --git a/source/com.google.android.gms/play-services-mlkit-image-labeling/Additions/Additions.cs b/source/com.google.android.gms/play-services-mlkit-image-labeling/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-mlkit-image-labeling/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-mlkit-language-id/Additions/Additions.cs b/source/com.google.android.gms/play-services-mlkit-language-id/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-mlkit-language-id/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-mlkit-text-recognition/Additions/Additions.cs b/source/com.google.android.gms/play-services-mlkit-text-recognition/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-mlkit-text-recognition/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-pal/Additions/Additions.cs b/source/com.google.android.gms/play-services-pal/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-pal/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-password-complexity/Additions/Additions.cs b/source/com.google.android.gms/play-services-password-complexity/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-password-complexity/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-pay/Additions/Additions.cs b/source/com.google.android.gms/play-services-pay/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-pay/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-recaptcha/Additions/Additions.cs b/source/com.google.android.gms/play-services-recaptcha/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-recaptcha/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-streamprotect/Additions/Additions.cs b/source/com.google.android.gms/play-services-streamprotect/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-streamprotect/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-tflite-impl/Additions/Additions.cs b/source/com.google.android.gms/play-services-tflite-impl/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-tflite-impl/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-tflite-support/Additions/Additions.cs b/source/com.google.android.gms/play-services-tflite-support/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-tflite-support/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-vision-face-contour-internal/Additions/Additions.cs b/source/com.google.android.gms/play-services-vision-face-contour-internal/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.gms/play-services-vision-face-contour-internal/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-vision-image-labeling-internal/Additions/Additions.cs b/source/com.google.android.gms/play-services-vision-image-labeling-internal/Additions/Additions.cs deleted file mode 100644 index 26375c851..000000000 --- a/source/com.google.android.gms/play-services-vision-image-labeling-internal/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - diff --git a/source/com.google.android.gms/play-services-wallet/Additions/IPendingResultExtensions.cs b/source/com.google.android.gms/play-services-wallet/Additions/IPendingResultExtensions.cs deleted file mode 100644 index 5a3b79d67..000000000 --- a/source/com.google.android.gms/play-services-wallet/Additions/IPendingResultExtensions.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using System.Threading.Tasks; -using Android.Gms.Common.Apis; -using Android.Runtime; - -namespace Android.Gms.Wallet -{ -} diff --git a/source/com.google.android.libraries.places/places-compat/Additions/Additions.cs b/source/com.google.android.libraries.places/places-compat/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.libraries.places/places-compat/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.libraries.places/places/Additions/Additions.cs b/source/com.google.android.libraries.places/places/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.libraries.places/places/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.material/compose-theme-adapter/Additions/Additions.cs b/source/com.google.android.material/compose-theme-adapter/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.material/compose-theme-adapter/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.material/material/Additions/Google.Android.Material.TextField.MaterialAutoCompleteTextView.cs b/source/com.google.android.material/material/Additions/Google.Android.Material.TextField.MaterialAutoCompleteTextView.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/source/com.google.android.odml/image/Additions/Additions.cs b/source/com.google.android.odml/image/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.odml/image/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.play/feature-delivery/Additions/Additions.cs b/source/com.google.android.play/feature-delivery/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.play/feature-delivery/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.play/integrity/Additions/Additions.cs b/source/com.google.android.play/integrity/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.play/integrity/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.recaptcha/recaptcha/Additions/Additions.cs b/source/com.google.android.recaptcha/recaptcha/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.recaptcha/recaptcha/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.android.tv/tv-ads/Additions/Additions.cs b/source/com.google.android.tv/tv-ads/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.android.tv/tv-ads/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.firebase/firebase-abt/Additions/TaskExtensions.cs b/source/com.google.firebase/firebase-abt/Additions/TaskExtensions.cs deleted file mode 100644 index 53e936415..000000000 --- a/source/com.google.firebase/firebase-abt/Additions/TaskExtensions.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System; -using System.Threading.Tasks; -using Android.Gms.Extensions; - -namespace Firebase -{ -} diff --git a/source/com.google.firebase/firebase-ads/Additions/Additions.cs b/source/com.google.firebase/firebase-ads/Additions/Additions.cs deleted file mode 100644 index 26375c851..000000000 --- a/source/com.google.firebase/firebase-ads/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - diff --git a/source/com.google.firebase/firebase-analytics-ktx/Additions/Additions.cs b/source/com.google.firebase/firebase-analytics-ktx/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.firebase/firebase-analytics-ktx/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.firebase/firebase-annotations/Additions/Additions.cs b/source/com.google.firebase/firebase-annotations/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.firebase/firebase-annotations/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.firebase/firebase-appcheck-debug/Additions/Additions.cs b/source/com.google.firebase/firebase-appcheck-debug/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.firebase/firebase-appcheck-debug/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.firebase/firebase-appcheck-interop/Additions/Additions.cs b/source/com.google.firebase/firebase-appcheck-interop/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.firebase/firebase-appcheck-interop/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.firebase/firebase-common-ktx/Additions/Additions.cs b/source/com.google.firebase/firebase-common-ktx/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.firebase/firebase-common-ktx/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.firebase/firebase-common/Additions/TaskExtensions.cs b/source/com.google.firebase/firebase-common/Additions/TaskExtensions.cs deleted file mode 100644 index b55452e34..000000000 --- a/source/com.google.firebase/firebase-common/Additions/TaskExtensions.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Threading.Tasks; -using Android.Gms.Extensions; - -namespace Firebase -{ - public partial class FirebaseApp - { - //public Task GetTokenAsync(bool flag) - //{ - // return GetToken(flag).AsAsync(); - //} - } -} diff --git a/source/com.google.firebase/firebase-components/Additions/Additions.cs b/source/com.google.firebase/firebase-components/Additions/Additions.cs deleted file mode 100644 index 26375c851..000000000 --- a/source/com.google.firebase/firebase-components/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - diff --git a/source/com.google.firebase/firebase-core/Additions/Additions.cs b/source/com.google.firebase/firebase-core/Additions/Additions.cs deleted file mode 100644 index 26375c851..000000000 --- a/source/com.google.firebase/firebase-core/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - diff --git a/source/com.google.firebase/firebase-crashlytics-ndk/Additions/Additions.cs b/source/com.google.firebase/firebase-crashlytics-ndk/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.firebase/firebase-crashlytics-ndk/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.firebase/firebase-crashlytics/Additions/Additions.cs b/source/com.google.firebase/firebase-crashlytics/Additions/Additions.cs deleted file mode 100644 index 26375c851..000000000 --- a/source/com.google.firebase/firebase-crashlytics/Additions/Additions.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - diff --git a/source/com.google.firebase/firebase-encoders-proto/Additions/Additions.cs b/source/com.google.firebase/firebase-encoders-proto/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.firebase/firebase-encoders-proto/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.firebase/firebase-encoders/Additions/Additions.cs b/source/com.google.firebase/firebase-encoders/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.firebase/firebase-encoders/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.firebase/firebase-iid/Additions/Additions.cs b/source/com.google.firebase/firebase-iid/Additions/Additions.cs deleted file mode 100644 index 4bcbf135f..000000000 --- a/source/com.google.firebase/firebase-iid/Additions/Additions.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System; -using Android.Gms.Extensions; - -namespace Firebase.Iid -{ -} diff --git a/source/com.google.firebase/firebase-installations-interop/Additions/Additions.cs b/source/com.google.firebase/firebase-installations-interop/Additions/Additions.cs deleted file mode 100644 index 6613620e2..000000000 --- a/source/com.google.firebase/firebase-installations-interop/Additions/Additions.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; -using Android.Gms.Extensions; - diff --git a/source/com.google.firebase/firebase-installations/Additions/Additions.cs b/source/com.google.firebase/firebase-installations/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.firebase/firebase-installations/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.firebase/firebase-sessions/Additions/Additions.cs b/source/com.google.firebase/firebase-sessions/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.firebase/firebase-sessions/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/barcode-scanning-common/Additions/Additions.cs b/source/com.google.mlkit/barcode-scanning-common/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/barcode-scanning-common/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/barcode-scanning/Additions/Barcode.cs b/source/com.google.mlkit/barcode-scanning/Additions/Barcode.cs deleted file mode 100644 index a51502e20..000000000 --- a/source/com.google.mlkit/barcode-scanning/Additions/Barcode.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.Google.MLKit.Barhopper -{ -} diff --git a/source/com.google.mlkit/digital-ink-recognition/Additions/Additions.cs b/source/com.google.mlkit/digital-ink-recognition/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/digital-ink-recognition/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/face-detection/Additions/Additions.cs b/source/com.google.mlkit/face-detection/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/face-detection/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/image-labeling-common/Additions/Additions.cs b/source/com.google.mlkit/image-labeling-common/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/image-labeling-common/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/image-labeling-custom-common/Additions/Additions.cs b/source/com.google.mlkit/image-labeling-custom-common/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/image-labeling-custom-common/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/image-labeling-custom/Additions/CustomImageLabelerOptions.cs b/source/com.google.mlkit/image-labeling-custom/Additions/CustomImageLabelerOptions.cs deleted file mode 100644 index 50326d6ed..000000000 --- a/source/com.google.mlkit/image-labeling-custom/Additions/CustomImageLabelerOptions.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using System.Collections.Generic; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.Google.MLKit.Vision.Label.Custom -{ -} diff --git a/source/com.google.mlkit/image-labeling-default-common/Additions/Additions.cs b/source/com.google.mlkit/image-labeling-default-common/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/image-labeling-default-common/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/image-labeling/Additions/ImageLabelerOptions.cs b/source/com.google.mlkit/image-labeling/Additions/ImageLabelerOptions.cs deleted file mode 100644 index c00ab6010..000000000 --- a/source/com.google.mlkit/image-labeling/Additions/ImageLabelerOptions.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System; -using Android.Runtime; -using Java.Interop; - -namespace Xamarin.Google.MLKit.Vision.Label.Defaults -{ -} diff --git a/source/com.google.mlkit/language-id-common/Additions/Additions.cs b/source/com.google.mlkit/language-id-common/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/language-id-common/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/language-id/Additions/Additions.cs b/source/com.google.mlkit/language-id/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/language-id/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/linkfirebase/Additions/Additions.cs b/source/com.google.mlkit/linkfirebase/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/linkfirebase/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/mediapipe-internal/Additions/Additions.cs b/source/com.google.mlkit/mediapipe-internal/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/mediapipe-internal/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/object-detection-common/Additions/Additions.cs b/source/com.google.mlkit/object-detection-common/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/object-detection-common/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/pose-detection-accurate/Additions/Additions.cs b/source/com.google.mlkit/pose-detection-accurate/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/pose-detection-accurate/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/pose-detection-common/Additions/Additions.cs b/source/com.google.mlkit/pose-detection-common/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/pose-detection-common/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/pose-detection/Additions/Additions.cs b/source/com.google.mlkit/pose-detection/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/pose-detection/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/smart-reply-common/Additions/Additions.cs b/source/com.google.mlkit/smart-reply-common/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/smart-reply-common/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/smart-reply/Additions/Additions.cs b/source/com.google.mlkit/smart-reply/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/smart-reply/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/translate/Additions/Additions.cs b/source/com.google.mlkit/translate/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/translate/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/vision-interfaces/Additions/Additions.cs b/source/com.google.mlkit/vision-interfaces/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/vision-interfaces/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/com.google.mlkit/vision-internal-vkp/Additions/Additions.cs b/source/com.google.mlkit/vision-internal-vkp/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/com.google.mlkit/vision-internal-vkp/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/io.github.aakira/napier/Additions/Additions.cs b/source/io.github.aakira/napier/Additions/Additions.cs deleted file mode 100644 index 127606d41..000000000 --- a/source/io.github.aakira/napier/Additions/Additions.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; diff --git a/source/template-group-id/template-artifact/Additions/Additions.cs b/source/template-group-id/template-artifact/Additions/Additions.cs deleted file mode 100644 index 53fd60596..000000000 --- a/source/template-group-id/template-artifact/Additions/Additions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Android.Views; -using Android.Widget; -using Android.Graphics; - -namespace AndroidX -{ - // public partial class Additions - // { - // } -} From e587d98ee368db4726768b1b874b968e7d301a98 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 11 Jan 2025 16:47:39 +0100 Subject: [PATCH 044/140] net9.0 setup --- azure-pipelines.yml | 4 +++- build/ci/build.yml | 4 +++- build/ci/job-extended-tests.yml | 9 ++++++--- build/ci/stage-extended-tests.yml | 4 +++- build/ci/stage-standard-tests.yml | 4 +++- source/AndroidXProject.cshtml | 4 ++-- source/_PackageLevelCustomizations.cshtml | 9 +++++++++ tests/common/NuGet.config | 2 ++ 8 files changed, 31 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 21784f101..fad49e6e7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -89,6 +89,7 @@ extends: name: $(windowsAgentPoolName) image: $(windowsImage) os: windows + runDotnetNextTest: ${{ parameters.RunDotnetNextTest }} - template: build/ci/stage-extended-tests.yml@self parameters: @@ -97,5 +98,6 @@ extends: name: $(windowsAgentPoolName) image: $(windowsImage) os: windows - + runDotnetNextTest: ${{ parameters.RunDotnetNextTest }} + - template: build/ci/stage-sign-artifacts.yml@self diff --git a/build/ci/build.yml b/build/ci/build.yml index e81c05989..869cd587d 100644 --- a/build/ci/build.yml +++ b/build/ci/build.yml @@ -22,7 +22,9 @@ jobs: displayName: ${{ parameters.name }} timeoutInMinutes: ${{ parameters.timeoutInMinutes }} pool: ${{ parameters.buildPool }} - + workspace: + clean: all + templateContext: sdl: spotBugs: diff --git a/build/ci/job-extended-tests.yml b/build/ci/job-extended-tests.yml index f5188cc68..292db7230 100644 --- a/build/ci/job-extended-tests.yml +++ b/build/ci/job-extended-tests.yml @@ -7,10 +7,12 @@ parameters: testFilter: # Test category filter testProject: # The test .csproj to build testAssembly: # The test .dll to execute - + runDotnetNextTest: false + tools: # Additional .NET global tools to install - 'dotnet-test-slicer' : '0.1.0-alpha7' - + - 'Cake.Tool': '4.0.0' + jobs: - job: ${{ parameters.jobName }}_package_tests displayName: ${{ parameters.jobName }} Package Tests @@ -23,7 +25,8 @@ jobs: - template: setup-environment.yml parameters: dotnetTools: ${{ parameters.tools }} - + runDotnetNextTest: ${{ parameters.runDotnetNextTest }} + - task: DownloadPipelineArtifact@2 inputs: artifactName: output-windows diff --git a/build/ci/stage-extended-tests.yml b/build/ci/stage-extended-tests.yml index 0d2ad5d4a..81bf25fa1 100644 --- a/build/ci/stage-extended-tests.yml +++ b/build/ci/stage-extended-tests.yml @@ -3,7 +3,8 @@ parameters: stageCondition: # When to run this stage buildPool: # VM pool information - + runDotnetNextTest: false + stages: - stage: extended_tests displayName: Extended Tests @@ -20,6 +21,7 @@ stages: testProject: $(extendedTestProject) testAssembly: $(extendedTestAssembly) buildPool: ${{ parameters.buildPool }} + runDotnetNextTest: ${{ parameters.runDotnetNextTest }} # Disabled because of too many failures until MAUI updates its AndroidX packages # - template: job-extended-tests.yml diff --git a/build/ci/stage-standard-tests.yml b/build/ci/stage-standard-tests.yml index c147a9432..7ba5233e0 100644 --- a/build/ci/stage-standard-tests.yml +++ b/build/ci/stage-standard-tests.yml @@ -3,7 +3,8 @@ parameters: buildPool: # VM pool information stageCondition: and(succeeded(), ne('$(skipUnitTests)', 'true')) # When to run this stage - + runDotnetNextTest: false + stages: - stage: standard_tests displayName: Standard Tests @@ -20,3 +21,4 @@ stages: testProject: $(standardTestProject) testAssembly: $(standardTestAssembly) buildPool: ${{ parameters.buildPool }} + runDotnetNextTest: ${{ parameters.runDotnetNextTest }} diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml index 19799b9c8..b3969f7c8 100644 --- a/source/AndroidXProject.cshtml +++ b/source/AndroidXProject.cshtml @@ -23,8 +23,8 @@ - CS1572: XML comment has a param tag for '', but there is no parameter by that name - XAOBS001: While this member is 'public', Google considers it internal API and reserves the right to modify or delete it in the future. Use at your own risk. --> - $(NoWarn);0618;0109;0114;0628;0108;0809;1572;XAOBS001 - + $(NoWarn);0618;0109;0114;0628;0108;0809;1572;XAOBS001;NU1605 + @if (Model.AllowPrereleaseDependencies) { $(NoWarn);NU5104 diff --git a/source/_PackageLevelCustomizations.cshtml b/source/_PackageLevelCustomizations.cshtml index 4f48b1bc7..667365341 100644 --- a/source/_PackageLevelCustomizations.cshtml +++ b/source/_PackageLevelCustomizations.cshtml @@ -55,3 +55,12 @@ } + +@* .NET 9 changes some binding internals that breaks some of our hand bound code. This property reverts + to the old behavior. Once we are .NET 9+ we should redo our hand bound code and remove this. *@ +@if (@Model.NuGetPackageId == "Xamarin.AndroidX.Media3.ExoPlayer") +{ + + <_AndroidEmitLegacyInterfaceInvokers>true + +} \ No newline at end of file diff --git a/tests/common/NuGet.config b/tests/common/NuGet.config index 48b8a2941..4021ec78f 100644 --- a/tests/common/NuGet.config +++ b/tests/common/NuGet.config @@ -26,11 +26,13 @@ + + From 630865cc92ac8bff2ba8258f655c69f6ca7eb17d Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 17 Jan 2025 10:05:12 +0100 Subject: [PATCH 045/140] androidx.activity --- .../ActivityResultContracts.net100.cs | 34 ---- .../activity/Transforms/Metadata.xml | 156 +++++++++--------- 2 files changed, 78 insertions(+), 112 deletions(-) diff --git a/source/androidx.activity/activity/Additions/ActivityResultContracts.net100.cs b/source/androidx.activity/activity/Additions/ActivityResultContracts.net100.cs index d2ea7f451..705ef9f6d 100644 --- a/source/androidx.activity/activity/Additions/ActivityResultContracts.net100.cs +++ b/source/androidx.activity/activity/Additions/ActivityResultContracts.net100.cs @@ -7,40 +7,6 @@ namespace AndroidX.Activity.Result.Contract { - public sealed partial class ActivityResultContracts - { - public sealed partial class OpenDocument - { - // public new global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, string[] input) - // { - // Android.Runtime.JavaList i = null; - - // return this.CreateIntent(context, i); - // } - - } - - public sealed partial class OpenMultileDocuments - { - // public new global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, string[] input) - // { - // Android.Runtime.JavaList i = null; - - // return this.CreateIntent(context, i); - // } - - } - - public sealed partial class RequestMultiplePermissions - { - // public new global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, string[] input) - // { - // Android.Runtime.JavaList i = null; - - // return this.CreateIntent(context, i); - // } - } - } } #endif \ No newline at end of file diff --git a/source/androidx.activity/activity/Transforms/Metadata.xml b/source/androidx.activity/activity/Transforms/Metadata.xml index 9d4386904..eb51cad6a 100644 --- a/source/androidx.activity/activity/Transforms/Metadata.xml +++ b/source/androidx.activity/activity/Transforms/Metadata.xml @@ -25,6 +25,12 @@ > Java.Lang.Object + + new + - + true + + + override + + + + + Android.Content.Intent + + + java.lang.Object + + + override + + + + Android.Content.Intent + + override + + + + + + + + new + Java.Lang.Object - - - true - - - - override - - - - - - - Java.Lang.Object + java.lang.Object @@ -394,52 +422,24 @@ - Java.Lang.Object + java.lang.Object - - - - - Android.Content.Intent - - - - - Java.Lang.Object + java.lang.Object - - - - - - Java.Lang.Object + java.lang.Object - \ No newline at end of file From 7f38a202ae879e37ca8e513d71a187c290f3f166 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 17 Jan 2025 11:48:14 +0100 Subject: [PATCH 046/140] fixes for net8.0 in Additions after metadata fixes --- .../ActivityResultContracts.net80.cs | 110 ------------------ 1 file changed, 110 deletions(-) diff --git a/source/androidx.activity/activity/Additions/ActivityResultContracts.net80.cs b/source/androidx.activity/activity/Additions/ActivityResultContracts.net80.cs index 699c18af8..f1c584ce3 100644 --- a/source/androidx.activity/activity/Additions/ActivityResultContracts.net80.cs +++ b/source/androidx.activity/activity/Additions/ActivityResultContracts.net80.cs @@ -7,116 +7,6 @@ namespace AndroidX.Activity.Result.Contract { - // Metadata.xml XPath class reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts']" - //[global::Android.Runtime.Register ("androidx/activity/result/contract/ActivityResultContracts", DoNotGenerateAcw=true)] - public sealed partial class ActivityResultContracts // : global::Java.Lang.Object - { - public partial class OpenDocument // : global::AndroidX.Activity.Result.Contract.ActivityResultContract - { - public override unsafe global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, global::Java.Lang.Object input) - { - throw new NotImplementedException(); - } - - /* - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.OpenDocument']/method[@name='createIntent' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.lang.String[]']]" - [Register ("createIntent", "(Landroid/content/Context;[Ljava/lang/String;)Landroid/content/Intent;", "")] - public override unsafe global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, global::Java.Lang.Object input) - { - const string __id = "createIntent.(Landroid/content/Context;[Ljava/lang/String;)Landroid/content/Intent;"; - IntPtr native_input = JNIEnv.NewArray (input); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue ((context == null) ? IntPtr.Zero : ((global::Java.Lang.Object) context).Handle); - __args [1] = new JniArgumentValue (native_input); - var __rm = _members.InstanceMethods.InvokeNonvirtualObjectMethod (__id, this, __args); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef)!; - } finally { - if (input != null) { - JNIEnv.CopyArray (native_input, input); - JNIEnv.DeleteLocalRef (native_input); - } - global::System.GC.KeepAlive (context); - global::System.GC.KeepAlive (input); - } - } - */ - } - - public partial class RequestMultiplePermissions // : global::AndroidX.Activity.Result.Contract.ActivityResultContract - { - public override unsafe global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, global::Java.Lang.Object input) - { - throw new NotImplementedException(); - } - - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.RequestMultiplePermissions']/method[@name='parseResult' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='android.content.Intent']]" - [Register ("parseResult", "(ILandroid/content/Intent;)Ljava/util/Map;", "")] - public override unsafe global::Java.Lang.Object ParseResult (int resultCode, global::Android.Content.Intent? intent) - { - const string __id = "parseResult.(ILandroid/content/Intent;)Ljava/util/Map;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue (resultCode); - __args [1] = new JniArgumentValue ((intent == null) ? IntPtr.Zero : ((global::Java.Lang.Object) intent).Handle); - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); - return - (Java.Lang.Object) // manually added - global::Android.Runtime.JavaDictionary.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef)!; - } finally { - global::System.GC.KeepAlive (intent); - } - } - } - - - public partial class OpenMultipleDocuments // : global::AndroidX.Activity.Result.Contract.ActivityResultContract - { - public override unsafe global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, global::Java.Lang.Object input) - { - throw new NotImplementedException(); - } - - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.OpenMultipleDocuments']/method[@name='parseResult' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='android.content.Intent']]" - [Register ("parseResult", "(ILandroid/content/Intent;)Ljava/util/List;", "")] - public override sealed unsafe global::Java.Lang.Object ParseResult (int resultCode, global::Android.Content.Intent? intent) - { - const string __id = "parseResult.(ILandroid/content/Intent;)Ljava/util/List;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue (resultCode); - __args [1] = new JniArgumentValue ((intent == null) ? IntPtr.Zero : ((global::Java.Lang.Object) intent).Handle); - var __rm = _members.InstanceMethods.InvokeNonvirtualObjectMethod (__id, this, __args); - return - (Java.Lang.Object) // manually added - global::Android.Runtime.JavaList.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef)!; - } finally { - global::System.GC.KeepAlive (intent); - } - } - } - - public partial class PickMultipleVisualMedia //: global::AndroidX.Activity.Result.Contract.ActivityResultContract - { - // Metadata.xml XPath method reference: path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.PickMultipleVisualMedia']/method[@name='parseResult' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='android.content.Intent']]" - [Register ("parseResult", "(ILandroid/content/Intent;)Ljava/util/List;", "")] - public override sealed unsafe global::Java.Lang.Object ParseResult (int resultCode, global::Android.Content.Intent? intent) - { - const string __id = "parseResult.(ILandroid/content/Intent;)Ljava/util/List;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue (resultCode); - __args [1] = new JniArgumentValue ((intent == null) ? IntPtr.Zero : ((global::Java.Lang.Object) intent).Handle); - var __rm = _members.InstanceMethods.InvokeNonvirtualObjectMethod (__id, this, __args); - return - (Java.Lang.Object) // manually added - global::Android.Runtime.JavaList.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef)!; - } finally { - global::System.GC.KeepAlive (intent); - } - } - } - } } #endif \ No newline at end of file From 83f9f880fa6b3b03aec82f75a99e111dd0dc0a1a Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 17 Jan 2025 13:10:32 +0100 Subject: [PATCH 047/140] Update utilities.cake --- utilities.cake | 1 + 1 file changed, 1 insertion(+) diff --git a/utilities.cake b/utilities.cake index 5df32d855..854e946e7 100644 --- a/utilities.cake +++ b/utilities.cake @@ -813,6 +813,7 @@ Task ("spell-check") "JSpecify", "LiteRT", "Multiprocess", + "MultiProcess", }; var dictionary_custom = WeCantSpell.Hunspell.WordList.CreateFromWords(words); From 1cff350a8e19dee6c73f8d7e8c36493873abcf09 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 17 Jan 2025 13:10:48 +0100 Subject: [PATCH 048/140] automagic files --- cgmanifest.json | 2 +- docs/artifact-list-with-versions.md | 2 +- docs/artifact-list.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cgmanifest.json b/cgmanifest.json index 705f001b1..efaea416e 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -3726,7 +3726,7 @@ "artifactId": "work-multiprocess", "groupId": "androidx.work", "version": "2.10.0", - "nuGetId": "Xamarin.AndroidX.Work.Multiprocess", + "nuGetId": "Xamarin.AndroidX.Work.MultiProcess", "nuGetVersion": "2.10.0.2" } }, diff --git a/docs/artifact-list-with-versions.md b/docs/artifact-list-with-versions.md index 508f5e4a3..0f09e6209 100644 --- a/docs/artifact-list-with-versions.md +++ b/docs/artifact-list-with-versions.md @@ -291,7 +291,7 @@ | 284|androidx.window:window-rxjava3 |1.3.0 |Xamarin.AndroidX.Window.WindowRxJava3 |1.3.0.4 | | 285|androidx.window.extensions.core:core |1.0.0 |Xamarin.AndroidX.Window.Extensions.Core.Core |1.0.0.12 | | 286|androidx.work:work-gcm |2.10.0 |Xamarin.AndroidX.Work.GCM |2.10.0.2 | -| 287|androidx.work:work-multiprocess |2.10.0 |Xamarin.AndroidX.Work.Multiprocess |2.10.0.2 | +| 287|androidx.work:work-multiprocess |2.10.0 |Xamarin.AndroidX.Work.MultiProcess |2.10.0.2 | | 288|androidx.work:work-runtime |2.10.0 |Xamarin.AndroidX.Work.Runtime |2.10.0.2 | | 289|androidx.work:work-runtime-ktx |2.10.0 |Xamarin.AndroidX.Work.Work.Runtime.Ktx |2.10.0.2 | | 290|androidx.work:work-rxjava2 |2.10.0 |Xamarin.AndroidX.Work.RxJava2 |2.10.0.2 | diff --git a/docs/artifact-list.md b/docs/artifact-list.md index 600accdc6..f52f63b36 100644 --- a/docs/artifact-list.md +++ b/docs/artifact-list.md @@ -291,7 +291,7 @@ | 284|androidx.window:window-rxjava3 |Xamarin.AndroidX.Window.WindowRxJava3 | | 285|androidx.window.extensions.core:core |Xamarin.AndroidX.Window.Extensions.Core.Core | | 286|androidx.work:work-gcm |Xamarin.AndroidX.Work.GCM | -| 287|androidx.work:work-multiprocess |Xamarin.AndroidX.Work.Multiprocess | +| 287|androidx.work:work-multiprocess |Xamarin.AndroidX.Work.MultiProcess | | 288|androidx.work:work-runtime |Xamarin.AndroidX.Work.Runtime | | 289|androidx.work:work-runtime-ktx |Xamarin.AndroidX.Work.Work.Runtime.Ktx | | 290|androidx.work:work-rxjava2 |Xamarin.AndroidX.Work.RxJava2 | From bbecf25466b54a5e4a04691eb7a02f81e9079e06 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 5 Feb 2025 10:31:17 +0100 Subject: [PATCH 049/140] media3 fixes --- .../Transforms/Metadata.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/source/androidx.media3/media3-exoplayer-hls/Transforms/Metadata.xml b/source/androidx.media3/media3-exoplayer-hls/Transforms/Metadata.xml index db20efeac..72b4bb750 100644 --- a/source/androidx.media3/media3-exoplayer-hls/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-exoplayer-hls/Transforms/Metadata.xml @@ -101,4 +101,23 @@ new + + AndroidX.Media3.ExoPlayer.Source.IMediaSource + + + AndroidX.Media3.ExoPlayer.Source.IMediaSourceMediaSourceIFactory + + + AndroidX.Media3.ExoPlayer.Source.IMediaSourceMediaSourceIFactory + + \ No newline at end of file From 6a8c7ebdc7556fd778585364499ff5a52fee1d22 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 6 Feb 2025 14:00:28 +0100 Subject: [PATCH 050/140] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0c3e29fdf..d303a5771 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ packages/ externals/ output/ Resource.designer.cs -generated/ +generated*/ # User-specific files *.suo From fc9db32641391db5b9945cf31bc38aab9b15a518 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 6 Feb 2025 14:00:44 +0100 Subject: [PATCH 051/140] add net10 build scripts --- build.cake | 1 + 1 file changed, 1 insertion(+) diff --git a/build.cake b/build.cake index 57acd7017..b46bf3171 100755 --- a/build.cake +++ b/build.cake @@ -18,6 +18,7 @@ #load "build/cake/executive-order.cake" #load "build/cake/clean.cake" #load "build/cake/performance-timings.cake" +#load "build/cake/build-dotnet-android.cake" using System.Xml.Linq; using Newtonsoft.Json; From 6d2ffbf788d188f85a063621841c4a358f835199 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 6 Feb 2025 14:00:49 +0100 Subject: [PATCH 052/140] Create build-dotnet-android.cake --- build/cake/build-dotnet-android.cake | 182 +++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) create mode 100644 build/cake/build-dotnet-android.cake diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake new file mode 100644 index 000000000..450b9b26b --- /dev/null +++ b/build/cake/build-dotnet-android.cake @@ -0,0 +1,182 @@ +// Install ZString as a Cake Addin +#addin nuget:?package=ZString&version=2.6.0 + +// Install ZString as a Cake Tool +// #tool nuget:?package=ZString&version=2.6.0 + +Task ("build-android-libraries-net10-net8") + .IsDependentOn("clean-net10-net8") + .IsDependentOn ("net8-prepare-binderate-build") + .IsDependentOn ("build-prepare-dotnet-android") + .IsDependentOn ("net10-net8-prepare-binderate-build") + ; + +string dotnet; +DeleteDirectorySettings delete_directory_setting = new () + { + Recursive = true, + Force = true + }; + + +Task ("build-prepare-dotnet-android") + .Does + ( + () => + { + string dir = "../dotnet-android"; + DeleteDirectory(dir, delete_directory_setting); + + StartProcess("git", $"clone --recursive https://github.com/dotnet/android.git {dir}"); + + ProcessSettings ps = new ProcessSettings + { + WorkingDirectory = dir, + RedirectStandardOutput = true, + RedirectStandardError = true + }; + + Cysharp.Text.Utf16ValueStringBuilder sb = Cysharp.Text.ZString.CreateStringBuilder(); + + ps.RedirectedStandardOutputHandler = (output) => + { + sb.AppendLine(output); + return output; + }; + + ps.Arguments = new ProcessArgumentBuilder().Append("prepare"); + StartProcess + ( + "make", + ps + ); + Information(sb.ToString()); + sb.Clear(); + + + ps.Arguments = new ProcessArgumentBuilder().Append(""); + StartProcess + ( + "make", + ps + ); + + ps.Arguments = new ProcessArgumentBuilder().Append("--version"); + StartProcess + ( + $"{dir}/dotnet-local.sh", + ps + ); + } + ); + + +Task ("net10-net8-prepare-binderate-build") + .Does + ( + () => + { + dotnet = "../dotnet-android/dotnet-local.sh"; + + Information($"{new string('=', 120)}"); + StartProcess(dotnet, "--version"); + StartProcess + ( + dotnet, + "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" + ); + StartProcess(dotnet, "cake -t=ci"); + + //git restore pathTo/MyFile + } + ); + + +Task ("net8-prepare-binderate-build") + .Does + ( + () => + { + dotnet = "dotnet"; + + Information($"{new string('=', 120)}"); + StartProcess(dotnet, "--version"); + StartProcess(dotnet, "cake -t=ci"); + + MoveDirectory("generated", "generated-net8.0"); + } + ); + +Task ("clean-net10-net8") + .Does + ( + () => + { + DeleteDirectories(GetDirectories("./output/"), delete_directory_setting); + DeleteDirectories(GetDirectories("./externals/"), delete_directory_setting); + DeleteDirectories(GetDirectories("./generated*/"), delete_directory_setting); + } + ); + + +Dictionary> files_net10; + +files_net10 = new Dictionary> +{ + { + "./global.json", + [ + ( + """ "version": "8.0.404",""", + """ "version": "10.0.100-preview.2.25102.3",""" + ), + ] + }, + { + "./Directory.Build.props", + [ + ( + """<_DefaultTargetFrameworks>net8.0""", + """<_DefaultTargetFrameworks>net10.0""" + ), + ( + """<_DefaultTargetFrameworks>net8.0-android""", + """<_DefaultTargetFrameworks>net10.0-android""" + ), + ( + """""", + """""" + ), + ( + """""", + """""" + ), + ( + """""", + """""" + ), + ] + }, + { + "./tests/Directory.Build.props", + [ + ( + """<_DefaultTargetFrameworks>net8.0-android""", + """<_DefaultTargetFrameworks>net10.0-android""" + ), + ( + """<_DefaultNetTargetFrameworks>net8.0""", + """<_DefaultNetTargetFrameworks>net10.0""" + ), + ] + }, + { + "./source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj", + [ + ( + """1.1.0.3""", + """1.1.0.3$(PackageVersionSuffix)""" + ), + ] + }, +}; \ No newline at end of file From 05efe061917bad63829fd9bbb785cb94926ca8b7 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 6 Feb 2025 14:01:18 +0100 Subject: [PATCH 053/140] net10.0 fixes for net8.0 --- Directory.Build.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index 639fb678d..a0e1be4d2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,6 +9,8 @@ <_DefaultTargetFrameworks>net8.0-android <_DefaultNetTargetFrameworks>net8.0 + false + true From 362e2bc94d76e9a851a67d8ba25e8ab0ca717e24 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 6 Feb 2025 14:01:40 +0100 Subject: [PATCH 054/140] feeds needed for net10.0 builds --- NuGet.config | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 NuGet.config diff --git a/NuGet.config b/NuGet.config new file mode 100644 index 000000000..1a0f14021 --- /dev/null +++ b/NuGet.config @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + From 2bbe5445680271f9c507780efbdf8aedf7aa94a1 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 6 Feb 2025 14:07:45 +0100 Subject: [PATCH 055/140] net10 CI builds added --- build/ci/build-and-test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/ci/build-and-test.yml b/build/ci/build-and-test.yml index c350123e2..bd12d6e95 100644 --- a/build/ci/build-and-test.yml +++ b/build/ci/build-and-test.yml @@ -51,6 +51,11 @@ steps: RepositoryUrl: $(Build.Repository.Uri) RepositoryType: "git" + - pwsh: | + dotnet cake ` + --target=build-android-libraries-net10-net8 ` + displayName: 'Build net10' + - task: DotNetCoreCLI@2 displayName: Run unit tests condition: ne(variables['skipUnitTests'], 'true') From 718cd75c3bb81f189d31474185e60c7034330a62 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 6 Feb 2025 19:26:33 +0100 Subject: [PATCH 056/140] nuget.org addded --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 1a0f14021..92e4a5f92 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,7 @@ + From 3a80bee09dbc172580372d3b44bc36c740e99ad0 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 6 Feb 2025 19:46:39 +0100 Subject: [PATCH 057/140] net10 builds clean --- build/cake/build-dotnet-android.cake | 142 +++++++++++++++++++++++++-- 1 file changed, 133 insertions(+), 9 deletions(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index 450b9b26b..bbffed0c8 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -4,11 +4,23 @@ // Install ZString as a Cake Tool // #tool nuget:?package=ZString&version=2.6.0 +using System.Threading.Tasks; + Task ("build-android-libraries-net10-net8") - .IsDependentOn("clean-net10-net8") - .IsDependentOn ("net8-prepare-binderate-build") - .IsDependentOn ("build-prepare-dotnet-android") - .IsDependentOn ("net10-net8-prepare-binderate-build") + .Does + ( + () => + { + Parallel.Invoke + ( + () => RunTarget("net8-prepare-binderate-build"), + () => RunTarget("build-prepare-dotnet-android") + ); + + RunTarget("net10-prepare-binderate-build"); + RunTarget("net10-net8-prepare-binderate-build"); + } + ) ; string dotnet; @@ -25,7 +37,7 @@ Task ("build-prepare-dotnet-android") () => { string dir = "../dotnet-android"; - DeleteDirectory(dir, delete_directory_setting); + DeleteDirectories(GetDirectories(dir), delete_directory_setting); StartProcess("git", $"clone --recursive https://github.com/dotnet/android.git {dir}"); @@ -88,26 +100,59 @@ Task ("net10-net8-prepare-binderate-build") StartProcess(dotnet, "cake -t=ci"); //git restore pathTo/MyFile + MoveDirectory("generated", "generated--net10.0-net8.0"); + } ); -Task ("net8-prepare-binderate-build") +Task ("net10-prepare-binderate-build") .Does ( () => { - dotnet = "dotnet"; + dotnet = "../dotnet-android/dotnet-local.sh"; Information($"{new string('=', 120)}"); StartProcess(dotnet, "--version"); + StartProcess + ( + dotnet, + "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" + ); + StartProcess(dotnet, "cake -t=binderate"); + Parallel.ForEach + ( + files_net10.Keys, + (string file) => + { + List<(string text_old, string text_new)> replacements = files_net10[file]; + + string content = System.IO.File.ReadAllText(file); + + foreach((string text_old, string text_new) pair in replacements) + { + content = content.Replace(pair.text_old, pair.text_new); + } + + System.IO.File.WriteAllText(file, content); + } + ); + StartProcess(dotnet, "cake -t=ci"); - MoveDirectory("generated", "generated-net8.0"); + MoveDirectory("generated", "generated--net10.0"); + + foreach(string file in files_net10.Keys) + { + StartProcess("git", $"restore {file}"); + + } } ); -Task ("clean-net10-net8") + +Task ("net8-prepare-binderate-build") .Does ( () => @@ -115,12 +160,22 @@ Task ("clean-net10-net8") DeleteDirectories(GetDirectories("./output/"), delete_directory_setting); DeleteDirectories(GetDirectories("./externals/"), delete_directory_setting); DeleteDirectories(GetDirectories("./generated*/"), delete_directory_setting); + + dotnet = "dotnet"; + + Information($"{new string('=', 120)}"); + StartProcess(dotnet, "--version"); + StartProcess(dotnet, "cake -t=ci"); + + MoveDirectory("generated", "generated-net8.0"); } ); +Dictionary> files_net8_net10; Dictionary> files_net10; + files_net10 = new Dictionary> { { @@ -179,4 +234,73 @@ files_net10 = new Dictionary> ), ] }, +}; + +files_net8_net10 = new Dictionary> +{ + { + "./global.json", + [ + ( + """ "version": "8.0.404",""", + """ "version": "10.0.100-preview.2.25102.3",""" + ), + ] + }, + { + "./Directory.Build.props", + [ + ( + """<_DefaultTargetFrameworks>net8.0""", + """<_DefaultTargetFrameworks>net8.0;net10.0""" + ), + ( + """<_DefaultTargetFrameworks>net8.0-android""", + """<_DefaultTargetFrameworks>net8.0-android;net10.0-android""" + ), + ( + """""", + """ + + + """ + ), + ( + """""", + """ + + + """ + ), + ( + """""", + """ + + + """ + ), + ] + }, + { + "./tests/Directory.Build.props", + [ + ( + """<_DefaultTargetFrameworks>net8.0-android""", + """<_DefaultTargetFrameworks>net8.0-android;net10.0-android""" + ), + ( + """<_DefaultNetTargetFrameworks>net8.0""", + """<_DefaultNetTargetFrameworks>net8.0;net10.0""" + ), + ] + }, + { + "./source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj", + [ + ( + """1.1.0.3""", + """1.1.0.3$(PackageVersionSuffix)""" + ), + ] + }, }; \ No newline at end of file From fea2c4d6690655a2bb2448264c6a2b27a51d3898 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 7 Feb 2025 13:20:17 +0100 Subject: [PATCH 058/140] removal of global.json --- global.json | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 global.json diff --git a/global.json b/global.json deleted file mode 100644 index 031a73545..000000000 --- a/global.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "sdk": - { - "version": "8.0.404", - "rollForward": "patch" - }, - "msbuild-sdks": - { - "MSBuild.Sdk.Extras": "3.0.44", - "Microsoft.Build.Traversal": "4.1.0", - "Microsoft.Build.NoTargets": "3.7.56", - "Xamarin.Legacy.Sdk": "0.2.0-alpha4" - } -} From 3ef2914b61bdde5930ea481a3ad7de0bc7c26525 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 7 Feb 2025 13:20:23 +0100 Subject: [PATCH 059/140] Update build-dotnet-android.cake --- build/cake/build-dotnet-android.cake | 55 +++++++++++++++++++--------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index bbffed0c8..ee776bc6f 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -11,14 +11,16 @@ Task ("build-android-libraries-net10-net8") ( () => { - Parallel.Invoke - ( - () => RunTarget("net8-prepare-binderate-build"), - () => RunTarget("build-prepare-dotnet-android") - ); - + // Parallel.Invoke + // ( + // () => RunTarget("net8-prepare-binderate-build"), + // () => RunTarget("build-prepare-dotnet-android") + // ); + + RunTarget("build-prepare-dotnet-android"); + RunTarget("net8-prepare-binderate-build"); RunTarget("net10-prepare-binderate-build"); - RunTarget("net10-net8-prepare-binderate-build"); + //RunTarget("net10-net8-prepare-binderate-build"); } ) ; @@ -36,7 +38,7 @@ Task ("build-prepare-dotnet-android") ( () => { - string dir = "../dotnet-android"; + string dir = "../dotnet-android/"; DeleteDirectories(GetDirectories(dir), delete_directory_setting); StartProcess("git", $"clone --recursive https://github.com/dotnet/android.git {dir}"); @@ -97,14 +99,28 @@ Task ("net10-net8-prepare-binderate-build") dotnet, "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" ); - StartProcess(dotnet, "cake -t=ci"); + StartProcess(dotnet, "cake -t=nuget"); //git restore pathTo/MyFile - MoveDirectory("generated", "generated--net10.0-net8.0"); + DeleteDirectories(GetDirectories("generated-net10.0-net8.0"), delete_directory_setting); + DeleteDirectories(GetDirectories("output-net10.0-net8.0"), delete_directory_setting); + MoveDirectory("generated", "generated-net10.0-net8.0"); + MoveDirectory("output", "output-net10.0-net8.0"); } ); +Task ("revert-changes") + .Does + ( + () => + { + foreach(string file in files_net10.Keys) + { + StartProcess("git", $"restore {file}"); + } + } + ); Task ("net10-prepare-binderate-build") .Does @@ -139,15 +155,13 @@ Task ("net10-prepare-binderate-build") } ); - StartProcess(dotnet, "cake -t=ci"); + StartProcess(dotnet, "cake -t=nuget"); - MoveDirectory("generated", "generated--net10.0"); + DeleteDirectories(GetDirectories("generated-net10.0"), delete_directory_setting); + DeleteDirectories(GetDirectories("output-net10.0"), delete_directory_setting); + MoveDirectory("generated", "generated-net10.0"); + MoveDirectory("output", "output-net10.0"); - foreach(string file in files_net10.Keys) - { - StartProcess("git", $"restore {file}"); - - } } ); @@ -167,7 +181,10 @@ Task ("net8-prepare-binderate-build") StartProcess(dotnet, "--version"); StartProcess(dotnet, "cake -t=ci"); + DeleteDirectories(GetDirectories("generated-net8.0"), delete_directory_setting); + DeleteDirectories(GetDirectories("output-net8.0"), delete_directory_setting); MoveDirectory("generated", "generated-net8.0"); + MoveDirectory("output", "output-net8.0"); } ); @@ -178,6 +195,7 @@ Dictionary> files_net10; files_net10 = new Dictionary> { + /* { "./global.json", [ @@ -187,6 +205,7 @@ files_net10 = new Dictionary> ), ] }, + */ { "./Directory.Build.props", [ @@ -238,6 +257,7 @@ files_net10 = new Dictionary> files_net8_net10 = new Dictionary> { + /* { "./global.json", [ @@ -247,6 +267,7 @@ files_net8_net10 = new Dictionary Date: Fri, 7 Feb 2025 13:21:47 +0100 Subject: [PATCH 060/140] ignore output folders for multiple TFM builds --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d303a5771..74596721b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ tools/ .gradle packages/ externals/ -output/ +output*/ Resource.designer.cs generated*/ From 610804f0cac976ab2bffeee05ff66e46fb285d47 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 7 Feb 2025 14:59:07 +0100 Subject: [PATCH 061/140] fixes --- build/cake/build-dotnet-android.cake | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index ee776bc6f..71816abb1 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -127,16 +127,13 @@ Task ("net10-prepare-binderate-build") ( () => { + /* + ../dotnet-android/dotnet-local.sh cake -t=net10-prepare-binderate-build + */ dotnet = "../dotnet-android/dotnet-local.sh"; Information($"{new string('=', 120)}"); StartProcess(dotnet, "--version"); - StartProcess - ( - dotnet, - "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" - ); - StartProcess(dotnet, "cake -t=binderate"); Parallel.ForEach ( files_net10.Keys, @@ -155,6 +152,12 @@ Task ("net10-prepare-binderate-build") } ); + StartProcess(dotnet, "cake -t=binderate"); + StartProcess + ( + dotnet, + "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" + ); StartProcess(dotnet, "cake -t=nuget"); DeleteDirectories(GetDirectories("generated-net10.0"), delete_directory_setting); From 46db30db5a4a6a85b914d4d4c37857f2eb6343d2 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 10 Feb 2025 08:44:55 +0100 Subject: [PATCH 062/140] reenable parallel.invoke --- build/cake/build-dotnet-android.cake | 56 ++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index 71816abb1..a9d111d70 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -11,16 +11,16 @@ Task ("build-android-libraries-net10-net8") ( () => { - // Parallel.Invoke - // ( - // () => RunTarget("net8-prepare-binderate-build"), - // () => RunTarget("build-prepare-dotnet-android") - // ); - - RunTarget("build-prepare-dotnet-android"); - RunTarget("net8-prepare-binderate-build"); + Parallel.Invoke + ( + () => RunTarget("build-prepare-dotnet-android"), + () => RunTarget("net8-prepare-binderate-build") + ); + + // RunTarget("build-prepare-dotnet-android"); + // RunTarget("net8-prepare-binderate-build"); RunTarget("net10-prepare-binderate-build"); - //RunTarget("net10-net8-prepare-binderate-build"); + RunTarget("net10-net8-prepare-binderate-build"); } ) ; @@ -92,6 +92,39 @@ Task ("net10-net8-prepare-binderate-build") { dotnet = "../dotnet-android/dotnet-local.sh"; + /* + ../dotnet-android/dotnet-local.sh cake -t=net10-prepare-binderate-build + */ + dotnet = "../dotnet-android/dotnet-local.sh"; + + Information($"{new string('=', 120)}"); + StartProcess(dotnet, "--version"); + Parallel.ForEach + ( + files_net10_net8.Keys, + (string file) => + { + List<(string text_old, string text_new)> replacements = files_net10[file]; + + string content = System.IO.File.ReadAllText(file); + + foreach((string text_old, string text_new) pair in replacements) + { + content = content.Replace(pair.text_old, pair.text_new); + } + + System.IO.File.WriteAllText(file, content); + } + ); + + StartProcess(dotnet, "cake -t=binderate"); + StartProcess + ( + dotnet, + "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" + ); + StartProcess(dotnet, "cake -t=nuget"); + Information($"{new string('=', 120)}"); StartProcess(dotnet, "--version"); StartProcess @@ -164,7 +197,6 @@ Task ("net10-prepare-binderate-build") DeleteDirectories(GetDirectories("output-net10.0"), delete_directory_setting); MoveDirectory("generated", "generated-net10.0"); MoveDirectory("output", "output-net10.0"); - } ); @@ -192,7 +224,7 @@ Task ("net8-prepare-binderate-build") ); -Dictionary> files_net8_net10; +Dictionary> files_net10_net8; Dictionary> files_net10; @@ -258,7 +290,7 @@ files_net10 = new Dictionary> }, }; -files_net8_net10 = new Dictionary> +files_net10_net8 = new Dictionary> { /* { From 6a9142b20433fb889b66199e65bfb381fe76aef3 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 12 Feb 2025 20:23:59 +0100 Subject: [PATCH 063/140] cleanup --- build/cake/build-dotnet-android.cake | 58 +++++++++++++++------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index a9d111d70..963fbfe98 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -11,15 +11,15 @@ Task ("build-android-libraries-net10-net8") ( () => { - Parallel.Invoke - ( - () => RunTarget("build-prepare-dotnet-android"), - () => RunTarget("net8-prepare-binderate-build") - ); - - // RunTarget("build-prepare-dotnet-android"); - // RunTarget("net8-prepare-binderate-build"); - RunTarget("net10-prepare-binderate-build"); + // Parallel.Invoke + // ( + // () => RunTarget("build-prepare-dotnet-android"), + // () => RunTarget("net8-prepare-binderate-build") + // ); + + RunTarget("build-prepare-dotnet-android"); + RunTarget("net8-prepare-binderate-build"); + //RunTarget("net10-prepare-binderate-build"); RunTarget("net10-net8-prepare-binderate-build"); } ) @@ -59,28 +59,15 @@ Task ("build-prepare-dotnet-android") }; ps.Arguments = new ProcessArgumentBuilder().Append("prepare"); - StartProcess - ( - "make", - ps - ); + StartProcess("make",ps); Information(sb.ToString()); sb.Clear(); - ps.Arguments = new ProcessArgumentBuilder().Append(""); - StartProcess - ( - "make", - ps - ); + StartProcess("make",ps); ps.Arguments = new ProcessArgumentBuilder().Append("--version"); - StartProcess - ( - $"{dir}/dotnet-local.sh", - ps - ); + StartProcess($"{dir}/dotnet-local.sh", ps); } ); @@ -140,6 +127,8 @@ Task ("net10-net8-prepare-binderate-build") DeleteDirectories(GetDirectories("output-net10.0-net8.0"), delete_directory_setting); MoveDirectory("generated", "generated-net10.0-net8.0"); MoveDirectory("output", "output-net10.0-net8.0"); + + RunTarget("revert-changes"); } ); @@ -148,6 +137,10 @@ Task ("revert-changes") ( () => { + foreach(string file in files_net10_net8.Keys) + { + StartProcess("git", $"restore {file}"); + } foreach(string file in files_net10.Keys) { StartProcess("git", $"restore {file}"); @@ -197,6 +190,8 @@ Task ("net10-prepare-binderate-build") DeleteDirectories(GetDirectories("output-net10.0"), delete_directory_setting); MoveDirectory("generated", "generated-net10.0"); MoveDirectory("output", "output-net10.0"); + + RunTarget("revert-changes"); } ); @@ -210,16 +205,25 @@ Task ("net8-prepare-binderate-build") DeleteDirectories(GetDirectories("./externals/"), delete_directory_setting); DeleteDirectories(GetDirectories("./generated*/"), delete_directory_setting); - dotnet = "dotnet"; + dotnet = "../dotnet-android/dotnet-local.sh"; + // dotnet = "dotnet"; Information($"{new string('=', 120)}"); StartProcess(dotnet, "--version"); - StartProcess(dotnet, "cake -t=ci"); + StartProcess(dotnet, "cake -t=binderate"); + StartProcess + ( + dotnet, + "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" + ); + StartProcess(dotnet, "cake -t=nuget"); DeleteDirectories(GetDirectories("generated-net8.0"), delete_directory_setting); DeleteDirectories(GetDirectories("output-net8.0"), delete_directory_setting); MoveDirectory("generated", "generated-net8.0"); MoveDirectory("output", "output-net8.0"); + + RunTarget("revert-changes"); } ); From acbe65cd85afc4fd3efc2faeded6249bced6abd5 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 4 Mar 2025 09:31:21 +0100 Subject: [PATCH 064/140] Update Additions.cs --- source/androidx.leanback/leanback/Additions/Additions.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/androidx.leanback/leanback/Additions/Additions.cs b/source/androidx.leanback/leanback/Additions/Additions.cs index 1b211aa7f..5d5dcc6ae 100644 --- a/source/androidx.leanback/leanback/Additions/Additions.cs +++ b/source/androidx.leanback/leanback/Additions/Additions.cs @@ -2,6 +2,8 @@ using Android.Runtime; using Java.Interop; +#if ! NET9_0_OR_GREATER + namespace AndroidX.Leanback.Widget { public partial class BaseCardView @@ -297,3 +299,4 @@ public unsafe void SetActivated (bool activated) } } } +#endif \ No newline at end of file From df55bb828bd9d9346e5c452f08f6131f1ff10687 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 4 Mar 2025 09:32:03 +0100 Subject: [PATCH 065/140] Update AndroidX.Media3.ExoPlayer.IExoPlayer.cs --- .../Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs b/source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs index 7587db954..e511ccf3d 100644 --- a/source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs +++ b/source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs @@ -3,6 +3,8 @@ using Android.Runtime; using Java.Interop; +#if ! NET9_0_OR_GREATER + namespace AndroidX.Media3.ExoPlayer; delegate void _JniMarshal_PPIIL_V (IntPtr jnienv, IntPtr klass, int p0, int p1, IntPtr p2); @@ -204,6 +206,6 @@ public unsafe void ReplaceMediaItems (int p0, int p1, global::System.Collections __args [2] = new JValue ((p2 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p2).Handle); JNIEnv.CallVoidMethod (((global::Java.Lang.Object) this).Handle, id_replaceMediaItems_IILSystem_Collections_Generic_IList_1_, __args); } +} - -} \ No newline at end of file +#endif \ No newline at end of file From 78d17f1c2b0176acb1cc13be2a0a165818174996 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 4 Mar 2025 09:32:08 +0100 Subject: [PATCH 066/140] Update Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs --- .../Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs index 64faf7555..b811c1e6e 100644 --- a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs +++ b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs @@ -3,6 +3,7 @@ using Android.Runtime; using Java.Interop; +#if ! NET9_0_OR_GREATER namespace Xamarin.Google.Crypto.Tink.Shaded.Protobuf { // Metadata.xml XPath class reference: path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']/class[@name='Internal']" @@ -47,4 +48,5 @@ static IntPtr n_EntrySet (IntPtr jnienv, IntPtr native__this) } } -} \ No newline at end of file +} +#endif \ No newline at end of file From 1c14eb2d739c0b17183841ce014720f53afa32cf Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 4 Mar 2025 09:32:17 +0100 Subject: [PATCH 067/140] Create Kotlin.Ranges.CharRange.cs --- .../Additions/Kotlin.Ranges.CharRange.cs | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 source/org.jetbrains.kotlin/kotlin-stdlib/Additions/Kotlin.Ranges.CharRange.cs diff --git a/source/org.jetbrains.kotlin/kotlin-stdlib/Additions/Kotlin.Ranges.CharRange.cs b/source/org.jetbrains.kotlin/kotlin-stdlib/Additions/Kotlin.Ranges.CharRange.cs new file mode 100644 index 000000000..e5bb9a497 --- /dev/null +++ b/source/org.jetbrains.kotlin/kotlin-stdlib/Additions/Kotlin.Ranges.CharRange.cs @@ -0,0 +1,61 @@ + +#nullable restore +using System; +using System.Collections.Generic; +using Android.Runtime; +using Java.Interop; + +namespace Kotlin.Ranges; + +#if ! NET9_0_OR_GREATER + +// Metadata.xml XPath class reference: path="/api/package[@name='kotlin.ranges']/class[@name='CharRange']" +[global::Android.Runtime.Register ("kotlin/ranges/CharRange", DoNotGenerateAcw=true)] +public sealed partial class CharRange //: global::Kotlin.Ranges.CharProgression, global::Kotlin.Ranges.IClosedRange, global::Kotlin.Ranges.IOpenEndRange +{ + // Metadata.xml XPath method reference: path="/api/package[@name='kotlin.ranges']/class[@name='CharRange']/method[@name='contains' and count(parameter)=1 and parameter[1][@type='char']]" + [Register ("contains", "(C)Z", "")] + public unsafe bool Contains (global::Java.Lang.Character? value) + { + const string __id = "contains.(C)Z"; + try { + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + var __rm = _members.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); + return __rm; + } finally { + global::System.GC.KeepAlive (value); + } + } + +} + +# else + +// Metadata.xml XPath class reference: path="/api/package[@name='kotlin.ranges']/class[@name='CharRange']" +[global::Android.Runtime.Register ("kotlin/ranges/CharRange", DoNotGenerateAcw=true)] +public sealed partial class CharRange //: global::Kotlin.Ranges.CharProgression, global::Kotlin.Ranges.IClosedRange, global::Kotlin.Ranges.IOpenEndRange +{ + // Metadata.xml XPath method reference: path="/api/package[@name='kotlin.ranges']/class[@name='CharRange']/method[@name='contains' and count(parameter)=1 and parameter[1][@type='char']]" + [Register ("contains", "(C)Z", "")] + public unsafe bool Contains (global::Java.Lang.Character? value) + { + const string __id = "contains.(C)Z"; + try { + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + /* + ./generated/org.jetbrains.kotlin.kotlin-stdlib/obj/Release/net10.0-android/generated/src/Kotlin.Ranges.CharRange.cs(174,40): error CS0457: Ambiguous user defined conversions 'Character.explicit operator char(Character)' and 'Object.explicit operator byte(Object)' when converting from 'Character' to 'ushort' [./generated/org.jetbrains.kotlin.kotlin-stdlib/org.jetbrains.kotlin.kotlin-stdlib.csproj::TargetFramework=net10.0-android] + 30 Warning(s) + 1 Error(s) + + __args [0] = new JniArgumentValue ((ushort)value); + */ + __args [0] = new JniArgumentValue ((ushort)((char)value)); + var __rm = _members.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); + return __rm; + } finally { + global::System.GC.KeepAlive (value); + } + } + +#endif \ No newline at end of file From 7bd4e69a069e5d120e146cd176345c5552b0376a Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 4 Mar 2025 09:32:30 +0100 Subject: [PATCH 068/140] Update Metadata.xml --- .../kotlin-stdlib/Transforms/Metadata.xml | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml b/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml index 76c2db212..abe033f78 100644 --- a/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml +++ b/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml @@ -94,7 +94,6 @@ java.lang.Object java.util.Set - Java.Lang.Character Java.Lang.Integer Java.Lang.Long @@ -467,4 +466,24 @@ > java/util/SequencedCollection.reversed()Ljava/util/SequencedCollection; + + + + + Java.Lang.Character + + + + From 3e7acf347586ca38357779c53ac40c82a48738a1 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 4 Mar 2025 09:32:47 +0100 Subject: [PATCH 069/140] Update _PackageLevelCustomizations.cshtml --- source/_PackageLevelCustomizations.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/_PackageLevelCustomizations.cshtml b/source/_PackageLevelCustomizations.cshtml index 667365341..2b6428c52 100644 --- a/source/_PackageLevelCustomizations.cshtml +++ b/source/_PackageLevelCustomizations.cshtml @@ -58,9 +58,9 @@ @* .NET 9 changes some binding internals that breaks some of our hand bound code. This property reverts to the old behavior. Once we are .NET 9+ we should redo our hand bound code and remove this. *@ -@if (@Model.NuGetPackageId == "Xamarin.AndroidX.Media3.ExoPlayer") +@if (@Model.NuGetPackageId == "Xamarin.AndroidX.Media3.ExoPlayer" ) { - + <_AndroidEmitLegacyInterfaceInvokers>true } \ No newline at end of file From 600ccfbeecf57832b975128eec1a004bf082459c Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 4 Mar 2025 09:33:06 +0100 Subject: [PATCH 070/140] Update build-and-package.cake --- build/cake/build-and-package.cake | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/build/cake/build-and-package.cake b/build/cake/build-and-package.cake index 0e372ab6a..624fdc2b0 100644 --- a/build/cake/build-and-package.cake +++ b/build/cake/build-and-package.cake @@ -20,6 +20,27 @@ Task ("nuget") ); }); +Task ("nuget-pack-without-build") + .Does + ( + () => + { + var settings = new DotNetMSBuildSettings () + .SetConfiguration (CONFIGURATION) + .EnableBinaryLogger ($"./output/nuget-pack-without-build.{CONFIGURATION}.binlog") + .WithProperty ("NoBuild", "true") + .WithProperty ("PackageOutputPath", MakeAbsolute ((DirectoryPath)"./output/").FullPath) + .WithTarget ("Pack"); + + DotNetBuild + ( + "./generated/AndroidX.sln", + new DotNetBuildSettings { MSBuildSettings = settings } + ); + } + ); + + // Builds the .csproj projects Task ("libs") .IsDependentOn("metadata-verify") From b17b22018ddc381f6f740c9e54f9dc7ff3fe58ef Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 4 Mar 2025 09:33:18 +0100 Subject: [PATCH 071/140] Update build-dotnet-android.cake --- build/cake/build-dotnet-android.cake | 76 ++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 11 deletions(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index 963fbfe98..46dd918c9 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -4,6 +4,14 @@ // Install ZString as a Cake Tool // #tool nuget:?package=ZString&version=2.6.0 +/* +git clean -xdf +dotnet cake -t=build-prepare-dotnet-android +dotnet cake -t=net8-prepare-binderate-build +dotnet cake -t=net10-prepare-binderate-build +dotnet cake -t=net10-net8-prepare-binderate-build + +*/ using System.Threading.Tasks; Task ("build-android-libraries-net10-net8") @@ -20,10 +28,10 @@ Task ("build-android-libraries-net10-net8") RunTarget("build-prepare-dotnet-android"); RunTarget("net8-prepare-binderate-build"); //RunTarget("net10-prepare-binderate-build"); - RunTarget("net10-net8-prepare-binderate-build"); + RunTarget("net10-net8-prepare-binderate-build"); + RunTarget("copy-net8-with-net8-to-multi-target"); } - ) - ; + ); string dotnet; DeleteDirectorySettings delete_directory_setting = new () @@ -91,7 +99,7 @@ Task ("net10-net8-prepare-binderate-build") files_net10_net8.Keys, (string file) => { - List<(string text_old, string text_new)> replacements = files_net10[file]; + List<(string text_old, string text_new)> replacements = files_net10_net8[file]; string content = System.IO.File.ReadAllText(file); @@ -132,6 +140,54 @@ Task ("net10-net8-prepare-binderate-build") } ); +Task ("copy-net8-with-net8-to-multi-target") + .Does + ( + () => + { + string assembly_name_source; + string assembly_name_target; + + var assemblies = GetFiles($"generated-net8.0/**/bin/Release/net8.0-android/*.dll"); + + foreach(var assembly in assemblies) + { + assembly_name_source = System.IO.Path.GetFullPath(assembly.ToString()); + assembly_name_target = System.IO.Path + .GetDirectoryName(assembly_name_source) + .Replace + ( + "generated-net8.0", + "generated-net10.0-net8.0" + ); + + Information($"{new string('-', 120)}"); + Information($"source {assembly_name_source}"); + Information($"target {assembly_name_target}"); + } + + foreach(var assembly in assemblies) + { + assembly_name_source = System.IO.Path.GetFullPath(assembly.ToString()); + assembly_name_target = System.IO.Path + .GetDirectoryName(assembly_name_source) + .Replace + ( + "generated-net8.0", + "generated-net10.0-net8.0" + ); + Information($"{new string('-', 120)}"); + Information($"source {assembly_name_source}"); + Information($"target {assembly_name_target}"); + + CopyFiles(assembly_name_source, assembly_name_target); + CopyDirectory("generated-net10.0-net8.0", "generated"); + //RunTarget("nuget-pack-without-build"); + } + } + ); + + Task ("revert-changes") .Does ( @@ -205,8 +261,7 @@ Task ("net8-prepare-binderate-build") DeleteDirectories(GetDirectories("./externals/"), delete_directory_setting); DeleteDirectories(GetDirectories("./generated*/"), delete_directory_setting); - dotnet = "../dotnet-android/dotnet-local.sh"; - // dotnet = "dotnet"; + dotnet = "dotnet"; Information($"{new string('=', 120)}"); StartProcess(dotnet, "--version"); @@ -227,7 +282,6 @@ Task ("net8-prepare-binderate-build") } ); - Dictionary> files_net10_net8; Dictionary> files_net10; @@ -310,14 +364,14 @@ files_net10_net8 = new Dictionarynet8.0""", - """<_DefaultTargetFrameworks>net8.0;net10.0""" - ), ( """<_DefaultTargetFrameworks>net8.0-android""", """<_DefaultTargetFrameworks>net8.0-android;net10.0-android""" ), + ( + """<_DefaultNetTargetFrameworks>net8.0""", + """<_DefaultNetTargetFrameworks>net8.0;net10.0""" + ), ( """""", """ From 5ea1b5b488d7b6dc6aed7e3d0f8a70cc57448a67 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 4 Mar 2025 11:51:37 +0100 Subject: [PATCH 072/140] kotlin green --- .../kotlin-stdlib/Additions/Kotlin.Ranges.CharRange.cs | 8 ++++---- .../kotlin-stdlib/Transforms/Metadata.xml | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/source/org.jetbrains.kotlin/kotlin-stdlib/Additions/Kotlin.Ranges.CharRange.cs b/source/org.jetbrains.kotlin/kotlin-stdlib/Additions/Kotlin.Ranges.CharRange.cs index e5bb9a497..7cc5517c4 100644 --- a/source/org.jetbrains.kotlin/kotlin-stdlib/Additions/Kotlin.Ranges.CharRange.cs +++ b/source/org.jetbrains.kotlin/kotlin-stdlib/Additions/Kotlin.Ranges.CharRange.cs @@ -10,7 +10,7 @@ namespace Kotlin.Ranges; #if ! NET9_0_OR_GREATER // Metadata.xml XPath class reference: path="/api/package[@name='kotlin.ranges']/class[@name='CharRange']" -[global::Android.Runtime.Register ("kotlin/ranges/CharRange", DoNotGenerateAcw=true)] +// [global::Android.Runtime.Register ("kotlin/ranges/CharRange", DoNotGenerateAcw=true)] public sealed partial class CharRange //: global::Kotlin.Ranges.CharProgression, global::Kotlin.Ranges.IClosedRange, global::Kotlin.Ranges.IOpenEndRange { // Metadata.xml XPath method reference: path="/api/package[@name='kotlin.ranges']/class[@name='CharRange']/method[@name='contains' and count(parameter)=1 and parameter[1][@type='char']]" @@ -33,7 +33,7 @@ public unsafe bool Contains (global::Java.Lang.Character? value) # else // Metadata.xml XPath class reference: path="/api/package[@name='kotlin.ranges']/class[@name='CharRange']" -[global::Android.Runtime.Register ("kotlin/ranges/CharRange", DoNotGenerateAcw=true)] +// [global::Android.Runtime.Register ("kotlin/ranges/CharRange", DoNotGenerateAcw=true)] public sealed partial class CharRange //: global::Kotlin.Ranges.CharProgression, global::Kotlin.Ranges.IClosedRange, global::Kotlin.Ranges.IOpenEndRange { // Metadata.xml XPath method reference: path="/api/package[@name='kotlin.ranges']/class[@name='CharRange']/method[@name='contains' and count(parameter)=1 and parameter[1][@type='char']]" @@ -50,12 +50,12 @@ 1 Error(s) __args [0] = new JniArgumentValue ((ushort)value); */ - __args [0] = new JniArgumentValue ((ushort)((char)value)); + __args [0] = new JniArgumentValue ((ushort) ((char)value)); var __rm = _members.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); return __rm; } finally { global::System.GC.KeepAlive (value); } } - +} #endif \ No newline at end of file diff --git a/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml b/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml index abe033f78..4b7cb2111 100644 --- a/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml +++ b/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml @@ -473,10 +473,6 @@ 30 Warning(s) 1 Error(s) - - --> + --> + + From f1b2e2ecc719e6443bfc69fe110bceadf34cfd55 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 4 Mar 2025 15:41:29 +0100 Subject: [PATCH 073/140] leanback fixes for net10 --- .../leanback/Additions/Additions.cs | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/source/androidx.leanback/leanback/Additions/Additions.cs b/source/androidx.leanback/leanback/Additions/Additions.cs index 5d5dcc6ae..99667e4f3 100644 --- a/source/androidx.leanback/leanback/Additions/Additions.cs +++ b/source/androidx.leanback/leanback/Additions/Additions.cs @@ -227,7 +227,6 @@ public unsafe void SetNextFocusDownId (int viewId) // } // } - public partial class RecyclerViewParallax { // Metadata.xml XPath method reference: path="/api/package[@name='androidX.leanback.leanback.widget']/class[@name='RecyclerViewParallax']/method[@name='createProperty' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='int']]" @@ -299,4 +298,31 @@ public unsafe void SetActivated (bool activated) } } } + +#else + +namespace AndroidX.Leanback.Widget +{ + public partial class RecyclerViewParallax + { + // Metadata.xml XPath method reference: path="/api/package[@name='androidX.leanback.leanback.widget']/class[@name='RecyclerViewParallax']/method[@name='createProperty' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='int']]" + [Register("createProperty", "(Ljava/lang/String;I)Landroid/util/Property;", "GetCreateProperty_Ljava_lang_String_IHandler")] + public override unsafe Java.Lang.Object CreateProperty(string name, int index) + { + // TODO: Implement JNI + return null; + } + + + + + //[Register("addProperty", "(Ljava/lang/String;)Landroid/util/Property;", "GetAddProperty_Ljava_lang_String_Handler")] + //public override unsafe Java.Lang.Object AddProperty(string name) + //{ + // // TODO: Implement + // return null; + //} + } +} + #endif \ No newline at end of file From 97e6e4e1921d9da8251aa78d0562040b8ccc1604 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 4 Mar 2025 15:41:58 +0100 Subject: [PATCH 074/140] Update AndroidX.Media3.ExoPlayer.IExoPlayer.cs --- .../Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs b/source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs index e511ccf3d..f1750e45d 100644 --- a/source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs +++ b/source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs @@ -208,4 +208,6 @@ public unsafe void ReplaceMediaItems (int p0, int p1, global::System.Collections } } +#else + #endif \ No newline at end of file From 5a593c355d69e35e807d21c7db0d0ef74395d3bc Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 4 Mar 2025 15:42:14 +0100 Subject: [PATCH 075/140] Update Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs --- .../Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs index b811c1e6e..c298fe637 100644 --- a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs +++ b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs @@ -4,7 +4,7 @@ using Java.Interop; #if ! NET9_0_OR_GREATER -namespace Xamarin.Google.Crypto.Tink.Shaded.Protobuf +namespace Xamarin.Google.Crypto.Tink.Shaded.Protobuf { // Metadata.xml XPath class reference: path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']/class[@name='Internal']" // [global::Android.Runtime.Register ("com/google/crypto/tink/shaded/protobuf/Internal", DoNotGenerateAcw=true)] @@ -49,4 +49,8 @@ static IntPtr n_EntrySet (IntPtr jnienv, IntPtr native__this) } } + +#else + + #endif \ No newline at end of file From 6ac579fff07a2432191140a133ccc07d9adbac44 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 5 Mar 2025 22:26:20 +0100 Subject: [PATCH 076/140] media3 fixes --- .../AndroidX.Media3.ExoPlayer.IExoPlayer.cs | 219 ++---------------- .../media3-exoplayer/Transforms/Metadata.xml | 7 + 2 files changed, 27 insertions(+), 199 deletions(-) diff --git a/source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs b/source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs index f1750e45d..9a3fdac88 100644 --- a/source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs +++ b/source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs @@ -3,211 +3,32 @@ using Android.Runtime; using Java.Interop; -#if ! NET9_0_OR_GREATER - namespace AndroidX.Media3.ExoPlayer; -delegate void _JniMarshal_PPIIL_V (IntPtr jnienv, IntPtr klass, int p0, int p1, IntPtr p2); - -internal partial class IExoPlayerInvoker +// [global::Android.Runtime.Register ("androidx/media3/exoplayer/ExoPlayer", DoNotGenerateAcw=true)] +internal partial class IExoPlayerInvoker // : global::Java.Lang.Object, IExoPlayer { - // These invokers are generated with IList instead of IList - static Delegate? cb_addMediaItems_ILSystem_Collections_Generic_IList_1_; -#pragma warning disable 0169 - static Delegate GetAddMediaItems_ILSystem_Collections_Generic_IList_1_Handler () - { - if (cb_addMediaItems_ILSystem_Collections_Generic_IList_1_ == null) - cb_addMediaItems_ILSystem_Collections_Generic_IList_1_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPIL_V (n_AddMediaItems_ILSystem_Collections_Generic_IList_1_)); - return cb_addMediaItems_ILSystem_Collections_Generic_IList_1_; - } - - static void n_AddMediaItems_ILSystem_Collections_Generic_IList_1_ (IntPtr jnienv, IntPtr native__this, int p0, IntPtr native_p1) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - var p1 = (global::System.Collections.Generic.IList ?)global::Java.Lang.Object.GetObject (native_p1, JniHandleOwnership.DoNotTransfer); - __this.AddMediaItems (p0, p1); - } -#pragma warning restore 0169 - - IntPtr id_addMediaItems_ILSystem_Collections_Generic_IList_1_; - public unsafe void AddMediaItems (int p0, global::System.Collections.Generic.IList? p1) - { - if (id_addMediaItems_ILSystem_Collections_Generic_IList_1_ == IntPtr.Zero) - id_addMediaItems_ILSystem_Collections_Generic_IList_1_ = JNIEnv.GetMethodID (class_ref, "addMediaItems", "(ILSystem/Collections/Generic/IList;)V"); - JValue* __args = stackalloc JValue [2]; - __args [0] = new JValue (p0); - __args [1] = new JValue ((p1 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p1).Handle); - JNIEnv.CallVoidMethod (((global::Java.Lang.Object) this).Handle, id_addMediaItems_ILSystem_Collections_Generic_IList_1_, __args); - } - - static Delegate? cb_addMediaItems_LSystem_Collections_Generic_IList_1_; -#pragma warning disable 0169 - static Delegate GetAddMediaItems_LSystem_Collections_Generic_IList_1_Handler () - { - if (cb_addMediaItems_LSystem_Collections_Generic_IList_1_ == null) - cb_addMediaItems_LSystem_Collections_Generic_IList_1_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_AddMediaItems_LSystem_Collections_Generic_IList_1_); - return cb_addMediaItems_LSystem_Collections_Generic_IList_1_; - } - - static void n_AddMediaItems_LSystem_Collections_Generic_IList_1_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - var p0 = (global::System.Collections.Generic.IList?) global::Java.Lang.Object.GetObject */ Java.Lang.Object> (native_p0, JniHandleOwnership.DoNotTransfer); - __this.AddMediaItems (p0); - } -#pragma warning restore 0169 - - IntPtr id_addMediaItems_LSystem_Collections_Generic_IList_1_; - public unsafe void AddMediaItems (global::System.Collections.Generic.IList? p0) - { - if (id_addMediaItems_LSystem_Collections_Generic_IList_1_ == IntPtr.Zero) - id_addMediaItems_LSystem_Collections_Generic_IList_1_ = JNIEnv.GetMethodID (class_ref, "addMediaItems", "(LSystem/Collections/Generic/IList;)V"); - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue ((p0 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p0).Handle); - JNIEnv.CallVoidMethod (((global::Java.Lang.Object) this).Handle, id_addMediaItems_LSystem_Collections_Generic_IList_1_, __args); - } - - static Delegate? cb_setMediaItems_LSystem_Collections_Generic_IList_1_; -#pragma warning disable 0169 - static Delegate GetSetMediaItems_LSystem_Collections_Generic_IList_1_Handler () - { - if (cb_setMediaItems_LSystem_Collections_Generic_IList_1_ == null) - cb_setMediaItems_LSystem_Collections_Generic_IList_1_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetMediaItems_LSystem_Collections_Generic_IList_1_); - return cb_setMediaItems_LSystem_Collections_Generic_IList_1_; - } - - static void n_SetMediaItems_LSystem_Collections_Generic_IList_1_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - var p0 = (global::System.Collections.Generic.IList?) global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); - __this.SetMediaItems (p0); - } -#pragma warning restore 0169 - - IntPtr id_setMediaItems_LSystem_Collections_Generic_IList_1_; - public unsafe void SetMediaItems (global::System.Collections.Generic.IList? p0) - { - if (id_setMediaItems_LSystem_Collections_Generic_IList_1_ == IntPtr.Zero) - id_setMediaItems_LSystem_Collections_Generic_IList_1_ = JNIEnv.GetMethodID (class_ref, "setMediaItems", "(LSystem/Collections/Generic/IList;)V"); - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue ((p0 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p0).Handle); - JNIEnv.CallVoidMethod (((global::Java.Lang.Object) this).Handle, id_setMediaItems_LSystem_Collections_Generic_IList_1_, __args); - } - - static Delegate? cb_setMediaItems_LSystem_Collections_Generic_IList_1_Z; -#pragma warning disable 0169 - static Delegate GetSetMediaItems_LSystem_Collections_Generic_IList_1_ZHandler () - { - if (cb_setMediaItems_LSystem_Collections_Generic_IList_1_Z == null) - cb_setMediaItems_LSystem_Collections_Generic_IList_1_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLZ_V (n_SetMediaItems_LSystem_Collections_Generic_IList_1_Z)); - return cb_setMediaItems_LSystem_Collections_Generic_IList_1_Z; - } + public void ReplaceMediaItems (int p0, int p1, global::System.Collections.Generic.IList? p2) + { + } - static void n_SetMediaItems_LSystem_Collections_Generic_IList_1_Z (IntPtr jnienv, IntPtr native__this, IntPtr native_p0, bool p1) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - var p0 = (global::System.Collections.Generic.IList ?)global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); - __this.SetMediaItems (p0, p1); - } -#pragma warning restore 0169 + public void AddMediaItems (int p0, global::System.Collections.Generic.IList? p1) + { + } - IntPtr id_setMediaItems_LSystem_Collections_Generic_IList_1_Z; - public unsafe void SetMediaItems (global::System.Collections.Generic.IList? p0, bool p1) - { - if (id_setMediaItems_LSystem_Collections_Generic_IList_1_Z == IntPtr.Zero) - id_setMediaItems_LSystem_Collections_Generic_IList_1_Z = JNIEnv.GetMethodID (class_ref, "setMediaItems", "(LSystem/Collections/Generic/IList;Z)V"); - JValue* __args = stackalloc JValue [2]; - __args [0] = new JValue ((p0 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p0).Handle); - __args [1] = new JValue (p1); - JNIEnv.CallVoidMethod (((global::Java.Lang.Object) this).Handle, id_setMediaItems_LSystem_Collections_Generic_IList_1_Z, __args); - } + public void AddMediaItems (global::System.Collections.Generic.IList? p0) + { + } - static Delegate? cb_setMediaItems_LSystem_Collections_Generic_IList_1_IJ; -#pragma warning disable 0169 - static Delegate GetSetMediaItems_LSystem_Collections_Generic_IList_1_IJHandler () - { - if (cb_setMediaItems_LSystem_Collections_Generic_IList_1_IJ == null) - cb_setMediaItems_LSystem_Collections_Generic_IList_1_IJ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLIJ_V (n_SetMediaItems_LSystem_Collections_Generic_IList_1_IJ)); - return cb_setMediaItems_LSystem_Collections_Generic_IList_1_IJ; - } + public unsafe void SetMediaItems (global::System.Collections.Generic.IList? p0) + { + } - static void n_SetMediaItems_LSystem_Collections_Generic_IList_1_IJ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0, int p1, long p2) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - var p0 = (global::System.Collections.Generic.IList ?)global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); - __this.SetMediaItems (p0, p1, p2); - } -#pragma warning restore 0169 + public unsafe void SetMediaItems (global::System.Collections.Generic.IList? p0, bool p1) + { + } - IntPtr id_setMediaItems_LSystem_Collections_Generic_IList_1_IJ; - public unsafe void SetMediaItems (global::System.Collections.Generic.IList? p0, int p1, long p2) - { - if (id_setMediaItems_LSystem_Collections_Generic_IList_1_IJ == IntPtr.Zero) - id_setMediaItems_LSystem_Collections_Generic_IList_1_IJ = JNIEnv.GetMethodID (class_ref, "setMediaItems", "(LSystem/Collections/Generic/IList;IJ)V"); - JValue* __args = stackalloc JValue [3]; - __args [0] = new JValue ((p0 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p0).Handle); - __args [1] = new JValue (p1); - __args [2] = new JValue (p2); - JNIEnv.CallVoidMethod (((global::Java.Lang.Object) this).Handle, id_setMediaItems_LSystem_Collections_Generic_IList_1_IJ, __args); - } - - static Delegate? cb_getPlayerError2; -#pragma warning disable 0169 - static Delegate GetGetPlayerErrorHandler2 () - { - if (cb_getPlayerError2 == null) - cb_getPlayerError2 = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetPlayerError2)); - return cb_getPlayerError2; - } - - static IntPtr n_GetPlayerError2 (IntPtr jnienv, IntPtr native__this) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - return JNIEnv.ToLocalJniHandle ((__this as global::AndroidX.Media3.Common.IPlayer).PlayerError); - } -#pragma warning restore 0169 - - IntPtr id_getPlayerError2; - unsafe global::AndroidX.Media3.Common.PlaybackException? global::AndroidX.Media3.Common.IPlayer.PlayerError { - get { - if (id_getPlayerError2 == IntPtr.Zero) - id_getPlayerError2 = JNIEnv.GetMethodID (class_ref, "getPlayerError", "()Landroidx/media3/exoplayer/ExoPlaybackException;"); - return global::Java.Lang.Object.GetObject (JNIEnv.CallObjectMethod (((global::Java.Lang.Object) this).Handle, id_getPlayerError), JniHandleOwnership.TransferLocalRef); - } - } - - - - static Delegate? cb_replaceMediaItems_IILSystem_Collections_Generic_IList_1_; -#pragma warning disable 0169 - static Delegate GetReplaceMediaItems_IILSystem_Collections_Generic_IList_1_Handler () - { - if (cb_replaceMediaItems_IILSystem_Collections_Generic_IList_1_ == null) - cb_replaceMediaItems_IILSystem_Collections_Generic_IList_1_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPIIL_V (n_ReplaceMediaItems_IILSystem_Collections_Generic_IList_1_)); - return cb_replaceMediaItems_IILSystem_Collections_Generic_IList_1_; - } - - static void n_ReplaceMediaItems_IILSystem_Collections_Generic_IList_1_ (IntPtr jnienv, IntPtr native__this, int p0, int p1, IntPtr native_p2) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - var p2 = (global::System.Collections.Generic.IList?)global::Java.Lang.Object.GetObject (native_p2, JniHandleOwnership.DoNotTransfer); - __this.ReplaceMediaItems (p0, p1, p2); - } -#pragma warning restore 0169 - - IntPtr id_replaceMediaItems_IILSystem_Collections_Generic_IList_1_; - public unsafe void ReplaceMediaItems (int p0, int p1, global::System.Collections.Generic.IList? p2) - { - if (id_replaceMediaItems_IILSystem_Collections_Generic_IList_1_ == IntPtr.Zero) - id_replaceMediaItems_IILSystem_Collections_Generic_IList_1_ = JNIEnv.GetMethodID (class_ref, "replaceMediaItems", "(IILSystem/Collections/Generic/IList`1;)V"); - JValue* __args = stackalloc JValue [3]; - __args [0] = new JValue (p0); - __args [1] = new JValue (p1); - __args [2] = new JValue ((p2 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p2).Handle); - JNIEnv.CallVoidMethod (((global::Java.Lang.Object) this).Handle, id_replaceMediaItems_IILSystem_Collections_Generic_IList_1_, __args); - } + public unsafe void SetMediaItems (global::System.Collections.Generic.IList? p0, int p1, long p2) + { + } } - -#else - -#endif \ No newline at end of file diff --git a/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml b/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml index 04baeb960..97847d6f8 100644 --- a/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml @@ -447,5 +447,12 @@ + + AndroidX.Media3.Common.PlaybackException + + \ No newline at end of file From b6f2f9a74b1882e11aa0830d0447979d366a977b Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 5 Mar 2025 22:26:38 +0100 Subject: [PATCH 077/140] work-runtime cleanup --- .../work-runtime/Additions/WorkAdditions.cs | 47 ------------------- .../work-runtime/Transforms/Metadata.xml | 13 +++++ 2 files changed, 13 insertions(+), 47 deletions(-) diff --git a/source/androidx.work/work-runtime/Additions/WorkAdditions.cs b/source/androidx.work/work-runtime/Additions/WorkAdditions.cs index b413710ec..69d782dc1 100644 --- a/source/androidx.work/work-runtime/Additions/WorkAdditions.cs +++ b/source/androidx.work/work-runtime/Additions/WorkAdditions.cs @@ -178,50 +178,3 @@ public Builder SetTriggerContentUpdateDelay(TimeSpan duration) } } } - -namespace AndroidX.Work.Impl.Constraints.Trackers -{ - // public partial class BatteryChargingTracker - // { - // protected override global::Java.Lang.Object RawInitialState - // { - // get - // { - // return this.InitialState; - // } - // } - // } - - // public partial class NetworkStateTracker - // { - // protected override global::Java.Lang.Object RawInitialState - // { - // get - // { - // return this.InitialState; - // } - // } - // } - - // public partial class BatteryNotLowTracker - // { - // protected override global::Java.Lang.Object RawInitialState - // { - // get - // { - // return this.InitialState; - // } - // } - // } - - // public partial class StorageNotLowTracker - // { - // protected override global::Java.Lang.Object RawInitialState - // { - // get - // { - // return this.InitialState; - // } - // } - // } -} \ No newline at end of file diff --git a/source/androidx.work/work-runtime/Transforms/Metadata.xml b/source/androidx.work/work-runtime/Transforms/Metadata.xml index ebe4dc66a..1cab03025 100644 --- a/source/androidx.work/work-runtime/Transforms/Metadata.xml +++ b/source/androidx.work/work-runtime/Transforms/Metadata.xml @@ -208,4 +208,17 @@ AndroidX.Work.ListenableWorker + + + + + \ No newline at end of file From 0c44a418e1f5e3d061042cb8eb12856c201e0f26 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 5 Mar 2025 22:26:58 +0100 Subject: [PATCH 078/140] crypto-tink fixes --- .../Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs index c298fe637..eefc8f432 100644 --- a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs +++ b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs @@ -16,6 +16,7 @@ public sealed partial class Internal // : global::Java.Lang.Object public partial class MapAdapter // : global::Java.Util.AbstractMap { + /* static Delegate? cb_entrySet; #pragma warning disable 0169 static Delegate GetEntrySetHandler () @@ -45,6 +46,7 @@ static IntPtr n_EntrySet (IntPtr jnienv, IntPtr native__this) } finally { } } + */ } } From 0d034d6517b959f8bcdba829842afc717a53b1ac Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 5 Mar 2025 22:27:11 +0100 Subject: [PATCH 079/140] Update Metadata.xml --- .../tink-android/Transforms/Metadata.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/source/com.google.crypto.tink/tink-android/Transforms/Metadata.xml b/source/com.google.crypto.tink/tink-android/Transforms/Metadata.xml index 2ddd8d7a8..4c009fa28 100644 --- a/source/com.google.crypto.tink/tink-android/Transforms/Metadata.xml +++ b/source/com.google.crypto.tink/tink-android/Transforms/Metadata.xml @@ -114,9 +114,9 @@ - System.Collections.ICollection + java.util.Set - - + + \ No newline at end of file From 0134618550a4453671529f6497e992b7efeacd79 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 5 Mar 2025 22:27:26 +0100 Subject: [PATCH 080/140] packaging working --- build/cake/build-dotnet-android.cake | 49 ++++++++++------------------ 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index 46dd918c9..9d7e024d9 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -11,6 +11,8 @@ dotnet cake -t=net8-prepare-binderate-build dotnet cake -t=net10-prepare-binderate-build dotnet cake -t=net10-net8-prepare-binderate-build +dotnet cake -t=copy-net8-with-net8-to-multi-target + */ using System.Threading.Tasks; @@ -22,19 +24,19 @@ Task ("build-android-libraries-net10-net8") // Parallel.Invoke // ( // () => RunTarget("build-prepare-dotnet-android"), - // () => RunTarget("net8-prepare-binderate-build") + // () => RunTarget("net8-prepare-binderate-build") // ); RunTarget("build-prepare-dotnet-android"); RunTarget("net8-prepare-binderate-build"); //RunTarget("net10-prepare-binderate-build"); RunTarget("net10-net8-prepare-binderate-build"); - RunTarget("copy-net8-with-net8-to-multi-target"); - } + //RunTarget("copy-net8-with-net8-to-multi-target"); + } ); string dotnet; -DeleteDirectorySettings delete_directory_setting = new () +DeleteDirectorySettings delete_directory_setting = new () { Recursive = true, Force = true @@ -48,10 +50,10 @@ Task ("build-prepare-dotnet-android") { string dir = "../dotnet-android/"; DeleteDirectories(GetDirectories(dir), delete_directory_setting); - + StartProcess("git", $"clone --recursive https://github.com/dotnet/android.git {dir}"); - ProcessSettings ps = new ProcessSettings + ProcessSettings ps = new ProcessSettings { WorkingDirectory = dir, RedirectStandardOutput = true, @@ -68,9 +70,9 @@ Task ("build-prepare-dotnet-android") ps.Arguments = new ProcessArgumentBuilder().Append("prepare"); StartProcess("make",ps); - Information(sb.ToString()); + Information(sb.ToString()); sb.Clear(); - + ps.Arguments = new ProcessArgumentBuilder().Append(""); StartProcess("make",ps); @@ -87,7 +89,7 @@ Task ("net10-net8-prepare-binderate-build") { dotnet = "../dotnet-android/dotnet-local.sh"; - /* + /* ../dotnet-android/dotnet-local.sh cake -t=net10-prepare-binderate-build */ dotnet = "../dotnet-android/dotnet-local.sh"; @@ -149,22 +151,6 @@ Task ("copy-net8-with-net8-to-multi-target") string assembly_name_target; var assemblies = GetFiles($"generated-net8.0/**/bin/Release/net8.0-android/*.dll"); - - foreach(var assembly in assemblies) - { - assembly_name_source = System.IO.Path.GetFullPath(assembly.ToString()); - assembly_name_target = System.IO.Path - .GetDirectoryName(assembly_name_source) - .Replace - ( - "generated-net8.0", - "generated-net10.0-net8.0" - ); - - Information($"{new string('-', 120)}"); - Information($"source {assembly_name_source}"); - Information($"target {assembly_name_target}"); - } foreach(var assembly in assemblies) { @@ -173,7 +159,7 @@ Task ("copy-net8-with-net8-to-multi-target") .GetDirectoryName(assembly_name_source) .Replace ( - "generated-net8.0", + "generated-net8.0", "generated-net10.0-net8.0" ); Information($"{new string('-', 120)}"); @@ -181,9 +167,10 @@ Task ("copy-net8-with-net8-to-multi-target") Information($"target {assembly_name_target}"); CopyFiles(assembly_name_source, assembly_name_target); - CopyDirectory("generated-net10.0-net8.0", "generated"); - //RunTarget("nuget-pack-without-build"); } + + CopyDirectory("generated-net10.0-net8.0", "generated"); + //RunTarget("nuget-pack-without-build"); } ); @@ -195,11 +182,11 @@ Task ("revert-changes") { foreach(string file in files_net10_net8.Keys) { - StartProcess("git", $"restore {file}"); + StartProcess("git", $"restore {file}"); } foreach(string file in files_net10.Keys) { - StartProcess("git", $"restore {file}"); + StartProcess("git", $"restore {file}"); } } ); @@ -209,7 +196,7 @@ Task ("net10-prepare-binderate-build") ( () => { - /* + /* ../dotnet-android/dotnet-local.sh cake -t=net10-prepare-binderate-build */ dotnet = "../dotnet-android/dotnet-local.sh"; From 31213c300ee843e2bcabfc872c851630bb157011 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 6 Mar 2025 08:24:36 +0100 Subject: [PATCH 081/140] CI scripts merge confilcts fixed --- build/ci/build.yml | 37 ++++++++++++++++++++----------- build/ci/job-extended-tests.yml | 4 +++- build/ci/stage-standard-tests.yml | 2 ++ 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/build/ci/build.yml b/build/ci/build.yml index 41515e24d..3edd5405e 100644 --- a/build/ci/build.yml +++ b/build/ci/build.yml @@ -7,7 +7,9 @@ parameters: timeoutInMinutes: 300 # Max job runtime in minutes runAPIScan: false # Run APIScan analysis runDotnetNextTest: false - + use1ESTemplate: true + installAndroidDependencies: false + tools: # Additional .NET global tools to install - 'Cake.Tool': '4.0.0' - 'private-api-tools': '1.0.3' @@ -23,24 +25,25 @@ jobs: pool: ${{ parameters.buildPool }} workspace: clean: all - - templateContext: - sdl: - spotBugs: - enabled: false - binskim: - scanOutputDirectoryOnly: true - outputs: - - output: pipelineArtifact - targetPath: ${{ parameters.artifactsPath }} - artifactName: output-${{ parameters.name }} - condition: always() + ${{ if eq(parameters.use1ESTemplate, true) }}: + templateContext: + sdl: + spotBugs: + enabled: false + binskim: + scanOutputDirectoryOnly: true + outputs: + - output: pipelineArtifact + targetPath: ${{ parameters.artifactsPath }} + artifactName: output-${{ parameters.name }} + condition: always() steps: - template: setup-environment.yml parameters: dotnetTools: ${{ parameters.tools }} runDotnetNextTest: ${{ parameters.runDotnetNextTest }} + installAndroidDependencies: ${{ parameters.installAndroidDependencies }} - template: build-and-test.yml parameters: @@ -64,3 +67,11 @@ jobs: Write-Host "${{ parameters.artifactsPath }}\SignList.xml already existed, nothing copied." } displayName: Copy SignList.xml to output + + - ${{ if ne(parameters.use1ESTemplate, true) }}: + - task: PublishPipelineArtifact@1 + displayName: Upload logs + inputs: + artifactName: output-${{ parameters.name }} + targetPath: ${{ parameters.artifactsPath }} + condition: always() diff --git a/build/ci/job-extended-tests.yml b/build/ci/job-extended-tests.yml index 0490ae3e3..bb798edf9 100644 --- a/build/ci/job-extended-tests.yml +++ b/build/ci/job-extended-tests.yml @@ -8,11 +8,12 @@ parameters: testProject: # The test .csproj to build testAssembly: # The test .dll to execute runDotnetNextTest: false + installAndroidDependencies: false tools: # Additional .NET global tools to install - 'dotnet-test-slicer' : '0.1.0-alpha7' - 'Cake.Tool': '4.0.0' - + jobs: - job: ${{ parameters.jobName }}_package_tests displayName: ${{ parameters.jobName }} Package Tests @@ -26,6 +27,7 @@ jobs: parameters: dotnetTools: ${{ parameters.tools }} runDotnetNextTest: ${{ parameters.runDotnetNextTest }} + installAndroidDependencies: ${{ parameters.installAndroidDependencies }} - task: DownloadPipelineArtifact@2 inputs: diff --git a/build/ci/stage-standard-tests.yml b/build/ci/stage-standard-tests.yml index 7ba5233e0..dc33bbdab 100644 --- a/build/ci/stage-standard-tests.yml +++ b/build/ci/stage-standard-tests.yml @@ -4,6 +4,7 @@ parameters: buildPool: # VM pool information stageCondition: and(succeeded(), ne('$(skipUnitTests)', 'true')) # When to run this stage runDotnetNextTest: false + installAndroidDependencies: false stages: - stage: standard_tests @@ -22,3 +23,4 @@ stages: testAssembly: $(standardTestAssembly) buildPool: ${{ parameters.buildPool }} runDotnetNextTest: ${{ parameters.runDotnetNextTest }} + installAndroidDependencies: ${{ parameters.installAndroidDependencies }} From 73923679b0be305cbbd3c4f6316e0ce1d52a31fe Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 6 Mar 2025 09:49:39 +0100 Subject: [PATCH 082/140] update, cleanup and CI fixes --- build/cake/build-dotnet-android.cake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index 9d7e024d9..24a6da473 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -29,9 +29,10 @@ Task ("build-android-libraries-net10-net8") RunTarget("build-prepare-dotnet-android"); RunTarget("net8-prepare-binderate-build"); - //RunTarget("net10-prepare-binderate-build"); + //RunTarget("net10-prepare-binderate-build"); // not needed - for testing purposes only RunTarget("net10-net8-prepare-binderate-build"); - //RunTarget("copy-net8-with-net8-to-multi-target"); + RunTarget("copy-net8-with-net8-to-multi-target"); + RunTarget("nuget-pack-without-build"); } ); @@ -170,7 +171,6 @@ Task ("copy-net8-with-net8-to-multi-target") } CopyDirectory("generated-net10.0-net8.0", "generated"); - //RunTarget("nuget-pack-without-build"); } ); From a6cceade281218e820df58701d7e57927f3b5a48 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 8 Mar 2025 21:51:57 +0100 Subject: [PATCH 083/140] Update build-dotnet-android.cake --- build/cake/build-dotnet-android.cake | 64 ++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index 24a6da473..047febdc2 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -9,6 +9,7 @@ git clean -xdf dotnet cake -t=build-prepare-dotnet-android dotnet cake -t=net8-prepare-binderate-build dotnet cake -t=net10-prepare-binderate-build +dotnet cake -t=revert-changes dotnet cake -t=net10-net8-prepare-binderate-build dotnet cake -t=copy-net8-with-net8-to-multi-target @@ -29,10 +30,15 @@ Task ("build-android-libraries-net10-net8") RunTarget("build-prepare-dotnet-android"); RunTarget("net8-prepare-binderate-build"); - //RunTarget("net10-prepare-binderate-build"); // not needed - for testing purposes only - RunTarget("net10-net8-prepare-binderate-build"); + RunTarget("revert-changes-net8"); + RunTarget("net10-prepare-binderate-build"); // not needed - for testing purposes only + RunTarget("revert-changes-net10"); + //RunTarget("net10-net8-prepare-binderate-build"); + RunTarget("revert-changes-net10-net8"); RunTarget("copy-net8-with-net8-to-multi-target"); + RunTarget("revert-changes"); RunTarget("nuget-pack-without-build"); + RunTarget("revert-changes"); } ); @@ -138,8 +144,6 @@ Task ("net10-net8-prepare-binderate-build") DeleteDirectories(GetDirectories("output-net10.0-net8.0"), delete_directory_setting); MoveDirectory("generated", "generated-net10.0-net8.0"); MoveDirectory("output", "output-net10.0-net8.0"); - - RunTarget("revert-changes"); } ); @@ -163,31 +167,69 @@ Task ("copy-net8-with-net8-to-multi-target") "generated-net8.0", "generated-net10.0-net8.0" ); + DateTime dt_c_source = System.IO.File.GetCreationTime(assembly_name_source); + DateTime dt_a_source = System.IO.File.GetLastAccessTime(assembly_name_source); + DateTime dt_w_source = System.IO.File.GetLastWriteTime(assembly_name_source); + DateTime dt_c_target = System.IO.File.GetCreationTime(assembly_name_target); + DateTime dt_a_target = System.IO.File.GetLastAccessTime(assembly_name_target); + DateTime dt_w_target = System.IO.File.GetLastWriteTime(assembly_name_target); + Information($"{new string('-', 120)}"); Information($"source {assembly_name_source}"); + Information($" c: {dt_c_source.ToString("yyyyMMdd-HHmmss")}"); + Information($" w: {dt_w_source.ToString("yyyyMMdd-HHmmss")}"); + Information($" a: {dt_a_source.ToString("yyyyMMdd-HHmmss")}"); Information($"target {assembly_name_target}"); + Information($" c: {dt_c_target.ToString("yyyyMMdd-HHmmss")}"); + Information($" w: {dt_w_target.ToString("yyyyMMdd-HHmmss")}"); + Information($" a: {dt_a_target.ToString("yyyyMMdd-HHmmss")}"); CopyFiles(assembly_name_source, assembly_name_target); } - CopyDirectory("generated-net10.0-net8.0", "generated"); + string s = "generated-net10.0-net8.0"; + string t = "generated"; + + Information($"{new string('-', 120)}"); + Information($"copying"); + Information($" source {s}"); + Information($" source {t}"); + CopyDirectory(s, t); } ); -Task ("revert-changes") +Task ("revert-changes-net8") .Does ( () => { - foreach(string file in files_net10_net8.Keys) + } + ); + +Task ("revert-changes-net10") + .Does + ( + () => + { + foreach(string file in files_net10.Keys) { StartProcess("git", $"restore {file}"); } - foreach(string file in files_net10.Keys) + } + ); + +Task ("revert-changes-net10-net8") + .Does + ( + () => + { + foreach(string file in files_net10_net8.Keys) { StartProcess("git", $"restore {file}"); } + + StartProcess("git", $"restore global.json"); } ); @@ -233,8 +275,6 @@ Task ("net10-prepare-binderate-build") DeleteDirectories(GetDirectories("output-net10.0"), delete_directory_setting); MoveDirectory("generated", "generated-net10.0"); MoveDirectory("output", "output-net10.0"); - - RunTarget("revert-changes"); } ); @@ -264,13 +304,11 @@ Task ("net8-prepare-binderate-build") DeleteDirectories(GetDirectories("output-net8.0"), delete_directory_setting); MoveDirectory("generated", "generated-net8.0"); MoveDirectory("output", "output-net8.0"); - - RunTarget("revert-changes"); } ); -Dictionary> files_net10_net8; Dictionary> files_net10; +Dictionary> files_net10_net8; files_net10 = new Dictionary> From 3317b91e591b3eedb52c7e2c8dd8dd69fc093de5 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 8 Mar 2025 21:52:00 +0100 Subject: [PATCH 084/140] Update NuGet.config --- NuGet.config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 92e4a5f92..f0ba1ff5f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,9 +2,10 @@ - + + @@ -24,4 +25,4 @@ - + \ No newline at end of file From 9df843010b45aedf59fd03fcd0691686f1ff0666 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 10 Mar 2025 15:30:55 +0100 Subject: [PATCH 085/140] Update build-dotnet-android.cake --- build/cake/build-dotnet-android.cake | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index 047febdc2..a2f5390ae 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -8,8 +8,9 @@ git clean -xdf dotnet cake -t=build-prepare-dotnet-android dotnet cake -t=net8-prepare-binderate-build +dotnet cake -t=revert-changes-net8 dotnet cake -t=net10-prepare-binderate-build -dotnet cake -t=revert-changes +dotnet cake -t=revert-changes-net10 dotnet cake -t=net10-net8-prepare-binderate-build dotnet cake -t=copy-net8-with-net8-to-multi-target @@ -204,6 +205,7 @@ Task ("revert-changes-net8") ( () => { + DeleteFile(path_global_json); } ); @@ -279,6 +281,8 @@ Task ("net10-prepare-binderate-build") ); +string path_global_json = "./global.json"; + Task ("net8-prepare-binderate-build") .Does ( @@ -288,6 +292,27 @@ Task ("net8-prepare-binderate-build") DeleteDirectories(GetDirectories("./externals/"), delete_directory_setting); DeleteDirectories(GetDirectories("./generated*/"), delete_directory_setting); + string path_global_json = "./global.json"; + string content_global_json = + """ + { + "sdk": + { + "version": "8.0.404", + "rollForward": "patch" + }, + "msbuild-sdks": + { + "MSBuild.Sdk.Extras": "3.0.44", + "Microsoft.Build.Traversal": "4.1.0", + "Microsoft.Build.NoTargets": "3.7.56", + "Xamarin.Legacy.Sdk": "0.2.0-alpha4" + } + } + """; + System.IO.File.WriteAllText(path_global_json, content_global_json); + EnsureDirectoryExists("./output"); + dotnet = "dotnet"; Information($"{new string('=', 120)}"); From 44c150d93d2d80d79847a55c2b76acaee98ed6f0 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 10 Mar 2025 15:31:37 +0100 Subject: [PATCH 086/140] added private feed for tests and public feed for cake scripts --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index f0ba1ff5f..80a2ad799 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,8 @@ + + From 8dee5174f4b3eb9971412bc9f130f614079f1edd Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 11 Mar 2025 12:57:54 +0100 Subject: [PATCH 087/140] packaging green --- build/cake/build-dotnet-android.cake | 51 ++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index a2f5390ae..d92439811 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -34,12 +34,10 @@ Task ("build-android-libraries-net10-net8") RunTarget("revert-changes-net8"); RunTarget("net10-prepare-binderate-build"); // not needed - for testing purposes only RunTarget("revert-changes-net10"); - //RunTarget("net10-net8-prepare-binderate-build"); + RunTarget("net10-net8-prepare-binderate-build"); RunTarget("revert-changes-net10-net8"); RunTarget("copy-net8-with-net8-to-multi-target"); - RunTarget("revert-changes"); RunTarget("nuget-pack-without-build"); - RunTarget("revert-changes"); } ); @@ -50,6 +48,53 @@ DeleteDirectorySettings delete_directory_setting = new () Force = true }; +Task ("nuget-pack-without-build-net10-net8") + .Does + ( + () => + { + dotnet = "../dotnet-android/dotnet-local.sh"; + + var projects = GetFiles($"./generated/**/*.csproj"); + + Information($"{new string('=', 120)}"); + string dotnet_pack = "pack" + + " " + + "__PLACEHOLDER_PROJECT__" + + " " + + "--no-build" + + " " + + "--output ./output/" + ; + /* + System has ran out of application memory. + + dotnet(94604) MallocStackLogging: can't turn off malloc stack logging because it was not enabled. + */ + Information($"{new string('=', 120)}"); + Information($" Environment.ProcessorCount = {Environment.ProcessorCount}"); + + Parallel.ForEach + ( + projects, + new ParallelOptions + { + MaxDegreeOfParallelism = 8 + }, + (FilePath file) => + { + string dotnet_pack_project = dotnet_pack.Replace + ( + "__PLACEHOLDER_PROJECT__", + file.ToString() + ); + StartProcess(dotnet, dotnet_pack_project); + Information($"{file.ToString()}"); + } + ); + + } + ); Task ("build-prepare-dotnet-android") .Does From 614519b80fde6bc57396706ce0f0740b34ac4361 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 11 Mar 2025 14:40:11 +0100 Subject: [PATCH 088/140] script fixes and improvements --- build/cake/build-dotnet-android.cake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index d92439811..76fdecab5 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -32,12 +32,12 @@ Task ("build-android-libraries-net10-net8") RunTarget("build-prepare-dotnet-android"); RunTarget("net8-prepare-binderate-build"); RunTarget("revert-changes-net8"); - RunTarget("net10-prepare-binderate-build"); // not needed - for testing purposes only - RunTarget("revert-changes-net10"); + // RunTarget("net10-prepare-binderate-build"); // not needed - for testing purposes only + // RunTarget("revert-changes-net10"); RunTarget("net10-net8-prepare-binderate-build"); - RunTarget("revert-changes-net10-net8"); RunTarget("copy-net8-with-net8-to-multi-target"); - RunTarget("nuget-pack-without-build"); + RunTarget("nuget-pack-without-build-net10-net8"); + RunTarget("revert-changes-net10-net8"); } ); @@ -64,7 +64,7 @@ Task ("nuget-pack-without-build-net10-net8") + " " + "--no-build" + " " + - "--output ./output/" + "--output ./output/nupkgs/" ; /* System has ran out of application memory. From d0cad54af12f3b877916df5b020c7b15d49afc5a Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 12 Mar 2025 16:31:08 +0100 Subject: [PATCH 089/140] leanback fixes --- .../leanback/Additions/Additions.cs | 328 ------------------ .../leanback/Transforms/Metadata.xml | 23 +- 2 files changed, 16 insertions(+), 335 deletions(-) delete mode 100644 source/androidx.leanback/leanback/Additions/Additions.cs diff --git a/source/androidx.leanback/leanback/Additions/Additions.cs b/source/androidx.leanback/leanback/Additions/Additions.cs deleted file mode 100644 index 99667e4f3..000000000 --- a/source/androidx.leanback/leanback/Additions/Additions.cs +++ /dev/null @@ -1,328 +0,0 @@ -using System; -using Android.Runtime; -using Java.Interop; - -#if ! NET9_0_OR_GREATER - -namespace AndroidX.Leanback.Widget -{ - public partial class BaseCardView - { - public override bool Selected { - get { return base.Selected; } - set { SetSelected (value); } - } - - static Delegate cb_setSelected_Z; -#pragma warning disable 0169 - static Delegate GetSetSelected_ZHandler () - { - if (cb_setSelected_Z == null) - cb_setSelected_Z = JNINativeWrapper.CreateDelegate ((Action)n_SetSelected_Z); - return cb_setSelected_Z; - } - - static void n_SetSelected_Z (IntPtr jnienv, IntPtr native__this, bool selected) - { - global::AndroidX.Leanback.Widget.BaseCardView __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.SetSelected (selected); - } -#pragma warning restore 0169 - - static IntPtr id_setSelected_Z; - // Metadata.xml XPath method reference: path="/api/package[@name='AndroidX.Leanback.leanback.widget']/class[@name='BaseCardView']/method[@name='setSelected' and count(parameter)=1 and parameter[1][@type='boolean']]" - [Register ("setSelected", "(Z)V", "GetSetSelected_ZHandler")] - public unsafe void SetSelected (bool selected) - { - if (id_setSelected_Z == IntPtr.Zero) - id_setSelected_Z = JNIEnv.GetMethodID (class_ref, "setSelected", "(Z)V"); - try { - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue (selected); - - if (GetType () == ThresholdType) - JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setSelected_Z, __args); - else - JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setSelected", "(Z)V"), __args); - } finally { - } - } - - - public bool Activate { - get { return base.Activated; } - set { SetActivated (value); } - } - - static Delegate cb_setActivated_Z; -#pragma warning disable 0169 - static Delegate GetSetActivated_ZHandler () - { - if (cb_setActivated_Z == null) - cb_setActivated_Z = JNINativeWrapper.CreateDelegate ((Action)n_SetActivated_Z); - return cb_setActivated_Z; - } - - static void n_SetActivated_Z (IntPtr jnienv, IntPtr native__this, bool activated) - { - global::AndroidX.Leanback.Widget.BaseCardView __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.SetActivated (activated); - } -#pragma warning restore 0169 - - static IntPtr id_setActivated_Z; - // Metadata.xml XPath method reference: path="/api/package[@name='AndroidX.Leanback.leanback.widget']/class[@name='BaseCardView']/method[@name='setActivated' and count(parameter)=1 and parameter[1][@type='boolean']]" - [Register ("setActivated", "(Z)V", "GetSetActivated_ZHandler")] - public unsafe void SetActivated (bool activated) - { - if (id_setActivated_Z == IntPtr.Zero) - id_setActivated_Z = JNIEnv.GetMethodID (class_ref, "setActivated", "(Z)V"); - try { - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue (activated); - - if (GetType () == ThresholdType) - JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setActivated_Z, __args); - else - JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setActivated", "(Z)V"), __args); - } finally { - } - } - } - - - public partial class MediaNowPlayingView - { - public override Android.Views.ViewStates Visibility { - get { return base.Visibility; } - set { SetVisibility (value); } - } - - static Delegate cb_setVisibility_I; -#pragma warning disable 0169 - static Delegate GetSetVisibility_IHandler () - { - if (cb_setVisibility_I == null) - cb_setVisibility_I = JNINativeWrapper.CreateDelegate ((Action)n_SetVisibility_I); - return cb_setVisibility_I; - } - - static void n_SetVisibility_I (IntPtr jnienv, IntPtr native__this, int native_visibility) - { - global::AndroidX.Leanback.Widget.MediaNowPlayingView __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - global::Android.Views.ViewStates visibility = (global::Android.Views.ViewStates)native_visibility; - __this.SetVisibility (visibility); - } -#pragma warning restore 0169 - - static IntPtr id_setVisibility_I; - // Metadata.xml XPath method reference: path="/api/package[@name='AndroidX.Leanback.leanback.widget']/class[@name='MediaNowPlayingView']/method[@name='setVisibility' and count(parameter)=1 and parameter[1][@type='int']]" - [Register ("setVisibility", "(I)V", "GetSetVisibility_IHandler")] - public unsafe void SetVisibility ([global::Android.Runtime.GeneratedEnum] global::Android.Views.ViewStates visibility) - { - if (id_setVisibility_I == IntPtr.Zero) - id_setVisibility_I = JNIEnv.GetMethodID (class_ref, "setVisibility", "(I)V"); - try { - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue ((int)visibility); - - if (GetType () == ThresholdType) - JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setVisibility_I, __args); - else - JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setVisibility", "(I)V"), __args); - } finally { - } - } - } - - public partial class SearchBar - { - public override int NextFocusDownId { - get { return base.NextFocusDownId; } - set { SetNextFocusDownId (value); } - } - - static Delegate cb_setNextFocusDownId_I; -#pragma warning disable 0169 - static Delegate GetSetNextFocusDownId_IHandler () - { - if (cb_setNextFocusDownId_I == null) - cb_setNextFocusDownId_I = JNINativeWrapper.CreateDelegate ((Action)n_SetNextFocusDownId_I); - return cb_setNextFocusDownId_I; - } - - static void n_SetNextFocusDownId_I (IntPtr jnienv, IntPtr native__this, int viewId) - { - global::AndroidX.Leanback.Widget.SearchBar __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.SetNextFocusDownId (viewId); - } -#pragma warning restore 0169 - - static IntPtr id_setNextFocusDownId_I; - // Metadata.xml XPath method reference: path="/api/package[@name='AndroidX.Leanback.leanback.widget']/class[@name='SearchBar']/method[@name='setNextFocusDownId' and count(parameter)=1 and parameter[1][@type='int']]" - [Register ("setNextFocusDownId", "(I)V", "GetSetNextFocusDownId_IHandler")] - public unsafe void SetNextFocusDownId (int viewId) - { - if (id_setNextFocusDownId_I == IntPtr.Zero) - id_setNextFocusDownId_I = JNIEnv.GetMethodID (class_ref, "setNextFocusDownId", "(I)V"); - try { - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue (viewId); - - if (GetType () == ThresholdType) - JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setNextFocusDownId_I, __args); - else - JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setNextFocusDownId", "(I)V"), __args); - } finally { - } - } - } - -// public partial class ParallaxRecyclerViewSource -// { - -// static Delegate cb_createProperty_Ljava_lang_String_I; -//#pragma warning disable 0169 -// static Delegate GetCreateProperty_Ljava_lang_String_IHandler() -// { -// if (cb_createProperty_Ljava_lang_String_I == null) -// cb_createProperty_Ljava_lang_String_I = JNINativeWrapper.CreateDelegate((Func)n_CreateProperty_Ljava_lang_String_I); -// return cb_createProperty_Ljava_lang_String_I; -// } - -// static IntPtr n_CreateProperty_Ljava_lang_String_I(IntPtr jnienv, IntPtr native__this, IntPtr native_name, int index) -// { -// global::AndroidX.Leanback.Leanback.Widget.ParallaxRecyclerViewSource __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); -// string name = JNIEnv.GetString(native_name, JniHandleOwnership.DoNotTransfer); -// IntPtr __ret = JNIEnv.ToLocalJniHandle(__this.CreateProperty(name, index)); -// return __ret; -// } -//#pragma warning restore 0169 - -// static IntPtr id_createProperty_Ljava_lang_String_I; -// // Metadata.xml XPath method reference: path="/api/package[@name='AndroidX.Leanback.leanback.widget']/class[@name='ParallaxRecyclerViewSource']/method[@name='createProperty' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='int']]" -// [Register("createProperty", "(Ljava/lang/String;I)Landroid/support/v17/leanback/widget/ParallaxRecyclerViewSource$ChildPositionProperty;", "GetCreateProperty_Ljava_lang_String_IHandler")] -// public override unsafe Java.Lang.Object CreateProperty(string name, int index) -// { -// if (id_createProperty_Ljava_lang_String_I == IntPtr.Zero) -// id_createProperty_Ljava_lang_String_I = JNIEnv.GetMethodID(class_ref, "createProperty", "(Ljava/lang/String;I)Landroid/support/v17/leanback/widget/ParallaxRecyclerViewSource$ChildPositionProperty;"); -// IntPtr native_name = JNIEnv.NewString(name); -// try -// { -// JValue* __args = stackalloc JValue[2]; -// __args[0] = new JValue(native_name); -// __args[1] = new JValue(index); - -// global::AndroidX.Leanback.Leanback.Widget.ParallaxRecyclerViewSource.ChildPositionProperty __ret; -// if (GetType() == ThresholdType) -// __ret = global::Java.Lang.Object.GetObject(JNIEnv.CallObjectMethod(((global::Java.Lang.Object)this).Handle, id_createProperty_Ljava_lang_String_I, __args), JniHandleOwnership.TransferLocalRef); -// else -// __ret = global::Java.Lang.Object.GetObject(JNIEnv.CallNonvirtualObjectMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "createProperty", "(Ljava/lang/String;I)Landroid/support/v17/leanback/widget/ParallaxRecyclerViewSource$ChildPositionProperty;"), __args), JniHandleOwnership.TransferLocalRef); -// return __ret; -// } -// finally -// { -// JNIEnv.DeleteLocalRef(native_name); -// } -// } -// } - - public partial class RecyclerViewParallax - { - // Metadata.xml XPath method reference: path="/api/package[@name='androidX.leanback.leanback.widget']/class[@name='RecyclerViewParallax']/method[@name='createProperty' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='int']]" - [Register("createProperty", "(Ljava/lang/String;I)Landroid/util/Property;", "GetCreateProperty_Ljava_lang_String_IHandler")] - public override unsafe Java.Lang.Object CreateProperty(string name, int index) - { - // TODO: Implement JNI - return null; - } - - - - - //[Register("addProperty", "(Ljava/lang/String;)Landroid/util/Property;", "GetAddProperty_Ljava_lang_String_Handler")] - //public override unsafe Java.Lang.Object AddProperty(string name) - //{ - // // TODO: Implement - // return null; - //} - } -} - -namespace AndroidX.Leanback.App -{ - -} - -namespace AndroidX.Leanback.Widget.Picker -{ - public partial class Picker - { - public override bool Activated { - get { return base.Activated; } - set { SetActivated (value); } - } - static Delegate cb_setActivated_Z; -#pragma warning disable 0169 - static Delegate GetSetActivated_ZHandler () - { - if (cb_setActivated_Z == null) - cb_setActivated_Z = JNINativeWrapper.CreateDelegate ((Action)n_SetActivated_Z); - return cb_setActivated_Z; - } - - static void n_SetActivated_Z (IntPtr jnienv, IntPtr native__this, bool activated) - { - global::AndroidX.Leanback.Widget.Picker.Picker __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.SetActivated (activated); - } -#pragma warning restore 0169 - - static IntPtr id_setActivated_Z; - // Metadata.xml XPath method reference: path="/api/package[@name='AndroidX.Leanback.leanback.widget.picker']/class[@name='Picker']/method[@name='setActivated' and count(parameter)=1 and parameter[1][@type='boolean']]" - [Register ("setActivated", "(Z)V", "GetSetActivated_ZHandler")] - public unsafe void SetActivated (bool activated) - { - if (id_setActivated_Z == IntPtr.Zero) - id_setActivated_Z = JNIEnv.GetMethodID (class_ref, "setActivated", "(Z)V"); - try { - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue (activated); - - if (GetType () == ThresholdType) - JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setActivated_Z, __args); - else - JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setActivated", "(Z)V"), __args); - } finally { - } - } - } -} - -#else - -namespace AndroidX.Leanback.Widget -{ - public partial class RecyclerViewParallax - { - // Metadata.xml XPath method reference: path="/api/package[@name='androidX.leanback.leanback.widget']/class[@name='RecyclerViewParallax']/method[@name='createProperty' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='int']]" - [Register("createProperty", "(Ljava/lang/String;I)Landroid/util/Property;", "GetCreateProperty_Ljava_lang_String_IHandler")] - public override unsafe Java.Lang.Object CreateProperty(string name, int index) - { - // TODO: Implement JNI - return null; - } - - - - - //[Register("addProperty", "(Ljava/lang/String;)Landroid/util/Property;", "GetAddProperty_Ljava_lang_String_Handler")] - //public override unsafe Java.Lang.Object AddProperty(string name) - //{ - // // TODO: Implement - // return null; - //} - } -} - -#endif \ No newline at end of file diff --git a/source/androidx.leanback/leanback/Transforms/Metadata.xml b/source/androidx.leanback/leanback/Transforms/Metadata.xml index 6016f09fd..3be175bb4 100644 --- a/source/androidx.leanback/leanback/Transforms/Metadata.xml +++ b/source/androidx.leanback/leanback/Transforms/Metadata.xml @@ -42,11 +42,13 @@ internal public + @@ -63,9 +65,7 @@ - @@ -87,7 +87,12 @@ Java.Lang.Object Java.Lang.Object + + Java.Lang.Object @@ -269,13 +274,17 @@ > protected - + + - androidx.leanback.widget.Row + Java.Lang.Object - + + \ No newline at end of file From 993a033797758ced91fda36adb448e06768f9004 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 12 Mar 2025 20:56:46 +0100 Subject: [PATCH 090/140] MaxDegreeOfParallelism fixed --- build/cake/build-dotnet-android.cake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index 76fdecab5..c63bd9a8b 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -12,8 +12,9 @@ dotnet cake -t=revert-changes-net8 dotnet cake -t=net10-prepare-binderate-build dotnet cake -t=revert-changes-net10 dotnet cake -t=net10-net8-prepare-binderate-build - dotnet cake -t=copy-net8-with-net8-to-multi-target +dotnet cake -t=nuget-pack-without-build-net10-net8 +dotnet cake -t=revert-changes-net10-net8 */ using System.Threading.Tasks; @@ -79,7 +80,7 @@ Task ("nuget-pack-without-build-net10-net8") projects, new ParallelOptions { - MaxDegreeOfParallelism = 8 + MaxDegreeOfParallelism = Environment.ProcessorCount - 4 }, (FilePath file) => { @@ -512,4 +513,4 @@ files_net10_net8 = new Dictionary Date: Thu, 13 Mar 2025 09:22:11 +0100 Subject: [PATCH 091/140] removed nuget.org (CI builds securit requirement) --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 80a2ad799..9e2cceca5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,6 @@ - From b9851327cc3580a8147535be3fbea0ec2d1ce580 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 13 Mar 2025 19:15:49 +0100 Subject: [PATCH 092/140] instructions in script added --- build/cake/build-dotnet-android.cake | 61 ++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-dotnet-android.cake index c63bd9a8b..43e650485 100644 --- a/build/cake/build-dotnet-android.cake +++ b/build/cake/build-dotnet-android.cake @@ -5,18 +5,45 @@ // #tool nuget:?package=ZString&version=2.6.0 /* -git clean -xdf -dotnet cake -t=build-prepare-dotnet-android -dotnet cake -t=net8-prepare-binderate-build -dotnet cake -t=revert-changes-net8 -dotnet cake -t=net10-prepare-binderate-build -dotnet cake -t=revert-changes-net10 -dotnet cake -t=net10-net8-prepare-binderate-build -dotnet cake -t=copy-net8-with-net8-to-multi-target -dotnet cake -t=nuget-pack-without-build-net10-net8 -dotnet cake -t=revert-changes-net10-net8 - +```shell + git clean -xdf ; dotnet cake -t=build-android-libraries-net10-net8 +``` + +Step by step tests: + +```shell + git clean -xdf + dotnet cake -t=build-prepare-dotnet-android + dotnet cake -t=net8-prepare-binderate-build + dotnet cake -t=revert-changes-net8 + dotnet cake -t=net10-prepare-binderate-build + dotnet cake -t=revert-changes-net10 + dotnet cake -t=net10-net8-prepare-binderate-build + dotnet cake -t=copy-net8-with-net8-to-multi-target + dotnet cake -t=nuget-pack-without-build-net10-net8 + dotnet cake -t=revert-changes-net10-net8 +``` +*/ +/* +```bash +git clone \ + --branch mu-20241209-net10-removal-of-generator-workarounds \ + https://github.com/dotnet/android-libraries.git \ + al-bash/ +cd al-bash/ +dotnet cake -t:build-android-libraries-net10-net8 +``` + +```pwsh +git clone ` + --branch mu-20241209-net10-removal-of-generator-workarounds ` + https://github.com/dotnet/android-libraries.git ` + al-pwsh/ +cd al-pwsh/ +dotnet cake -t:build-android-libraries-net10-net8 +``` */ + using System.Threading.Tasks; Task ("build-android-libraries-net10-net8") @@ -80,7 +107,7 @@ Task ("nuget-pack-without-build-net10-net8") projects, new ParallelOptions { - MaxDegreeOfParallelism = Environment.ProcessorCount - 4 + MaxDegreeOfParallelism = (int) 0.75 * Environment.ProcessorCount }, (FilePath file) => { @@ -153,6 +180,10 @@ Task ("net10-net8-prepare-binderate-build") Parallel.ForEach ( files_net10_net8.Keys, + new ParallelOptions + { + MaxDegreeOfParallelism = (int) 0.75 * Environment.ProcessorCount + }, (string file) => { List<(string text_old, string text_new)> replacements = files_net10_net8[file]; @@ -296,6 +327,10 @@ Task ("net10-prepare-binderate-build") Parallel.ForEach ( files_net10.Keys, + new ParallelOptions + { + MaxDegreeOfParallelism = (int) 0.75 * Environment.ProcessorCount + }, (string file) => { List<(string text_old, string text_new)> replacements = files_net10[file]; @@ -344,7 +379,7 @@ Task ("net8-prepare-binderate-build") { "sdk": { - "version": "8.0.404", + "version": "8.0.407", "rollForward": "patch" }, "msbuild-sdks": From 402bbca86e6832ce1703a1ba6bbb8ccb1345c384 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 13 Mar 2025 20:49:53 +0100 Subject: [PATCH 093/140] renamed script --- ...otnet-android.cake => build-android-libraries-net10-net8.cake} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build/cake/{build-dotnet-android.cake => build-android-libraries-net10-net8.cake} (100%) diff --git a/build/cake/build-dotnet-android.cake b/build/cake/build-android-libraries-net10-net8.cake similarity index 100% rename from build/cake/build-dotnet-android.cake rename to build/cake/build-android-libraries-net10-net8.cake From 12192d2d265f14baca5ac992ff6b0e172bb2fe86 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 14 Mar 2025 08:09:03 +0100 Subject: [PATCH 094/140] script include/load fix after renaming --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index b46bf3171..25440645d 100755 --- a/build.cake +++ b/build.cake @@ -18,7 +18,7 @@ #load "build/cake/executive-order.cake" #load "build/cake/clean.cake" #load "build/cake/performance-timings.cake" -#load "build/cake/build-dotnet-android.cake" +#load "build/cake/build-android-libraries-net10-net8.cake" using System.Xml.Linq; using Newtonsoft.Json; From 676e71cd78d574f936998485080935c8bd9f13c7 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 14 Mar 2025 08:44:41 +0100 Subject: [PATCH 095/140] docs/notes --- build/cake/build-android-libraries-net10-net8.cake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index 43e650485..2a77963d7 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -5,6 +5,8 @@ // #tool nuget:?package=ZString&version=2.6.0 /* +Quick test + ```shell git clean -xdf ; dotnet cake -t=build-android-libraries-net10-net8 ``` @@ -23,8 +25,9 @@ Step by step tests: dotnet cake -t=nuget-pack-without-build-net10-net8 dotnet cake -t=revert-changes-net10-net8 ``` -*/ -/* + +Tests from scratch: + ```bash git clone \ --branch mu-20241209-net10-removal-of-generator-workarounds \ From 8fea57201c79b0d684443089170ee967b2616046 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 14 Mar 2025 09:12:55 +0100 Subject: [PATCH 096/140] rounding used --- build/cake/build-android-libraries-net10-net8.cake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index 2a77963d7..e03c6fd3a 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -110,7 +110,7 @@ Task ("nuget-pack-without-build-net10-net8") projects, new ParallelOptions { - MaxDegreeOfParallelism = (int) 0.75 * Environment.ProcessorCount + MaxDegreeOfParallelism = Math.Round(0.75 * Environment.ProcessorCount) }, (FilePath file) => { @@ -185,7 +185,7 @@ Task ("net10-net8-prepare-binderate-build") files_net10_net8.Keys, new ParallelOptions { - MaxDegreeOfParallelism = (int) 0.75 * Environment.ProcessorCount + MaxDegreeOfParallelism = Math.Round(0.75 * Environment.ProcessorCount) }, (string file) => { @@ -332,7 +332,7 @@ Task ("net10-prepare-binderate-build") files_net10.Keys, new ParallelOptions { - MaxDegreeOfParallelism = (int) 0.75 * Environment.ProcessorCount + MaxDegreeOfParallelism = Math.Round(0.75 * Environment.ProcessorCount) }, (string file) => { From 08f341c31ba9887cc65c61a89ff42bffa662c473 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 14 Mar 2025 09:16:36 +0100 Subject: [PATCH 097/140] cast added --- build/cake/build-android-libraries-net10-net8.cake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index e03c6fd3a..12de1db3a 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -110,7 +110,7 @@ Task ("nuget-pack-without-build-net10-net8") projects, new ParallelOptions { - MaxDegreeOfParallelism = Math.Round(0.75 * Environment.ProcessorCount) + MaxDegreeOfParallelism = (int) Math.Round(0.75 * Environment.ProcessorCount) }, (FilePath file) => { @@ -185,7 +185,7 @@ Task ("net10-net8-prepare-binderate-build") files_net10_net8.Keys, new ParallelOptions { - MaxDegreeOfParallelism = Math.Round(0.75 * Environment.ProcessorCount) + MaxDegreeOfParallelism = (int) Math.Round(0.75 * Environment.ProcessorCount) }, (string file) => { @@ -332,7 +332,7 @@ Task ("net10-prepare-binderate-build") files_net10.Keys, new ParallelOptions { - MaxDegreeOfParallelism = Math.Round(0.75 * Environment.ProcessorCount) + MaxDegreeOfParallelism = (int) Math.Round(0.75 * Environment.ProcessorCount) }, (string file) => { From 9c311c0bdcece45f42b5c83c0ba1863bb85712a4 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 14 Mar 2025 12:39:41 +0100 Subject: [PATCH 098/140] timings cleanup (not needed yet) --- .../performance-timings.cake.cake-timer.csv | 7 ------- .../20241230-154632/performance-timings.cake.stopwatch.csv | 7 ------- 2 files changed, 14 deletions(-) delete mode 100644 data/timings/20241230-154632/performance-timings.cake.cake-timer.csv delete mode 100644 data/timings/20241230-154632/performance-timings.cake.stopwatch.csv diff --git a/data/timings/20241230-154632/performance-timings.cake.cake-timer.csv b/data/timings/20241230-154632/performance-timings.cake.cake-timer.csv deleted file mode 100644 index 7ff503753..000000000 --- a/data/timings/20241230-154632/performance-timings.cake.cake-timer.csv +++ /dev/null @@ -1,7 +0,0 @@ - #TimingDataCake, data.timestamp, data.task, data.duration - #TimingDataCake, 20241230-153719.26, inject-variables, 00:00:00 - #TimingDataCake, 20241230-153720.63, javadocs-gps, 00:00:01.3624489 - #TimingDataCake, 20241230-153843.77, binderate, 00:01:23.1432200 - #TimingDataCake, 20241230-153844.1, metadata-verify, 00:00:00.3327316 - #TimingDataCake, 20241230-153905.62, libs-native, 00:00:21.5126355 - #TimingDataCake, 20241230-154632.43, libs, 00:07:26.7990019 diff --git a/data/timings/20241230-154632/performance-timings.cake.stopwatch.csv b/data/timings/20241230-154632/performance-timings.cake.stopwatch.csv deleted file mode 100644 index e4fca4ac0..000000000 --- a/data/timings/20241230-154632/performance-timings.cake.stopwatch.csv +++ /dev/null @@ -1,7 +0,0 @@ - #TimingDataStopwatch, data.timestamp, data.task, data.duration - #TimingDataStopwatch, 20241230-153719.26, inject-variables, 00:00:00.0003172 - #TimingDataStopwatch, 20241230-153720.63, javadocs-gps, 00:00:01.3627711 - #TimingDataStopwatch, 20241230-153843.77, binderate, 00:01:24.5059941 - #TimingDataStopwatch, 20241230-153844.1, metadata-verify, 00:01:24.8387294 - #TimingDataStopwatch, 20241230-153905.62, libs-native, 00:01:46.3513845 - #TimingDataStopwatch, 20241230-154632.43, libs, 00:09:13.1504700 From ab22a3429dd91b0e84a3e1a01796063314745229 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 14 Mar 2025 13:06:10 +0100 Subject: [PATCH 099/140] Create global.json --- global.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 global.json diff --git a/global.json b/global.json new file mode 100644 index 000000000..86b25b508 --- /dev/null +++ b/global.json @@ -0,0 +1,14 @@ +{ + "sdk": + { + "version": "8.0.407", + "rollForward": "patch" + }, + "msbuild-sdks": + { + "MSBuild.Sdk.Extras": "3.0.44", + "Microsoft.Build.Traversal": "4.1.82", + "Microsoft.Build.NoTargets": "3.7.56", + "Xamarin.Legacy.Sdk": "0.2.0-alpha4" + } +} From eca40e3f144b491017882ea6d993689ded955e75 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 14 Mar 2025 13:15:03 +0100 Subject: [PATCH 100/140] Update global.json --- global.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/global.json b/global.json index 86b25b508..dfb7a9baf 100644 --- a/global.json +++ b/global.json @@ -1,14 +1,14 @@ -{ - "sdk": - { - "version": "8.0.407", - "rollForward": "patch" - }, - "msbuild-sdks": - { - "MSBuild.Sdk.Extras": "3.0.44", - "Microsoft.Build.Traversal": "4.1.82", - "Microsoft.Build.NoTargets": "3.7.56", - "Xamarin.Legacy.Sdk": "0.2.0-alpha4" - } -} +{ + "sdk": + { + "version": "8.0.407", + "rollForward": "patch" + }, + "msbuild-sdks": + { + "MSBuild.Sdk.Extras": "3.0.44", + "Microsoft.Build.Traversal": "4.1.82", + "Microsoft.Build.NoTargets": "3.7.56", + "Xamarin.Legacy.Sdk": "0.2.0-alpha4" + } +} From 3571cde35794bce405ba663051cbf916cbf06761 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 14 Mar 2025 13:15:30 +0100 Subject: [PATCH 101/140] refactoring for global.json juggling --- .../build-android-libraries-net10-net8.cake | 64 +++++++++++++++++-- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index 12de1db3a..9462ab34a 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -73,6 +73,8 @@ Task ("build-android-libraries-net10-net8") ); string dotnet; +string path_global_json = "./global.json"; +string content_global_json; DeleteDirectorySettings delete_directory_setting = new () { Recursive = true, @@ -132,6 +134,25 @@ Task ("build-prepare-dotnet-android") ( () => { + content_global_json = + """ + { + "sdk": + { + "version": "8.0.407", + "rollForward": "patch" + }, + "msbuild-sdks": + { + "MSBuild.Sdk.Extras": "3.0.44", + "Microsoft.Build.Traversal": "4.1.0", + "Microsoft.Build.NoTargets": "3.7.56", + "Xamarin.Legacy.Sdk": "0.2.0-alpha4" + } + } + """; + System.IO.File.WriteAllText(path_global_json, content_global_json); + string dir = "../dotnet-android/"; DeleteDirectories(GetDirectories(dir), delete_directory_setting); @@ -171,6 +192,24 @@ Task ("net10-net8-prepare-binderate-build") ( () => { + content_global_json = + """ + { + "sdk": + { + "rollForward": "patch" + }, + "msbuild-sdks": + { + "MSBuild.Sdk.Extras": "3.0.44", + "Microsoft.Build.Traversal": "4.1.0", + "Microsoft.Build.NoTargets": "3.7.56", + "Xamarin.Legacy.Sdk": "0.2.0-alpha4" + } + } + """; + System.IO.File.WriteAllText(path_global_json, content_global_json); + dotnet = "../dotnet-android/dotnet-local.sh"; /* @@ -320,6 +359,24 @@ Task ("net10-prepare-binderate-build") ( () => { + content_global_json = + """ + { + "sdk": + { + "rollForward": "patch" + }, + "msbuild-sdks": + { + "MSBuild.Sdk.Extras": "3.0.44", + "Microsoft.Build.Traversal": "4.1.0", + "Microsoft.Build.NoTargets": "3.7.56", + "Xamarin.Legacy.Sdk": "0.2.0-alpha4" + } + } + """; + System.IO.File.WriteAllText(path_global_json, content_global_json); + /* ../dotnet-android/dotnet-local.sh cake -t=net10-prepare-binderate-build */ @@ -364,9 +421,6 @@ Task ("net10-prepare-binderate-build") } ); - -string path_global_json = "./global.json"; - Task ("net8-prepare-binderate-build") .Does ( @@ -376,8 +430,7 @@ Task ("net8-prepare-binderate-build") DeleteDirectories(GetDirectories("./externals/"), delete_directory_setting); DeleteDirectories(GetDirectories("./generated*/"), delete_directory_setting); - string path_global_json = "./global.json"; - string content_global_json = + content_global_json = """ { "sdk": @@ -395,6 +448,7 @@ Task ("net8-prepare-binderate-build") } """; System.IO.File.WriteAllText(path_global_json, content_global_json); + EnsureDirectoryExists("./output"); dotnet = "dotnet"; From 9300ffb7b1d5a75e2e8b22e2b3079fd0448e57af Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 14 Mar 2025 13:18:59 +0100 Subject: [PATCH 102/140] fixed versions --- build/cake/build-android-libraries-net10-net8.cake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index 9462ab34a..58c93645d 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -145,7 +145,7 @@ Task ("build-prepare-dotnet-android") "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", - "Microsoft.Build.Traversal": "4.1.0", + "Microsoft.Build.Traversal": "4.1.82", "Microsoft.Build.NoTargets": "3.7.56", "Xamarin.Legacy.Sdk": "0.2.0-alpha4" } @@ -202,7 +202,7 @@ Task ("net10-net8-prepare-binderate-build") "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", - "Microsoft.Build.Traversal": "4.1.0", + "Microsoft.Build.Traversal": "4.1.82", "Microsoft.Build.NoTargets": "3.7.56", "Xamarin.Legacy.Sdk": "0.2.0-alpha4" } @@ -369,7 +369,7 @@ Task ("net10-prepare-binderate-build") "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", - "Microsoft.Build.Traversal": "4.1.0", + "Microsoft.Build.Traversal": "4.1.82", "Microsoft.Build.NoTargets": "3.7.56", "Xamarin.Legacy.Sdk": "0.2.0-alpha4" } @@ -441,7 +441,7 @@ Task ("net8-prepare-binderate-build") "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", - "Microsoft.Build.Traversal": "4.1.0", + "Microsoft.Build.Traversal": "4.1.82", "Microsoft.Build.NoTargets": "3.7.56", "Xamarin.Legacy.Sdk": "0.2.0-alpha4" } From 865c07181124a92e71e7f6c4139e7d429d877e0c Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 14 Mar 2025 13:19:13 +0100 Subject: [PATCH 103/140] newline at the end --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index dfb7a9baf..10231ca7b 100644 --- a/global.json +++ b/global.json @@ -11,4 +11,4 @@ "Microsoft.Build.NoTargets": "3.7.56", "Xamarin.Legacy.Sdk": "0.2.0-alpha4" } -} +} \ No newline at end of file From dff669b92ac3cdad93843c8c9e73655b7648c28d Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 15 Mar 2025 10:10:46 +0100 Subject: [PATCH 104/140] build cmd fixed --- build/ci/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/build-and-test.yml b/build/ci/build-and-test.yml index bd12d6e95..14bb56111 100644 --- a/build/ci/build-and-test.yml +++ b/build/ci/build-and-test.yml @@ -52,7 +52,7 @@ steps: RepositoryType: "git" - pwsh: | - dotnet cake ` + dotnet cake build.cake ` --target=build-android-libraries-net10-net8 ` displayName: 'Build net10' From 05ab01ecca519ab24b1a9b5260814689adc1204f Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 15 Mar 2025 10:10:53 +0100 Subject: [PATCH 105/140] cleanup --- .../Additions/ActivityResultContracts.net100.cs | 12 ------------ .../Additions/ActivityResultContracts.net80.cs | 12 ------------ 2 files changed, 24 deletions(-) delete mode 100644 source/androidx.activity/activity/Additions/ActivityResultContracts.net100.cs delete mode 100644 source/androidx.activity/activity/Additions/ActivityResultContracts.net80.cs diff --git a/source/androidx.activity/activity/Additions/ActivityResultContracts.net100.cs b/source/androidx.activity/activity/Additions/ActivityResultContracts.net100.cs deleted file mode 100644 index 705ef9f6d..000000000 --- a/source/androidx.activity/activity/Additions/ActivityResultContracts.net100.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using Android.Runtime; -using Java.Interop; -using Java.Lang; - -#if NET9_0_OR_GREATER - -namespace AndroidX.Activity.Result.Contract -{ -} - -#endif \ No newline at end of file diff --git a/source/androidx.activity/activity/Additions/ActivityResultContracts.net80.cs b/source/androidx.activity/activity/Additions/ActivityResultContracts.net80.cs deleted file mode 100644 index f1c584ce3..000000000 --- a/source/androidx.activity/activity/Additions/ActivityResultContracts.net80.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using Android.Runtime; -using Java.Interop; -using Java.Lang; - -#if ! NET9_0_OR_GREATER - -namespace AndroidX.Activity.Result.Contract -{ -} - -#endif \ No newline at end of file From a375b30b7ba2af23f24f1243dc786d9b1fb8502f Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 15 Mar 2025 10:37:03 +0100 Subject: [PATCH 106/140] fix for local feed in nuget.config --- build/cake/binderate.cake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/cake/binderate.cake b/build/cake/binderate.cake index b355bdf51..de5773adb 100644 --- a/build/cake/binderate.cake +++ b/build/cake/binderate.cake @@ -7,6 +7,8 @@ Task ("binderate") .IsDependentOn ("javadocs-gps") .Does (() => { + EnsureDirectoryExists("./output"); + var configFile = MakeAbsolute (new FilePath ("./config.json")).FullPath; var basePath = MakeAbsolute (new DirectoryPath ("./")).FullPath; From 23fd3a63129d2f2db4ba1da1282493eb8413a22f Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 15 Mar 2025 11:36:54 +0100 Subject: [PATCH 107/140] Cake.CoreCLR commented out (needed for debugging) --- utilities.cake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utilities.cake b/utilities.cake index c3b6f29cf..cf15e05e0 100644 --- a/utilities.cake +++ b/utilities.cake @@ -1,5 +1,7 @@ -// debugging prerequisity +/* +debugging prerequisity #tool nuget:?package=Cake.CoreCLR +*/ /* dotnet cake spell-check.cake dotnet cake spell-check.cake -t=spell-check From b8a57cf3b67a3fe96ae764dfb92992fa8c631e94 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 15 Mar 2025 12:45:53 +0100 Subject: [PATCH 108/140] whitespace removed --- build/ci/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/build-and-test.yml b/build/ci/build-and-test.yml index 14bb56111..e024973b0 100644 --- a/build/ci/build-and-test.yml +++ b/build/ci/build-and-test.yml @@ -53,7 +53,7 @@ steps: - pwsh: | dotnet cake build.cake ` - --target=build-android-libraries-net10-net8 ` + --target=build-android-libraries-net10-net8 displayName: 'Build net10' - task: DotNetCoreCLI@2 From 073be65e9d9a4aa632419532fcdc1af05a446514 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 15 Mar 2025 13:31:27 +0100 Subject: [PATCH 109/140] dotnet 10.0.100-preview.1.25120.13 fo CI builds --- build/ci/variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/variables.yml b/build/ci/variables.yml index 7a3bcd8e2..9f7ddfe7b 100644 --- a/build/ci/variables.yml +++ b/build/ci/variables.yml @@ -35,7 +35,7 @@ variables: extendedTestAssembly: tests/extended/bin/$(configuration)/net8.0/ExtendedTests.dll # Extended tests compiled binary # dotnet-next test variables - dotnetNextVersion: 9.0.201 # .NET preview version to install + dotnetNextVersion: 10.0.100-preview.1.25120.13 # .NET preview version to install dotnetNextFrameworkVersion: 9 # The number to use for TF (eg: net9.0-android) dotnetNextApiLevel: 35 # The Android SDK API Level to use (eg: -android35.0) From 64f7f703986811bff02b91ac4bc47c29fdcb82a8 Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 16 Mar 2025 18:44:49 +0100 Subject: [PATCH 110/140] CI build - initial commit --- .../build-android-libraries-net10-net8.cake | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index 58c93645d..13a0204a6 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -134,6 +134,16 @@ Task ("build-prepare-dotnet-android") ( () => { + if + ( + BuildSystem.IsRunningOnAzurePipelines + || + BuildSystem.BuildSystem.IsRunningOnGitHubActions + ) + { + RunTarget("prepare-dotnet-android"); + } + content_global_json = """ { @@ -186,6 +196,52 @@ Task ("build-prepare-dotnet-android") } ); +Task ("prepare-dotnet-android") + .Does + ( + () => + { + if (IsRunningOnMacOs) + { + // https://github.com/dotnet/android/blob/main/Documentation/building/unix/dependencies.md + + StartProcess("curl", $"-c \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""); + + StartProcess("brew", $"install automake"); + StartProcess("brew", $"install autoconf"); + StartProcess("brew", $"install cmake"); + StartProcess("brew", $"install libtool"); + StartProcess("brew", $"install p7zip"); + StartProcess("brew", $"install gdk-pixbuf"); + StartProcess("brew", $"install gettext"); + StartProcess("brew", $"install coreutils"); + StartProcess("brew", $"install findutils"); + StartProcess("brew", $"install gnu-tar"); + StartProcess("brew", $"install gnu-sed"); + StartProcess("brew", $"install gawk"); + StartProcess("brew", $"install gnutls"); + StartProcess("brew", $"install gnu-indent"); + StartProcess("brew", $"install gnu-getopt"); + StartProcess("brew", $"install intltool"); + StartProcess("brew", $"install ninja"); + StartProcess("brew", $"install scons"); + StartProcess("brew", $"install wget"); + StartProcess("brew", $"install xz"); + + } + if (IsRunningOnWindows) + { + // https://github.com/dotnet/android/blob/main/Documentation/building/windows/dependencies.md + + /* + StartProcess("winget", $"install -e --id JernejSimoncic.Wget"); + StartProcess("winget", $"install -e --id Ninja-build.Ninja"); + */ + } + + + } + ); Task ("net10-net8-prepare-binderate-build") .Does From 192dea2ea91b92eb8df7de8b009762ef03041488 Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 16 Mar 2025 19:21:35 +0100 Subject: [PATCH 111/140] cake script fixes --- build/cake/build-android-libraries-net10-net8.cake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index 13a0204a6..d7daa3096 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -136,9 +136,9 @@ Task ("build-prepare-dotnet-android") { if ( - BuildSystem.IsRunningOnAzurePipelines + BuildSystem.IsRunningOnAzurePipelines() || - BuildSystem.BuildSystem.IsRunningOnGitHubActions + BuildSystem.BuildSystem.IsRunningOnGitHubActions() ) { RunTarget("prepare-dotnet-android"); @@ -201,7 +201,7 @@ Task ("prepare-dotnet-android") ( () => { - if (IsRunningOnMacOs) + if (IsRunningOnMacOs()) { // https://github.com/dotnet/android/blob/main/Documentation/building/unix/dependencies.md @@ -229,9 +229,10 @@ Task ("prepare-dotnet-android") StartProcess("brew", $"install xz"); } - if (IsRunningOnWindows) + if (IsRunningOnWindows()) { // https://github.com/dotnet/android/blob/main/Documentation/building/windows/dependencies.md + // https://winget.run/search /* StartProcess("winget", $"install -e --id JernejSimoncic.Wget"); From 5cc60d48782eb90026c22f9721f713a7d5948d51 Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 16 Mar 2025 20:14:55 +0100 Subject: [PATCH 112/140] script fixes --- build/cake/build-android-libraries-net10-net8.cake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index d7daa3096..a09451a6a 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -134,16 +134,13 @@ Task ("build-prepare-dotnet-android") ( () => { - if - ( - BuildSystem.IsRunningOnAzurePipelines() - || - BuildSystem.BuildSystem.IsRunningOnGitHubActions() - ) + if ( BuildSystem.IsRunningOnAzurePipelines || BuildSystem.IsRunningOnGitHubActions ) { + Information("IsRunningOnAzurePipelines || IsRunningOnGitHubActions"); RunTarget("prepare-dotnet-android"); } + Information("Local Build"); content_global_json = """ { @@ -203,6 +200,7 @@ Task ("prepare-dotnet-android") { if (IsRunningOnMacOs()) { + Information("IsRunningOnMacOs"); // https://github.com/dotnet/android/blob/main/Documentation/building/unix/dependencies.md StartProcess("curl", $"-c \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""); @@ -231,6 +229,7 @@ Task ("prepare-dotnet-android") } if (IsRunningOnWindows()) { + Information("IsRunningOnWindows"); // https://github.com/dotnet/android/blob/main/Documentation/building/windows/dependencies.md // https://winget.run/search From d0069fd6922eccd682ebc138c76c2be20137b53b Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 16 Mar 2025 22:18:12 +0100 Subject: [PATCH 113/140] Added output to scripts --- build/cake/build-android-libraries-net10-net8.cake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index a09451a6a..674ad9ad5 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -180,11 +180,13 @@ Task ("build-prepare-dotnet-android") return output; }; + Information("make prepare"); ps.Arguments = new ProcessArgumentBuilder().Append("prepare"); StartProcess("make",ps); Information(sb.ToString()); sb.Clear(); + Information("make"); ps.Arguments = new ProcessArgumentBuilder().Append(""); StartProcess("make",ps); From 9804c59f0ae83bef64092346a6e1b87a8a37e6e1 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 17 Mar 2025 08:31:01 +0100 Subject: [PATCH 114/140] step name changed to build-android-libraries-net10-net8 --- build/ci/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/build-and-test.yml b/build/ci/build-and-test.yml index e024973b0..a9b375349 100644 --- a/build/ci/build-and-test.yml +++ b/build/ci/build-and-test.yml @@ -54,7 +54,7 @@ steps: - pwsh: | dotnet cake build.cake ` --target=build-android-libraries-net10-net8 - displayName: 'Build net10' + displayName: 'Build build-android-libraries-net10-net8' - task: DotNetCoreCLI@2 displayName: Run unit tests From e62134221e4ffff0ce4bc2233f63c6a45e2db0c8 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 17 Mar 2025 08:37:50 +0100 Subject: [PATCH 115/140] dotnetNextFrameworkVersion bumped --- build/ci/variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/variables.yml b/build/ci/variables.yml index 9f7ddfe7b..8abbbeb9f 100644 --- a/build/ci/variables.yml +++ b/build/ci/variables.yml @@ -36,7 +36,7 @@ variables: # dotnet-next test variables dotnetNextVersion: 10.0.100-preview.1.25120.13 # .NET preview version to install - dotnetNextFrameworkVersion: 9 # The number to use for TF (eg: net9.0-android) + dotnetNextFrameworkVersion: 10 # The number to use for TF (eg: net9.0-android) dotnetNextApiLevel: 35 # The Android SDK API Level to use (eg: -android35.0) # dnceng-public variables From 5df109a105b04138771753a0011e6d61889d88c0 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 17 Mar 2025 13:05:38 +0100 Subject: [PATCH 116/140] switch to use installed dotnet --- .../build-android-libraries-net10-net8.cake | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index 674ad9ad5..a65b9b404 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -47,6 +47,8 @@ dotnet cake -t:build-android-libraries-net10-net8 ``` */ +bool build_dotnet_android = false; + using System.Threading.Tasks; Task ("build-android-libraries-net10-net8") @@ -60,7 +62,10 @@ Task ("build-android-libraries-net10-net8") // () => RunTarget("net8-prepare-binderate-build") // ); - RunTarget("build-prepare-dotnet-android"); + if (build_dotnet_android) + { + RunTarget("build-prepare-dotnet-android"); + } RunTarget("net8-prepare-binderate-build"); RunTarget("revert-changes-net8"); // RunTarget("net10-prepare-binderate-build"); // not needed - for testing purposes only @@ -86,7 +91,14 @@ Task ("nuget-pack-without-build-net10-net8") ( () => { - dotnet = "../dotnet-android/dotnet-local.sh"; + if (build_dotnet_android) + { + dotnet = "../dotnet-android/dotnet-local.sh"; + } + else + { + dotnet = "dotnet"; + } var projects = GetFiles($"./generated/**/*.csproj"); @@ -250,11 +262,25 @@ Task ("net10-net8-prepare-binderate-build") ( () => { + /* + ../dotnet-android/dotnet-local.sh cake -t=net10-prepare-binderate-build + */ + + if (build_dotnet_android) + { + dotnet = "../dotnet-android/dotnet-local.sh"; + } + else + { + dotnet = "dotnet"; + } + content_global_json = """ { "sdk": { + "version": "10.0.100-preview.1.25120.13", "rollForward": "patch" }, "msbuild-sdks": @@ -268,13 +294,6 @@ Task ("net10-net8-prepare-binderate-build") """; System.IO.File.WriteAllText(path_global_json, content_global_json); - dotnet = "../dotnet-android/dotnet-local.sh"; - - /* - ../dotnet-android/dotnet-local.sh cake -t=net10-prepare-binderate-build - */ - dotnet = "../dotnet-android/dotnet-local.sh"; - Information($"{new string('=', 120)}"); StartProcess(dotnet, "--version"); Parallel.ForEach From b79f43adc53b0df5bca39696c99f008b012bf613 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 18 Mar 2025 15:43:03 +0100 Subject: [PATCH 117/140] further cleanup --- ...le.Crypto.Tink.Shaded.Protobuf.Internal.cs | 43 ---------- .../AutoMLImageLabelerOptions.net80.cs | 85 ------------------- 2 files changed, 128 deletions(-) delete mode 100644 source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.net80.cs diff --git a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs index eefc8f432..deb2d7160 100644 --- a/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs +++ b/source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs @@ -3,56 +3,13 @@ using Android.Runtime; using Java.Interop; -#if ! NET9_0_OR_GREATER namespace Xamarin.Google.Crypto.Tink.Shaded.Protobuf { - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']/class[@name='Internal']" - // [global::Android.Runtime.Register ("com/google/crypto/tink/shaded/protobuf/Internal", DoNotGenerateAcw=true)] public sealed partial class Internal // : global::Java.Lang.Object { - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']/class[@name='Internal.MapAdapter']" - // [global::Android.Runtime.Register ("com/google/crypto/tink/shaded/protobuf/Internal$MapAdapter", DoNotGenerateAcw=true)] - // [global::Java.Interop.JavaTypeParameters (new string [] {"K", "V", "RealValue"})] public partial class MapAdapter // : global::Java.Util.AbstractMap { - - /* - static Delegate? cb_entrySet; -#pragma warning disable 0169 - static Delegate GetEntrySetHandler () - { - if (cb_entrySet == null) - cb_entrySet = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_EntrySet)); - return cb_entrySet; - } - - static IntPtr n_EntrySet (IntPtr jnienv, IntPtr native__this) - { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - return global::Android.Runtime.JavaSet.ToLocalJniHandle (__this.EntrySet ()); - } -#pragma warning restore 0169 - - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']/class[@name='Internal.MapAdapter']/method[@name='entrySet' and count(parameter)=0]" - [Register ("entrySet", "()Ljava/util/Set;", "GetEntrySetHandler")] - public override unsafe global::System.Collections.ICollection? EntrySet () - { - const string __id = "entrySet.()Ljava/util/Set;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return - (System.Collections.ICollection?) // added manually - global::Android.Runtime.JavaSet.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } - } - */ } } } - -#else - - -#endif \ No newline at end of file diff --git a/source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.net80.cs b/source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.net80.cs deleted file mode 100644 index f9d7526fa..000000000 --- a/source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.net80.cs +++ /dev/null @@ -1,85 +0,0 @@ -using System; -using Android.Runtime; -using Java.Interop; - -#if ! NET9_0_OR_GREATER -namespace Xamarin.Google.MLKit.Vision.Label.AutoML -{ - /* - - // Metadata.xml XPath class reference: path="/api/package[@name='com.google.mlkit.vision.label.automl']/class[@name='AutoMLImageLabelerOptions']" - //[global::Android.Runtime.Register("com/google/mlkit/vision/label/automl/AutoMLImageLabelerOptions", DoNotGenerateAcw = true)] - public partial class AutoMLImageLabelerOptions //: global::Xamarin.Google.MLKit.Vision.Label.ImageLabelerOptionsBase - { - static Delegate cb_build; -#pragma warning disable 0169 - static Delegate GetBuildHandler() - { - if (cb_build == null) - cb_build = JNINativeWrapper.CreateDelegate((Func)n_Build); - return cb_build; - } - - static IntPtr n_Build(IntPtr jnienv, IntPtr native__this) - { - global::Xamarin.Google.MLKit.Vision.Label.AutoML.AutoMLImageLabelerOptions.Builder __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle(__this.Build()); - } -#pragma warning restore 0169 - - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.mlkit.vision.label.automl']/class[@name='AutoMLImageLabelerOptions.Builder']/method[@name='build' and count(parameter)=0]" - [Register("build", "()Lcom/google/mlkit/vision/label/ImageLabelerOptionsBase;", "GetBuildHandler")] - public virtual unsafe global::Xamarin.Google.MLKit.Vision.Label.ImageLabelerOptionsBase Build() - { - const string __id = "build.()Lcom/google/mlkit/vision/label/ImageLabelerOptionsBase;"; - try - { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod(__id, this, null); - return global::Java.Lang.Object.GetObject(__rm.Handle, JniHandleOwnership.TransferLocalRef); - } - finally - { - } - } - - - - - - static Delegate cb_setConfidenceThreshold_F; -#pragma warning disable 0169 - static Delegate GetSetConfidenceThreshold_FHandler() - { - if (cb_setConfidenceThreshold_F == null) - cb_setConfidenceThreshold_F = JNINativeWrapper.CreateDelegate((Func)n_SetConfidenceThreshold_F); - return cb_setConfidenceThreshold_F; - } - - static IntPtr n_SetConfidenceThreshold_F(IntPtr jnienv, IntPtr native__this, float p0) - { - global::Xamarin.Google.MLKit.Vision.Label.AutoML.AutoMLImageLabelerOptions.Builder __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle(__this.SetConfidenceThreshold(p0)); - } -#pragma warning restore 0169 - - // Metadata.xml XPath method reference: path="/api/package[@name='com.google.mlkit.vision.label.automl']/class[@name='AutoMLImageLabelerOptions.Builder']/method[@name='setConfidenceThreshold' and count(parameter)=1 and parameter[1][@type='float']]" - [Register("setConfidenceThreshold", "(F)Ljava/lang/Object;", "GetSetConfidenceThreshold_FHandler")] - public virtual unsafe global::Java.Lang.Object SetConfidenceThreshold(float p0) - { - const string __id = "setConfidenceThreshold.(F)Ljava/lang/Object;"; - try - { - JniArgumentValue* __args = stackalloc JniArgumentValue[1]; - __args[0] = new JniArgumentValue(p0); - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod(__id, this, __args); - return global::Java.Lang.Object.GetObject(__rm.Handle, JniHandleOwnership.TransferLocalRef); - } - finally - { - } - } - - } - */ -} -#endif From 35b37c080e801e24e6c1349d0822a0c004068380 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 18 Mar 2025 18:01:21 +0100 Subject: [PATCH 118/140] old version renamed script --- ...-android-libraries-net10-net8.initial.cake | 667 ++++++++++++++++++ 1 file changed, 667 insertions(+) create mode 100644 build/cake/build-android-libraries-net10-net8.initial.cake diff --git a/build/cake/build-android-libraries-net10-net8.initial.cake b/build/cake/build-android-libraries-net10-net8.initial.cake new file mode 100644 index 000000000..6fe1c1b1b --- /dev/null +++ b/build/cake/build-android-libraries-net10-net8.initial.cake @@ -0,0 +1,667 @@ +// Install ZString as a Cake Addin +#addin nuget:?package=ZString&version=2.6.0 + +// Install ZString as a Cake Tool +// #tool nuget:?package=ZString&version=2.6.0 + +/* +Quick test + +```shell + git clean -xdf ; dotnet cake -t=build-android-libraries-net10-net8 +``` + +Step by step tests: + +```shell + git clean -xdf + dotnet cake -t=net8-prepare-binderate-build + dotnet cake -t=revert-changes-net8 + dotnet cake -t=net10-prepare-binderate-build + dotnet cake -t=revert-changes-net10 + dotnet cake -t=net10-net8-prepare-binderate-build + dotnet cake -t=copy-net8-with-net8-to-multi-target + dotnet cake -t=nuget-pack-without-build-net10-net8 + dotnet cake -t=revert-changes-net10-net8 +``` + +Tests from scratch: + +```bash +git clone \ + --branch mu-20241209-net10-removal-of-generator-workarounds \ + https://github.com/dotnet/android-libraries.git \ + al-bash/ +cd al-bash/ +dotnet cake -t:build-android-libraries-net10-net8 +``` + +```pwsh +git clone ` + --branch mu-20241209-net10-removal-of-generator-workarounds ` + https://github.com/dotnet/android-libraries.git ` + al-pwsh/ +cd al-pwsh/ +dotnet cake -t:build-android-libraries-net10-net8 +``` +*/ + +bool build_dotnet_android = false; + +using System.Threading.Tasks; + +Task ("build-android-libraries-net10-net8") + .Does + ( + () => + { + // Parallel.Invoke + // ( + // () => RunTarget("build-prepare-dotnet-android"), + // () => RunTarget("net8-prepare-binderate-build") + // ); + + if (build_dotnet_android) + { + RunTarget("build-prepare-dotnet-android"); + } + RunTarget("net8-prepare-binderate-build"); + RunTarget("revert-changes-net8"); + // RunTarget("net10-prepare-binderate-build"); // not needed - for testing purposes only + // RunTarget("revert-changes-net10"); + RunTarget("net10-net8-prepare-binderate-build"); + RunTarget("copy-net8-with-net8-to-multi-target"); + RunTarget("nuget-pack-without-build-net10-net8"); + RunTarget("revert-changes-net10-net8"); + } + ); + +string dotnet; +string path_global_json = "./global.json"; +string content_global_json; +DeleteDirectorySettings delete_directory_setting = new () + { + Recursive = true, + Force = true + }; + +Task ("nuget-pack-without-build-net10-net8") + .Does + ( + () => + { + if (build_dotnet_android) + { + dotnet = "../dotnet-android/dotnet-local.sh"; + } + else + { + dotnet = "dotnet"; + } + + var projects = GetFiles($"./generated/**/*.csproj"); + + Information($"{new string('=', 120)}"); + string dotnet_pack = "pack" + + " " + + "__PLACEHOLDER_PROJECT__" + + " " + + "--no-build" + + " " + + "--output ./output/nupkgs/" + ; + /* + System has ran out of application memory. + + dotnet(94604) MallocStackLogging: can't turn off malloc stack logging because it was not enabled. + */ + Information($"{new string('=', 120)}"); + Information($" Environment.ProcessorCount = {Environment.ProcessorCount}"); + + Parallel.ForEach + ( + projects, + new ParallelOptions + { + MaxDegreeOfParallelism = (int) Math.Round(0.75 * Environment.ProcessorCount) + }, + (FilePath file) => + { + string dotnet_pack_project = dotnet_pack.Replace + ( + "__PLACEHOLDER_PROJECT__", + file.ToString() + ); + StartProcess(dotnet, dotnet_pack_project); + Information($"{file.ToString()}"); + } + ); + + } + ); + +Task ("build-prepare-dotnet-android") + .Does + ( + () => + { + if ( BuildSystem.IsRunningOnAzurePipelines || BuildSystem.IsRunningOnGitHubActions ) + { + Information("IsRunningOnAzurePipelines || IsRunningOnGitHubActions"); + RunTarget("prepare-dotnet-android"); + } + + Information("Local Build"); + content_global_json = + """ + { + "sdk": + { + "version": "8.0.407", + "rollForward": "patch" + }, + "msbuild-sdks": + { + "MSBuild.Sdk.Extras": "3.0.44", + "Microsoft.Build.Traversal": "4.1.82", + "Microsoft.Build.NoTargets": "3.7.56", + "Xamarin.Legacy.Sdk": "0.2.0-alpha4" + } + } + """; + System.IO.File.WriteAllText(path_global_json, content_global_json); + + string dir = "../dotnet-android/"; + DeleteDirectories(GetDirectories(dir), delete_directory_setting); + + StartProcess("git", $"clone --recursive https://github.com/dotnet/android.git {dir}"); + + ProcessSettings ps = new ProcessSettings + { + WorkingDirectory = dir, + RedirectStandardOutput = true, + RedirectStandardError = true + }; + + Cysharp.Text.Utf16ValueStringBuilder sb = Cysharp.Text.ZString.CreateStringBuilder(); + + ps.RedirectedStandardOutputHandler = (output) => + { + sb.AppendLine(output); + return output; + }; + + Information("make prepare"); + ps.Arguments = new ProcessArgumentBuilder().Append("prepare"); + StartProcess("make",ps); + Information(sb.ToString()); + sb.Clear(); + + Information("make"); + ps.Arguments = new ProcessArgumentBuilder().Append(""); + StartProcess("make",ps); + + ps.Arguments = new ProcessArgumentBuilder().Append("--version"); + StartProcess($"{dir}/dotnet-local.sh", ps); + } + ); + +Task ("prepare-dotnet-android") + .Does + ( + () => + { + if (IsRunningOnMacOs()) + { + Information("IsRunningOnMacOs"); + // https://github.com/dotnet/android/blob/main/Documentation/building/unix/dependencies.md + + StartProcess("curl", $"-c \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""); + + StartProcess("brew", $"install automake"); + StartProcess("brew", $"install autoconf"); + StartProcess("brew", $"install cmake"); + StartProcess("brew", $"install libtool"); + StartProcess("brew", $"install p7zip"); + StartProcess("brew", $"install gdk-pixbuf"); + StartProcess("brew", $"install gettext"); + StartProcess("brew", $"install coreutils"); + StartProcess("brew", $"install findutils"); + StartProcess("brew", $"install gnu-tar"); + StartProcess("brew", $"install gnu-sed"); + StartProcess("brew", $"install gawk"); + StartProcess("brew", $"install gnutls"); + StartProcess("brew", $"install gnu-indent"); + StartProcess("brew", $"install gnu-getopt"); + StartProcess("brew", $"install intltool"); + StartProcess("brew", $"install ninja"); + StartProcess("brew", $"install scons"); + StartProcess("brew", $"install wget"); + StartProcess("brew", $"install xz"); + + } + if (IsRunningOnWindows()) + { + Information("IsRunningOnWindows"); + // https://github.com/dotnet/android/blob/main/Documentation/building/windows/dependencies.md + // https://winget.run/search + + /* + StartProcess("winget", $"install -e --id JernejSimoncic.Wget"); + StartProcess("winget", $"install -e --id Ninja-build.Ninja"); + */ + } + + + } + ); + +Task ("net10-net8-prepare-binderate-build") + .Does + ( + () => + { + /* + ../dotnet-android/dotnet-local.sh cake -t=net10-prepare-binderate-build + */ + + if (build_dotnet_android) + { + dotnet = "../dotnet-android/dotnet-local.sh"; + } + else + { + dotnet = "dotnet"; + } + + content_global_json = + """ + { + "sdk": + { + "version": "10.0.100-preview.1.25120.13", + "rollForward": "patch" + }, + "msbuild-sdks": + { + "MSBuild.Sdk.Extras": "3.0.44", + "Microsoft.Build.Traversal": "4.1.82", + "Microsoft.Build.NoTargets": "3.7.56", + "Xamarin.Legacy.Sdk": "0.2.0-alpha4" + } + } + """; + System.IO.File.WriteAllText(path_global_json, content_global_json); + + Information($"{new string('=', 120)}"); + RunTarget("binderate"); + Parallel.ForEach + ( + files_net10_net8.Keys, + new ParallelOptions + { + MaxDegreeOfParallelism = (int) Math.Round(0.75 * Environment.ProcessorCount) + }, + (string file) => + { + List<(string text_old, string text_new)> replacements = files_net10_net8[file]; + + string content = System.IO.File.ReadAllText(file); + + foreach((string text_old, string text_new) pair in replacements) + { + content = content.Replace(pair.text_old, pair.text_new); + } + + System.IO.File.WriteAllText(file, content); + } + ); + + + StartProcess + ( + dotnet, + "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" + ); + RunTarget("nuget"); + + //git restore pathTo/MyFile + + DeleteDirectories(GetDirectories("generated-net10.0-net8.0"), delete_directory_setting); + DeleteDirectories(GetDirectories("output-net10.0-net8.0"), delete_directory_setting); + MoveDirectory("generated", "generated-net10.0-net8.0"); + MoveDirectory("output", "output-net10.0-net8.0"); + } + ); + +Task ("copy-net8-with-net8-to-multi-target") + .Does + ( + () => + { + string assembly_name_source; + string assembly_name_target; + + var assemblies = GetFiles($"generated-net8.0/**/bin/Release/net8.0-android/*.dll"); + + foreach(var assembly in assemblies) + { + assembly_name_source = System.IO.Path.GetFullPath(assembly.ToString()); + assembly_name_target = System.IO.Path + .GetDirectoryName(assembly_name_source) + .Replace + ( + "generated-net8.0", + "generated-net10.0-net8.0" + ); + DateTime dt_c_source = System.IO.File.GetCreationTime(assembly_name_source); + DateTime dt_a_source = System.IO.File.GetLastAccessTime(assembly_name_source); + DateTime dt_w_source = System.IO.File.GetLastWriteTime(assembly_name_source); + DateTime dt_c_target = System.IO.File.GetCreationTime(assembly_name_target); + DateTime dt_a_target = System.IO.File.GetLastAccessTime(assembly_name_target); + DateTime dt_w_target = System.IO.File.GetLastWriteTime(assembly_name_target); + + Information($"{new string('-', 120)}"); + Information($"source {assembly_name_source}"); + Information($" c: {dt_c_source.ToString("yyyyMMdd-HHmmss")}"); + Information($" w: {dt_w_source.ToString("yyyyMMdd-HHmmss")}"); + Information($" a: {dt_a_source.ToString("yyyyMMdd-HHmmss")}"); + Information($"target {assembly_name_target}"); + Information($" c: {dt_c_target.ToString("yyyyMMdd-HHmmss")}"); + Information($" w: {dt_w_target.ToString("yyyyMMdd-HHmmss")}"); + Information($" a: {dt_a_target.ToString("yyyyMMdd-HHmmss")}"); + + CopyFiles(assembly_name_source, assembly_name_target); + } + + string s = "generated-net10.0-net8.0"; + string t = "generated"; + + Information($"{new string('-', 120)}"); + Information($"copying"); + Information($" source {s}"); + Information($" source {t}"); + CopyDirectory(s, t); + } + ); + + +Task ("revert-changes-net8") + .Does + ( + () => + { + DeleteFile(path_global_json); + } + ); + +Task ("revert-changes-net10") + .Does + ( + () => + { + foreach(string file in files_net10.Keys) + { + StartProcess("git", $"restore {file}"); + } + } + ); + +Task ("revert-changes-net10-net8") + .Does + ( + () => + { + foreach(string file in files_net10_net8.Keys) + { + StartProcess("git", $"restore {file}"); + } + + StartProcess("git", $"restore global.json"); + } + ); + +Task ("net10-prepare-binderate-build") + .Does + ( + () => + { + content_global_json = + """ + { + "sdk": + { + "rollForward": "patch" + }, + "msbuild-sdks": + { + "MSBuild.Sdk.Extras": "3.0.44", + "Microsoft.Build.Traversal": "4.1.82", + "Microsoft.Build.NoTargets": "3.7.56", + "Xamarin.Legacy.Sdk": "0.2.0-alpha4" + } + } + """; + System.IO.File.WriteAllText(path_global_json, content_global_json); + + Parallel.ForEach + ( + files_net10.Keys, + new ParallelOptions + { + MaxDegreeOfParallelism = (int) Math.Round(0.75 * Environment.ProcessorCount) + }, + (string file) => + { + List<(string text_old, string text_new)> replacements = files_net10[file]; + + string content = System.IO.File.ReadAllText(file); + + foreach((string text_old, string text_new) pair in replacements) + { + content = content.Replace(pair.text_old, pair.text_new); + } + + System.IO.File.WriteAllText(file, content); + } + ); + + RunTarget("binderate"); + StartProcess + ( + dotnet, + "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" + ); + RunTarget("nuget"); + + DeleteDirectories(GetDirectories("generated-net10.0"), delete_directory_setting); + DeleteDirectories(GetDirectories("output-net10.0"), delete_directory_setting); + MoveDirectory("generated", "generated-net10.0"); + MoveDirectory("output", "output-net10.0"); + } + ); + +Task ("net8-prepare-binderate-build") + .Does + ( + () => + { + DeleteDirectories(GetDirectories("./output/"), delete_directory_setting); + DeleteDirectories(GetDirectories("./externals/"), delete_directory_setting); + DeleteDirectories(GetDirectories("./generated*/"), delete_directory_setting); + + content_global_json = + """ + { + "sdk": + { + "version": "8.0.407", + "rollForward": "patch" + }, + "msbuild-sdks": + { + "MSBuild.Sdk.Extras": "3.0.44", + "Microsoft.Build.Traversal": "4.1.82", + "Microsoft.Build.NoTargets": "3.7.56", + "Xamarin.Legacy.Sdk": "0.2.0-alpha4" + } + } + """; + System.IO.File.WriteAllText(path_global_json, content_global_json); + + EnsureDirectoryExists("./output"); + + dotnet = "dotnet"; + + Information($"{new string('=', 120)}"); + RunTarget("binderate"); + StartProcess + ( + dotnet, + "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" + ); + RunTarget("nuget"); + + DeleteDirectories(GetDirectories("generated-net8.0"), delete_directory_setting); + DeleteDirectories(GetDirectories("output-net8.0"), delete_directory_setting); + MoveDirectory("generated", "generated-net8.0"); + MoveDirectory("output", "output-net8.0"); + } + ); + +Dictionary> files_net10; +Dictionary> files_net10_net8; + + +files_net10 = new Dictionary> +{ + /* + { + "./global.json", + [ + ( + """ "version": "8.0.404",""", + """ "version": "10.0.100-preview.2.25102.3",""" + ), + ] + }, + */ + { + "./Directory.Build.props", + [ + ( + """<_DefaultTargetFrameworks>net8.0""", + """<_DefaultTargetFrameworks>net10.0""" + ), + ( + """<_DefaultTargetFrameworks>net8.0-android""", + """<_DefaultTargetFrameworks>net10.0-android""" + ), + ( + """""", + """""" + ), + ( + """""", + """""" + ), + ( + """""", + """""" + ), + ] + }, + { + "./tests/Directory.Build.props", + [ + ( + """<_DefaultTargetFrameworks>net8.0-android""", + """<_DefaultTargetFrameworks>net10.0-android""" + ), + ( + """<_DefaultNetTargetFrameworks>net8.0""", + """<_DefaultNetTargetFrameworks>net10.0""" + ), + ] + }, + { + "./source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj", + [ + ( + """1.1.0.3""", + """1.1.0.3$(PackageVersionSuffix)""" + ), + ] + }, +}; + +files_net10_net8 = new Dictionary> +{ + /* + { + "./global.json", + [ + ( + """ "version": "8.0.404",""", + """ "version": "10.0.100-preview.2.25102.3",""" + ), + ] + }, + */ + { + "./Directory.Build.props", + [ + ( + """<_DefaultTargetFrameworks>net8.0-android""", + """<_DefaultTargetFrameworks>net8.0-android;net10.0-android""" + ), + ( + """<_DefaultNetTargetFrameworks>net8.0""", + """<_DefaultNetTargetFrameworks>net8.0;net10.0""" + ), + ( + """""", + """ + + + """ + ), + ( + """""", + """ + + + """ + ), + ( + """""", + """ + + + """ + ), + ] + }, + { + "./tests/Directory.Build.props", + [ + ( + """<_DefaultTargetFrameworks>net8.0-android""", + """<_DefaultTargetFrameworks>net8.0-android;net10.0-android""" + ), + ( + """<_DefaultNetTargetFrameworks>net8.0""", + """<_DefaultNetTargetFrameworks>net8.0;net10.0""" + ), + ] + }, + { + "./source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj", + [ + ( + """1.1.0.3""", + """1.1.0.3$(PackageVersionSuffix)""" + ), + ] + }, +}; From d2d61179be69429743ec38c684312f8bcef1ce22 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 18 Mar 2025 18:02:32 +0100 Subject: [PATCH 119/140] Update build-android-libraries-net10-net8.initial.cake --- ...-android-libraries-net10-net8.initial.cake | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/build/cake/build-android-libraries-net10-net8.initial.cake b/build/cake/build-android-libraries-net10-net8.initial.cake index 6fe1c1b1b..1c93a33c4 100644 --- a/build/cake/build-android-libraries-net10-net8.initial.cake +++ b/build/cake/build-android-libraries-net10-net8.initial.cake @@ -15,6 +15,7 @@ Step by step tests: ```shell git clean -xdf + dotnet cake -t=build-prepare-dotnet-android dotnet cake -t=net8-prepare-binderate-build dotnet cake -t=revert-changes-net8 dotnet cake -t=net10-prepare-binderate-build @@ -294,7 +295,7 @@ Task ("net10-net8-prepare-binderate-build") System.IO.File.WriteAllText(path_global_json, content_global_json); Information($"{new string('=', 120)}"); - RunTarget("binderate"); + StartProcess(dotnet, "--version"); Parallel.ForEach ( files_net10_net8.Keys, @@ -317,13 +318,22 @@ Task ("net10-net8-prepare-binderate-build") } ); + StartProcess(dotnet, "cake -t=binderate"); + StartProcess + ( + dotnet, + "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" + ); + StartProcess(dotnet, "cake -t=nuget"); + Information($"{new string('=', 120)}"); + StartProcess(dotnet, "--version"); StartProcess ( dotnet, "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" ); - RunTarget("nuget"); + StartProcess(dotnet, "cake -t=nuget"); //git restore pathTo/MyFile @@ -444,6 +454,13 @@ Task ("net10-prepare-binderate-build") """; System.IO.File.WriteAllText(path_global_json, content_global_json); + /* + ../dotnet-android/dotnet-local.sh cake -t=net10-prepare-binderate-build + */ + dotnet = "../dotnet-android/dotnet-local.sh"; + + Information($"{new string('=', 120)}"); + StartProcess(dotnet, "--version"); Parallel.ForEach ( files_net10.Keys, @@ -466,13 +483,13 @@ Task ("net10-prepare-binderate-build") } ); - RunTarget("binderate"); + StartProcess(dotnet, "cake -t=binderate"); StartProcess ( dotnet, "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" ); - RunTarget("nuget"); + StartProcess(dotnet, "cake -t=nuget"); DeleteDirectories(GetDirectories("generated-net10.0"), delete_directory_setting); DeleteDirectories(GetDirectories("output-net10.0"), delete_directory_setting); @@ -514,13 +531,14 @@ Task ("net8-prepare-binderate-build") dotnet = "dotnet"; Information($"{new string('=', 120)}"); - RunTarget("binderate"); + StartProcess(dotnet, "--version"); + StartProcess(dotnet, "cake -t=binderate"); StartProcess ( dotnet, "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" ); - RunTarget("nuget"); + StartProcess(dotnet, "cake -t=nuget"); DeleteDirectories(GetDirectories("generated-net8.0"), delete_directory_setting); DeleteDirectories(GetDirectories("output-net8.0"), delete_directory_setting); @@ -664,4 +682,4 @@ files_net10_net8 = new Dictionary Date: Tue, 18 Mar 2025 18:02:38 +0100 Subject: [PATCH 120/140] Update build-android-libraries-net10-net8.cake --- .../build-android-libraries-net10-net8.cake | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index a65b9b404..6fe1c1b1b 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -15,7 +15,6 @@ Step by step tests: ```shell git clean -xdf - dotnet cake -t=build-prepare-dotnet-android dotnet cake -t=net8-prepare-binderate-build dotnet cake -t=revert-changes-net8 dotnet cake -t=net10-prepare-binderate-build @@ -295,7 +294,7 @@ Task ("net10-net8-prepare-binderate-build") System.IO.File.WriteAllText(path_global_json, content_global_json); Information($"{new string('=', 120)}"); - StartProcess(dotnet, "--version"); + RunTarget("binderate"); Parallel.ForEach ( files_net10_net8.Keys, @@ -318,22 +317,13 @@ Task ("net10-net8-prepare-binderate-build") } ); - StartProcess(dotnet, "cake -t=binderate"); - StartProcess - ( - dotnet, - "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" - ); - StartProcess(dotnet, "cake -t=nuget"); - Information($"{new string('=', 120)}"); - StartProcess(dotnet, "--version"); StartProcess ( dotnet, "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" ); - StartProcess(dotnet, "cake -t=nuget"); + RunTarget("nuget"); //git restore pathTo/MyFile @@ -454,13 +444,6 @@ Task ("net10-prepare-binderate-build") """; System.IO.File.WriteAllText(path_global_json, content_global_json); - /* - ../dotnet-android/dotnet-local.sh cake -t=net10-prepare-binderate-build - */ - dotnet = "../dotnet-android/dotnet-local.sh"; - - Information($"{new string('=', 120)}"); - StartProcess(dotnet, "--version"); Parallel.ForEach ( files_net10.Keys, @@ -483,13 +466,13 @@ Task ("net10-prepare-binderate-build") } ); - StartProcess(dotnet, "cake -t=binderate"); + RunTarget("binderate"); StartProcess ( dotnet, "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" ); - StartProcess(dotnet, "cake -t=nuget"); + RunTarget("nuget"); DeleteDirectories(GetDirectories("generated-net10.0"), delete_directory_setting); DeleteDirectories(GetDirectories("output-net10.0"), delete_directory_setting); @@ -531,14 +514,13 @@ Task ("net8-prepare-binderate-build") dotnet = "dotnet"; Information($"{new string('=', 120)}"); - StartProcess(dotnet, "--version"); - StartProcess(dotnet, "cake -t=binderate"); + RunTarget("binderate"); StartProcess ( dotnet, "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" ); - StartProcess(dotnet, "cake -t=nuget"); + RunTarget("nuget"); DeleteDirectories(GetDirectories("generated-net8.0"), delete_directory_setting); DeleteDirectories(GetDirectories("output-net8.0"), delete_directory_setting); From 67bb7eb66c8f89a0f4b9a94f07a83880db22cf4a Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 18 Mar 2025 19:46:08 +0100 Subject: [PATCH 121/140] fix for net10-prepare-binderate-build --- build/cake/build-android-libraries-net10-net8.cake | 1 + 1 file changed, 1 insertion(+) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index 6fe1c1b1b..18053e548 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -431,6 +431,7 @@ Task ("net10-prepare-binderate-build") { "sdk": { + "version": "10.0.100-preview.1.25120.13", "rollForward": "patch" }, "msbuild-sdks": From d0e40316e3700af653764a45e2fbed31bd24fa67 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 19 Mar 2025 08:42:12 +0100 Subject: [PATCH 122/140] script improvements --- build/cake/build-android-libraries-net10-net8.cake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index 18053e548..2270de154 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -445,6 +445,7 @@ Task ("net10-prepare-binderate-build") """; System.IO.File.WriteAllText(path_global_json, content_global_json); + Information("Change files"); Parallel.ForEach ( files_net10.Keys, @@ -467,6 +468,7 @@ Task ("net10-prepare-binderate-build") } ); + Information("binderate"); RunTarget("binderate"); StartProcess ( From 56c6f60a561d2f7e0b3670584270243b2bf3f10c Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 19 Mar 2025 08:42:20 +0100 Subject: [PATCH 123/140] nuget bumps --- utilities.cake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities.cake b/utilities.cake index cf15e05e0..698f95c47 100644 --- a/utilities.cake +++ b/utilities.cake @@ -6,10 +6,10 @@ debugging prerequisity dotnet cake spell-check.cake dotnet cake spell-check.cake -t=spell-check */ -#addin nuget:?package=WeCantSpell.Hunspell&version=5.0.0 +#addin nuget:?package=WeCantSpell.Hunspell&version=6.0.0 #addin nuget:?package=Newtonsoft.Json&version=13.0.3 #addin nuget:?package=Cake.FileHelpers&version=7.0.0 -#addin nuget:?package=Mono.Cecil&version=0.11.5 +#addin nuget:?package=Mono.Cecil&version=0.11.6 #addin nuget:?package=HolisticWare.Xamarin.Tools.ComponentGovernance&version=0.0.1.4 #addin nuget:?package=HolisticWare.Core.Net.HTTP&version=0.0.4 From 974527b9534ceacc8e8551eb7f627530c105de6a Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 19 Mar 2025 12:41:09 +0100 Subject: [PATCH 124/140] Update build-android-libraries-net10-net8.cake --- .../build-android-libraries-net10-net8.cake | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index 2270de154..85cfe96e3 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -67,12 +67,12 @@ Task ("build-android-libraries-net10-net8") } RunTarget("net8-prepare-binderate-build"); RunTarget("revert-changes-net8"); - // RunTarget("net10-prepare-binderate-build"); // not needed - for testing purposes only - // RunTarget("revert-changes-net10"); - RunTarget("net10-net8-prepare-binderate-build"); - RunTarget("copy-net8-with-net8-to-multi-target"); - RunTarget("nuget-pack-without-build-net10-net8"); - RunTarget("revert-changes-net10-net8"); + RunTarget("net10-prepare-binderate-build"); // not needed - for testing purposes only + RunTarget("revert-changes-net10"); + // RunTarget("net10-net8-prepare-binderate-build"); + // RunTarget("copy-net8-with-net8-to-multi-target"); + // RunTarget("nuget-pack-without-build-net10-net8"); + // RunTarget("revert-changes-net10-net8"); } ); @@ -279,7 +279,7 @@ Task ("net10-net8-prepare-binderate-build") { "sdk": { - "version": "10.0.100-preview.1.25120.13", + "version": "10.0.100-preview.2.25164.34", "rollForward": "patch" }, "msbuild-sdks": @@ -404,6 +404,8 @@ Task ("revert-changes-net10") { StartProcess("git", $"restore {file}"); } + + StartProcess("git", $"restore global.json"); } ); @@ -426,12 +428,21 @@ Task ("net10-prepare-binderate-build") ( () => { + if (build_dotnet_android) + { + dotnet = "../dotnet-android/dotnet-local.sh"; + } + else + { + dotnet = "dotnet"; + } + content_global_json = """ { "sdk": { - "version": "10.0.100-preview.1.25120.13", + "version": "10.0.100-preview.2.25164.34", "rollForward": "patch" }, "msbuild-sdks": @@ -475,6 +486,7 @@ Task ("net10-prepare-binderate-build") dotnet, "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" ); + Information("binderate"); RunTarget("nuget"); DeleteDirectories(GetDirectories("generated-net10.0"), delete_directory_setting); From 77656227418e953f1e3791b49276d9cdabbcb1aa Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 20 Mar 2025 12:37:37 +0100 Subject: [PATCH 125/140] nuget-install.cake --- build.cake | 5 +++++ build/cake/nuget-install.cake | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 build/cake/nuget-install.cake diff --git a/build.cake b/build.cake index 25440645d..881e7c809 100755 --- a/build.cake +++ b/build.cake @@ -7,6 +7,7 @@ #addin nuget:?package=SharpZipLib&version=1.4.2 // Imported scripts +#load "build/cake/nuget-install.cake" #load "build/cake/setup-environment.cake" #load "build/cake/update-config.cake" #load "build/cake/tests.cake" @@ -75,4 +76,8 @@ if (FileExists ("./generated/AndroidX.sln")) { .IsDependentOn ("nuget"); } +NuGetInstall("SQLitePCLRaw.core", new NuGetInstallSettings { + ExcludeVersion = true, + OutputDirectory = "./tools" + }); RunTarget (TARGET); diff --git a/build/cake/nuget-install.cake b/build/cake/nuget-install.cake new file mode 100644 index 000000000..2e7d31149 --- /dev/null +++ b/build/cake/nuget-install.cake @@ -0,0 +1,16 @@ +/* +Nuget download + +https://www.nuget.org/api/v2/package/{packageID}/ + +https://www.nuget.org/api/v2/package/cake.coreclr/1.3.0/ +*/ + +Task("nuget-install") + .Does + ( + () => + { + DownloadNugetPackage("cake.coreclr", "1.3.0"); + } + ); From f1e7cb16f24fbe93ce33b8eb74e0ccc02dcd6e03 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 21 Mar 2025 12:20:27 +0100 Subject: [PATCH 126/140] indirect nuget installation --- build.cake | 6 +-- build/cake/binderate.cake | 2 +- build/cake/build-and-package.cake | 6 +++ build/cake/nuget-install.cake | 85 +++++++++++++++++++++++++++++-- utilities.cake | 18 +++++-- 5 files changed, 103 insertions(+), 14 deletions(-) diff --git a/build.cake b/build.cake index 881e7c809..f3b82f5b9 100755 --- a/build.cake +++ b/build.cake @@ -45,6 +45,8 @@ Information ($"BUILD_COMMIT : {BUILD_COMMIT}"); Information ($"BUILD_NUMBER : {BUILD_NUMBER}"); Information ($"BUILD_TIMESTAMP : {BUILD_TIMESTAMP}"); +RunTarget("nuget-install"); + Task ("packages") .IsDependentOn ("binderate") .IsDependentOn ("nuget"); @@ -76,8 +78,4 @@ if (FileExists ("./generated/AndroidX.sln")) { .IsDependentOn ("nuget"); } -NuGetInstall("SQLitePCLRaw.core", new NuGetInstallSettings { - ExcludeVersion = true, - OutputDirectory = "./tools" - }); RunTarget (TARGET); diff --git a/build/cake/binderate.cake b/build/cake/binderate.cake index de5773adb..28ec0a757 100644 --- a/build/cake/binderate.cake +++ b/build/cake/binderate.cake @@ -8,7 +8,7 @@ Task ("binderate") .Does (() => { EnsureDirectoryExists("./output"); - + var configFile = MakeAbsolute (new FilePath ("./config.json")).FullPath; var basePath = MakeAbsolute (new DirectoryPath ("./")).FullPath; diff --git a/build/cake/build-and-package.cake b/build/cake/build-and-package.cake index 624fdc2b0..2d67a9bd2 100644 --- a/build/cake/build-and-package.cake +++ b/build/cake/build-and-package.cake @@ -18,6 +18,12 @@ Task ("nuget") "./generated/AndroidX.sln", new DotNetBuildSettings { MSBuildSettings = settings } ); + + // validation fails on CI if the package is in the output directory + DeleteFile ($"./output/cliwrap.3.8.2.nupkg"); + DeleteFile ($"./output/holisticware.core.net.http.0.0.4.nupkg"); + DeleteFile ($"./output/holisticware.core.io.0.0.4.nupkg"); + DeleteFile ($"./output/holisticware.xamarin.tools.componentgovernance.0.0.1.4.nupkg"); }); Task ("nuget-pack-without-build") diff --git a/build/cake/nuget-install.cake b/build/cake/nuget-install.cake index 2e7d31149..39818d995 100644 --- a/build/cake/nuget-install.cake +++ b/build/cake/nuget-install.cake @@ -1,16 +1,93 @@ /* Nuget download - https://www.nuget.org/api/v2/package/{packageID}/ - +https://api.nuget.org/v3/index.json?package=CliWrap&version=3.8.2 +https://api.nuget.org/v3-flatcontainer/cliwrap/3.8.2/cliwrap.3.8.2.nupkg + }, https://www.nuget.org/api/v2/package/cake.coreclr/1.3.0/ */ +/* +#addin nuget:https://api.nuget.org/v3/index.json?package=Mono.Cecil&version=0.11.6 +#addin nuget:https://api.nuget.org/v3/index.json??package=HolisticWare.Xamarin.Tools.ComponentGovernance&version=0.0.1.4 +#addin nuget:https://api.nuget.org/v3/index.json??package=HolisticWare.Core.Net.HTTP&version=0.0.4 +#addin nuget:https://api.nuget.org/v3/index.json??package=HolisticWare.Core.IO&version=0.0.4 +*/ + +Dictionary nuget_packages = new () +{ + // { "cake.coreclr", "1.3.0" } + { "HolisticWare.Xamarin.Tools.ComponentGovernance", "0.0.1.4" }, + { "HolisticWare.Core.Net.HTTP", "0.0.4" }, + { "HolisticWare.Core.IO", "0.0.4" }, +}; Task("nuget-install") .Does ( () => { - DownloadNugetPackage("cake.coreclr", "1.3.0"); + EnsureDirectoryExists("./output"); + + /* + nuget.exe must be in the PATH + NuGetInstall + ( + "HolisticWare.Xamarin.Tools.ComponentGovernance", + new NuGetInstallSettings + { + Version = "0.0.1.4", + OutputDirectory = "./tools/Addins" + } + ); + NuGetInstall + ( + "HolisticWare.Core.Net.HTTP", + new NuGetInstallSettings + { + Version = "0.0.4", + OutputDirectory = "./tools/Addins" + } + ); + NuGetInstall + ( + "HolisticWare.Core.IO", + new NuGetInstallSettings + { + Version = "0.0.4", + OutputDirectory = "./tools/Addins" + } + ); + NuGetInstall + ( + "CliWrap", + new NuGetInstallSettings + { + Version = "3.8.2", + OutputDirectory = "./tools/Addins" + } + ); + */ + DownloadFile + ( + "https://api.nuget.org/v3-flatcontainer/cliwrap/3.8.2/cliwrap.3.8.2.nupkg", + $"./output/cliwrap.3.8.2.nupkg" + ); + DownloadFile + ( + "https://api.nuget.org/v3-flatcontainer/holisticware.core.net.http/0.0.4/holisticware.core.net.http.0.0.4.nupkg", + $"./output/holisticware.core.net.http.0.0.4.nupkg" + ); + DownloadFile + ( + "https://api.nuget.org/v3-flatcontainer/holisticware.core.io/0.0.4/holisticware.core.io.0.0.4.nupkg", + $"./output/holisticware.core.io.0.0.4.nupkg" + ); + DownloadFile + ( + "https://api.nuget.org/v3-flatcontainer/holisticware.xamarin.tools.componentgovernance/0.0.1.4/holisticware.xamarin.tools.componentgovernance.0.0.1.4.nupkg", + $"./output/holisticware.xamarin.tools.componentgovernance.0.0.1.4.nupkg" + ); + /* + */ } - ); + ); \ No newline at end of file diff --git a/utilities.cake b/utilities.cake index 698f95c47..d1ceb88c2 100644 --- a/utilities.cake +++ b/utilities.cake @@ -9,11 +9,19 @@ debugging prerequisity #addin nuget:?package=WeCantSpell.Hunspell&version=6.0.0 #addin nuget:?package=Newtonsoft.Json&version=13.0.3 #addin nuget:?package=Cake.FileHelpers&version=7.0.0 -#addin nuget:?package=Mono.Cecil&version=0.11.6 +#addin nuget:?package=Mono.Cecil&version=0.11.6 #addin nuget:?package=HolisticWare.Xamarin.Tools.ComponentGovernance&version=0.0.1.4 #addin nuget:?package=HolisticWare.Core.Net.HTTP&version=0.0.4 #addin nuget:?package=HolisticWare.Core.IO&version=0.0.4 +#addin nuget:?package=CliWrap&version=3.8.2 + +/* +#addin nuget:https://api.nuget.org/v3/index.json?package=Mono.Cecil&version=0.11.6 +#addin nuget:https://api.nuget.org/v3/index.json??package=HolisticWare.Xamarin.Tools.ComponentGovernance&version=0.0.1.4 +#addin nuget:https://api.nuget.org/v3/index.json??package=HolisticWare.Core.Net.HTTP&version=0.0.4 +#addin nuget:https://api.nuget.org/v3/index.json??package=HolisticWare.Core.IO&version=0.0.4 +*/ #load "build/cake/performance-timings.cake" @@ -33,8 +41,8 @@ string file_spell_errors = "./output/spell-errors.txt"; List spell_errors = null; JArray binderator_json_array = null; -List<(string, string, string, string)> mappings_artifact_nuget = new List<(string, string, string, string)>(); -Dictionary Licenses = new Dictionary(); +List<(string, string, string, string)> mappings_artifact_nuget = new (); +Dictionary Licenses = new (); // modifying default method for licenses Manifest.Defaults.VersionBasedOnFullyQualifiedArtifactIdDelegate = delegate(string fully_qualified_artifact_id) @@ -445,7 +453,7 @@ Task ("spell-check") var dictionary = WeCantSpell.Hunspell.WordList.CreateFromFiles(@"externals/English (American).dic"); string[] words = - [ + { "Xamarin", "AndroidX", "IdentifierCommon", @@ -819,7 +827,7 @@ Task ("spell-check") "RecaptchaBase", "Json", "ViewTree", - ]; + }; var dictionary_custom = WeCantSpell.Hunspell.WordList.CreateFromWords(words); From 010e23ad854804564a218a2fceaae85ddcd6265f Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 21 Mar 2025 15:05:32 +0100 Subject: [PATCH 127/140] nuget install/uninstal traget added --- build/cake/build-and-package.cake | 7 ++---- .../build-android-libraries-net10-net8.cake | 23 +++++++++++++++---- build/cake/nuget-install.cake | 13 +++++++++++ 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/build/cake/build-and-package.cake b/build/cake/build-and-package.cake index 2d67a9bd2..f8958c45e 100644 --- a/build/cake/build-and-package.cake +++ b/build/cake/build-and-package.cake @@ -19,11 +19,8 @@ Task ("nuget") new DotNetBuildSettings { MSBuildSettings = settings } ); - // validation fails on CI if the package is in the output directory - DeleteFile ($"./output/cliwrap.3.8.2.nupkg"); - DeleteFile ($"./output/holisticware.core.net.http.0.0.4.nupkg"); - DeleteFile ($"./output/holisticware.core.io.0.0.4.nupkg"); - DeleteFile ($"./output/holisticware.xamarin.tools.componentgovernance.0.0.1.4.nupkg"); + RunTarget("nuget-uninstall"); + }); Task ("nuget-pack-without-build") diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index 85cfe96e3..e605982dc 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -69,10 +69,10 @@ Task ("build-android-libraries-net10-net8") RunTarget("revert-changes-net8"); RunTarget("net10-prepare-binderate-build"); // not needed - for testing purposes only RunTarget("revert-changes-net10"); - // RunTarget("net10-net8-prepare-binderate-build"); - // RunTarget("copy-net8-with-net8-to-multi-target"); - // RunTarget("nuget-pack-without-build-net10-net8"); - // RunTarget("revert-changes-net10-net8"); + RunTarget("net10-net8-prepare-binderate-build"); + RunTarget("copy-net8-with-net8-to-multi-target"); + RunTarget("nuget-pack-without-build-net10-net8"); + RunTarget("revert-changes-net10-net8"); } ); @@ -90,6 +90,8 @@ Task ("nuget-pack-without-build-net10-net8") ( () => { + RunTarget("nuget-install"); + if (build_dotnet_android) { dotnet = "../dotnet-android/dotnet-local.sh"; @@ -137,6 +139,7 @@ Task ("nuget-pack-without-build-net10-net8") } ); + RunTarget("nuget-uninstall"); } ); @@ -261,6 +264,8 @@ Task ("net10-net8-prepare-binderate-build") ( () => { + RunTarget("nuget-install"); + /* ../dotnet-android/dotnet-local.sh cake -t=net10-prepare-binderate-build */ @@ -325,6 +330,8 @@ Task ("net10-net8-prepare-binderate-build") ); RunTarget("nuget"); + RunTarget("nuget-uninstall"); + //git restore pathTo/MyFile DeleteDirectories(GetDirectories("generated-net10.0-net8.0"), delete_directory_setting); @@ -428,6 +435,8 @@ Task ("net10-prepare-binderate-build") ( () => { + RunTarget("nuget-install"); + if (build_dotnet_android) { dotnet = "../dotnet-android/dotnet-local.sh"; @@ -489,6 +498,8 @@ Task ("net10-prepare-binderate-build") Information("binderate"); RunTarget("nuget"); + RunTarget("nuget-uninstall"); + DeleteDirectories(GetDirectories("generated-net10.0"), delete_directory_setting); DeleteDirectories(GetDirectories("output-net10.0"), delete_directory_setting); MoveDirectory("generated", "generated-net10.0"); @@ -505,6 +516,8 @@ Task ("net8-prepare-binderate-build") DeleteDirectories(GetDirectories("./externals/"), delete_directory_setting); DeleteDirectories(GetDirectories("./generated*/"), delete_directory_setting); + RunTarget("nuget-install"); + content_global_json = """ { @@ -537,6 +550,8 @@ Task ("net8-prepare-binderate-build") ); RunTarget("nuget"); + RunTarget("nuget-uninstall"); + DeleteDirectories(GetDirectories("generated-net8.0"), delete_directory_setting); DeleteDirectories(GetDirectories("output-net8.0"), delete_directory_setting); MoveDirectory("generated", "generated-net8.0"); diff --git a/build/cake/nuget-install.cake b/build/cake/nuget-install.cake index 39818d995..ccbc5e2dd 100644 --- a/build/cake/nuget-install.cake +++ b/build/cake/nuget-install.cake @@ -90,4 +90,17 @@ Task("nuget-install") /* */ } + ); + +Task("nuget-uninstall") + .Does + ( + () => + { + // validation fails on CI if the package is in the output directory + DeleteFile ($"./output/cliwrap.3.8.2.nupkg"); + DeleteFile ($"./output/holisticware.core.net.http.0.0.4.nupkg"); + DeleteFile ($"./output/holisticware.core.io.0.0.4.nupkg"); + DeleteFile ($"./output/holisticware.xamarin.tools.componentgovernance.0.0.1.4.nupkg"); + } ); \ No newline at end of file From 528cede2a78137300d512688cee205d0b412cec3 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 21 Mar 2025 19:56:10 +0100 Subject: [PATCH 128/140] nuget extras install/uninstll fixes --- build/cake/nuget-install.cake | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/build/cake/nuget-install.cake b/build/cake/nuget-install.cake index ccbc5e2dd..125a0e0e6 100644 --- a/build/cake/nuget-install.cake +++ b/build/cake/nuget-install.cake @@ -97,10 +97,30 @@ Task("nuget-uninstall") ( () => { + string file; // validation fails on CI if the package is in the output directory - DeleteFile ($"./output/cliwrap.3.8.2.nupkg"); - DeleteFile ($"./output/holisticware.core.net.http.0.0.4.nupkg"); - DeleteFile ($"./output/holisticware.core.io.0.0.4.nupkg"); - DeleteFile ($"./output/holisticware.xamarin.tools.componentgovernance.0.0.1.4.nupkg"); + + file = $"./output/cliwrap.3.8.2.nupkg"; + if (FileExists (file)) + { + DeleteFile (file); + } + file = $"./output/holisticware.core.net.http.0.0.4.nupkg"; + if (FileExists (file)) + { + DeleteFile (file); + } + + file = $"./output/holisticware.core.io.0.0.4.nupkg"; + if (FileExists (file)) + { + DeleteFile (file); + } + + file = $"./output/holisticware.xamarin.tools.componentgovernance.0.0.1.4.nupkg"; + if (FileExists (file)) + { + DeleteFile (file); + } } ); \ No newline at end of file From a661191c82ba04ef5a952c808efcc7bbdd510525 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 22 Mar 2025 09:53:06 +0100 Subject: [PATCH 129/140] switched steps for unit tests and AL builds for net10 --- build/ci/build-and-test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/ci/build-and-test.yml b/build/ci/build-and-test.yml index a9b375349..57bc2bec2 100644 --- a/build/ci/build-and-test.yml +++ b/build/ci/build-and-test.yml @@ -51,11 +51,6 @@ steps: RepositoryUrl: $(Build.Repository.Uri) RepositoryType: "git" - - pwsh: | - dotnet cake build.cake ` - --target=build-android-libraries-net10-net8 - displayName: 'Build build-android-libraries-net10-net8' - - task: DotNetCoreCLI@2 displayName: Run unit tests condition: ne(variables['skipUnitTests'], 'true') @@ -63,3 +58,8 @@ steps: command: test projects: util/**/*.Tests.csproj arguments: '-c $(configuration)' + + - pwsh: | + dotnet cake build.cake ` + --target=build-android-libraries-net10-net8 + displayName: 'Build build-android-libraries-net10-net8' From b2fca9bab6e122e650675667eefb3d865c290227 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 22 Mar 2025 09:53:24 +0100 Subject: [PATCH 130/140] 10.0.100-preview.2.25164.34 --- build/ci/variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/variables.yml b/build/ci/variables.yml index 8abbbeb9f..e9797ae89 100644 --- a/build/ci/variables.yml +++ b/build/ci/variables.yml @@ -35,7 +35,7 @@ variables: extendedTestAssembly: tests/extended/bin/$(configuration)/net8.0/ExtendedTests.dll # Extended tests compiled binary # dotnet-next test variables - dotnetNextVersion: 10.0.100-preview.1.25120.13 # .NET preview version to install + dotnetNextVersion: 10.0.100-preview.2.25164.34 # .NET preview version to install dotnetNextFrameworkVersion: 10 # The number to use for TF (eg: net9.0-android) dotnetNextApiLevel: 35 # The Android SDK API Level to use (eg: -android35.0) From 2a57016a32802cff4afe8d5ce8c96a4d15faffcf Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 23 Mar 2025 10:32:59 +0100 Subject: [PATCH 131/140] install dotnetNextVersion --- build/ci/setup-environment.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/ci/setup-environment.yml b/build/ci/setup-environment.yml index c0c765413..c097f305c 100644 --- a/build/ci/setup-environment.yml +++ b/build/ci/setup-environment.yml @@ -15,6 +15,13 @@ steps: includePreviewVersions: true condition: ne('$(dotnetVersion)', '') + - task: UseDotNet@2 + displayName: 'Use dotnet $(dotnetNextVersion)' + inputs: + version: $(dotnetNextVersion) + performMultiLevelLookup: true + includePreviewVersions: true + - ${{ if eq(parameters.runDotnetNextTest, true) }}: - task: UseDotNet@2 displayName: 'Use dotnet $(dotnetNextVersion)' From 17e7c01824f9e93f8d1565021b4fae43744677ef Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 23 Mar 2025 21:40:28 +0100 Subject: [PATCH 132/140] workloads added: android android-net8 --- build/ci/setup-environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/ci/setup-environment.yml b/build/ci/setup-environment.yml index c097f305c..e81d7990a 100644 --- a/build/ci/setup-environment.yml +++ b/build/ci/setup-environment.yml @@ -45,7 +45,7 @@ steps: - ${{ if eq(parameters.runDotnetNextTest, false) }}: - pwsh: | - dotnet workload install maui --verbosity diag --from-rollback-file $(dotnetWorkloadRollbackFile) --source $(dotnetWorkloadSource) --source $(dotnetNuGetOrgSource) + dotnet workload install maui android android-net8 --verbosity diag --from-rollback-file $(dotnetWorkloadRollbackFile) --source $(dotnetWorkloadSource) --source $(dotnetNuGetOrgSource) if ($LASTEXITCODE -ne 0) { Write-Host "##vso[task.logissue type=error]Failed to install workloads." Write-Host "##vso[task.complete result=Failed;]" @@ -55,7 +55,7 @@ steps: - ${{ if eq(parameters.runDotnetNextTest, true) }}: - pwsh: | - dotnet workload install maui --verbosity diag + dotnet workload install maui android android-net8 --verbosity diag if ($LASTEXITCODE -ne 0) { Write-Host "##vso[task.logissue type=error]Failed to install workloads." Write-Host "##vso[task.complete result=Failed;]" From 3b61c51a9cec647236bf6d3a06dac664c498972a Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 23 Mar 2025 22:44:56 +0100 Subject: [PATCH 133/140] Revert "workloads added: android android-net8" This reverts commit 17e7c01824f9e93f8d1565021b4fae43744677ef. --- build/ci/setup-environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/ci/setup-environment.yml b/build/ci/setup-environment.yml index e81d7990a..c097f305c 100644 --- a/build/ci/setup-environment.yml +++ b/build/ci/setup-environment.yml @@ -45,7 +45,7 @@ steps: - ${{ if eq(parameters.runDotnetNextTest, false) }}: - pwsh: | - dotnet workload install maui android android-net8 --verbosity diag --from-rollback-file $(dotnetWorkloadRollbackFile) --source $(dotnetWorkloadSource) --source $(dotnetNuGetOrgSource) + dotnet workload install maui --verbosity diag --from-rollback-file $(dotnetWorkloadRollbackFile) --source $(dotnetWorkloadSource) --source $(dotnetNuGetOrgSource) if ($LASTEXITCODE -ne 0) { Write-Host "##vso[task.logissue type=error]Failed to install workloads." Write-Host "##vso[task.complete result=Failed;]" @@ -55,7 +55,7 @@ steps: - ${{ if eq(parameters.runDotnetNextTest, true) }}: - pwsh: | - dotnet workload install maui android android-net8 --verbosity diag + dotnet workload install maui --verbosity diag if ($LASTEXITCODE -ne 0) { Write-Host "##vso[task.logissue type=error]Failed to install workloads." Write-Host "##vso[task.complete result=Failed;]" From 4ae83fe559ac93313f47045ea897ee669db247ca Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 25 Mar 2025 12:24:04 +0100 Subject: [PATCH 134/140] switch back to new approach for testing --- build.cake | 1 + 1 file changed, 1 insertion(+) diff --git a/build.cake b/build.cake index f3b82f5b9..e3e72ebe1 100755 --- a/build.cake +++ b/build.cake @@ -20,6 +20,7 @@ #load "build/cake/clean.cake" #load "build/cake/performance-timings.cake" #load "build/cake/build-android-libraries-net10-net8.cake" +//#load "build/cake/build-android-libraries-net10-net8.initial.cake" using System.Xml.Linq; using Newtonsoft.Json; From aaf2ace59c057b4819f6317303108bbe11df4c92 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 25 Mar 2025 12:24:51 +0100 Subject: [PATCH 135/140] refactoring + saving main build files --- .../build-android-libraries-net10-net8.cake | 498 +++++++++++------- 1 file changed, 297 insertions(+), 201 deletions(-) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index e605982dc..6321657c5 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -90,6 +90,9 @@ Task ("nuget-pack-without-build-net10-net8") ( () => { + DeleteDirectories(GetDirectories("./externals/"), delete_directory_setting); + DeleteDirectories(GetDirectories("./output*/"), delete_directory_setting); + DeleteDirectories(GetDirectories("./generated*/"), delete_directory_setting); RunTarget("nuget-install"); if (build_dotnet_android) @@ -143,24 +146,36 @@ Task ("nuget-pack-without-build-net10-net8") } ); -Task ("build-prepare-dotnet-android") + +Task ("net10-net8-prepare-binderate-build") .Does ( () => { - if ( BuildSystem.IsRunningOnAzurePipelines || BuildSystem.IsRunningOnGitHubActions ) + EnsureDirectoryExists("./output"); + EnsureDirectoryExists("./output/net10.0-net8.0-build-files/"); + + RunTarget("nuget-install"); + + /* + ../dotnet-android/dotnet-local.sh cake -t=net10-prepare-binderate-build + */ + + if (build_dotnet_android) { - Information("IsRunningOnAzurePipelines || IsRunningOnGitHubActions"); - RunTarget("prepare-dotnet-android"); + dotnet = "../dotnet-android/dotnet-local.sh"; + } + else + { + dotnet = "dotnet"; } - Information("Local Build"); content_global_json = """ { "sdk": { - "version": "8.0.407", + "version": "10.0.100-preview.2.25164.34", "rollForward": "patch" }, "msbuild-sdks": @@ -174,101 +189,125 @@ Task ("build-prepare-dotnet-android") """; System.IO.File.WriteAllText(path_global_json, content_global_json); - string dir = "../dotnet-android/"; - DeleteDirectories(GetDirectories(dir), delete_directory_setting); + Information($"{new string('=', 120)}"); + RunTarget("binderate"); + Parallel.ForEach + ( + files_net10_net8.Keys, + new ParallelOptions + { + MaxDegreeOfParallelism = (int) Math.Round(0.75 * Environment.ProcessorCount) + }, + (string file) => + { + List<(string text_old, string text_new)> replacements = files_net10_net8[file]; - StartProcess("git", $"clone --recursive https://github.com/dotnet/android.git {dir}"); + string content = System.IO.File.ReadAllText(file); - ProcessSettings ps = new ProcessSettings - { - WorkingDirectory = dir, - RedirectStandardOutput = true, - RedirectStandardError = true - }; + foreach((string text_old, string text_new) pair in replacements) + { + if (pair.text_old == null) + { + content = text_new; + break; + } + else + { + content = content.Replace(pair.text_old, pair.text_new); + } + } - Cysharp.Text.Utf16ValueStringBuilder sb = Cysharp.Text.ZString.CreateStringBuilder(); + System.IO.File.WriteAllText(file, content); + } + ); - ps.RedirectedStandardOutputHandler = (output) => - { - sb.AppendLine(output); - return output; - }; - Information("make prepare"); - ps.Arguments = new ProcessArgumentBuilder().Append("prepare"); - StartProcess("make",ps); - Information(sb.ToString()); - sb.Clear(); + StartProcess + ( + dotnet, + "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" + ); + RunTarget("nuget"); - Information("make"); - ps.Arguments = new ProcessArgumentBuilder().Append(""); - StartProcess("make",ps); + CopyFiles("./global.json", "./output/net10.0-net8.0-build-files/"); + CopyFiles("./workloads.json", "./output/net10.0-net8.0-build-files/"); + CopyFiles("./Directory.Build.props", "./output/net10.0-net8.0-build-files/"); - ps.Arguments = new ProcessArgumentBuilder().Append("--version"); - StartProcess($"{dir}/dotnet-local.sh", ps); + RunTarget("nuget-uninstall"); + + //git restore pathTo/MyFile + + DeleteDirectories(GetDirectories("generated-net10.0-net8.0"), delete_directory_setting); + DeleteDirectories(GetDirectories("output-net10.0-net8.0"), delete_directory_setting); + MoveDirectory("generated", "generated-net10.0-net8.0"); + MoveDirectory("output", "output-net10.0-net8.0"); } ); -Task ("prepare-dotnet-android") +Task ("net8-prepare-binderate-build") .Does ( () => { - if (IsRunningOnMacOs()) + EnsureDirectoryExists("./output"); + EnsureDirectoryExists("./output/net8.0-build-files/"); + + RunTarget("nuget-install"); + + content_global_json = + """ { - Information("IsRunningOnMacOs"); - // https://github.com/dotnet/android/blob/main/Documentation/building/unix/dependencies.md + "sdk": + { + "version": "8.0.407", + "rollForward": "patch" + }, + "msbuild-sdks": + { + "MSBuild.Sdk.Extras": "3.0.44", + "Microsoft.Build.Traversal": "4.1.82", + "Microsoft.Build.NoTargets": "3.7.56", + "Xamarin.Legacy.Sdk": "0.2.0-alpha4" + } + } + """; + System.IO.File.WriteAllText(path_global_json, content_global_json); - StartProcess("curl", $"-c \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""); + EnsureDirectoryExists("./output"); - StartProcess("brew", $"install automake"); - StartProcess("brew", $"install autoconf"); - StartProcess("brew", $"install cmake"); - StartProcess("brew", $"install libtool"); - StartProcess("brew", $"install p7zip"); - StartProcess("brew", $"install gdk-pixbuf"); - StartProcess("brew", $"install gettext"); - StartProcess("brew", $"install coreutils"); - StartProcess("brew", $"install findutils"); - StartProcess("brew", $"install gnu-tar"); - StartProcess("brew", $"install gnu-sed"); - StartProcess("brew", $"install gawk"); - StartProcess("brew", $"install gnutls"); - StartProcess("brew", $"install gnu-indent"); - StartProcess("brew", $"install gnu-getopt"); - StartProcess("brew", $"install intltool"); - StartProcess("brew", $"install ninja"); - StartProcess("brew", $"install scons"); - StartProcess("brew", $"install wget"); - StartProcess("brew", $"install xz"); + dotnet = "dotnet"; - } - if (IsRunningOnWindows()) - { - Information("IsRunningOnWindows"); - // https://github.com/dotnet/android/blob/main/Documentation/building/windows/dependencies.md - // https://winget.run/search + Information($"{new string('=', 120)}"); + RunTarget("binderate"); + StartProcess + ( + dotnet, + "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" + ); + RunTarget("nuget"); - /* - StartProcess("winget", $"install -e --id JernejSimoncic.Wget"); - StartProcess("winget", $"install -e --id Ninja-build.Ninja"); - */ - } + CopyFiles("./global.json", "./output/net8.0-build-files/"); + CopyFiles("./workloads.json", "./output/net8.0-build-files/"); + CopyFiles("./Directory.Build.props", "./output/net8.0-build-files/"); - + RunTarget("nuget-uninstall"); + + DeleteDirectories(GetDirectories("generated-net8.0"), delete_directory_setting); + DeleteDirectories(GetDirectories("output-net8.0"), delete_directory_setting); + MoveDirectory("generated", "generated-net8.0"); + MoveDirectory("output", "output-net8.0"); } ); -Task ("net10-net8-prepare-binderate-build") +Task ("net10-prepare-binderate-build") .Does ( () => { - RunTarget("nuget-install"); + EnsureDirectoryExists("./output"); + EnsureDirectoryExists("./output/net10.0-build-files/"); - /* - ../dotnet-android/dotnet-local.sh cake -t=net10-prepare-binderate-build - */ + RunTarget("nuget-install"); if (build_dotnet_android) { @@ -298,46 +337,57 @@ Task ("net10-net8-prepare-binderate-build") """; System.IO.File.WriteAllText(path_global_json, content_global_json); - Information($"{new string('=', 120)}"); - RunTarget("binderate"); + Information("Change files"); Parallel.ForEach ( - files_net10_net8.Keys, + files_net10.Keys, new ParallelOptions { MaxDegreeOfParallelism = (int) Math.Round(0.75 * Environment.ProcessorCount) }, (string file) => { - List<(string text_old, string text_new)> replacements = files_net10_net8[file]; + List<(string text_old, string text_new)> replacements = files_net10[file]; string content = System.IO.File.ReadAllText(file); foreach((string text_old, string text_new) pair in replacements) { - content = content.Replace(pair.text_old, pair.text_new); + if (pair.text_old == null) + { + content = text_new; + break; + } + else + { + content = content.Replace(pair.text_old, pair.text_new); + } } System.IO.File.WriteAllText(file, content); } ); - + Information("binderate"); + RunTarget("binderate"); StartProcess ( dotnet, "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" ); + Information("binderate"); RunTarget("nuget"); - RunTarget("nuget-uninstall"); + CopyFiles("./global.json", "./output/net10.0-build-files/"); + CopyFiles("./workloads.json", "./output/net10.0-build-files/"); + CopyFiles("./Directory.Build.props", "./output/net10.0-build-files/"); - //git restore pathTo/MyFile + RunTarget("nuget-uninstall"); - DeleteDirectories(GetDirectories("generated-net10.0-net8.0"), delete_directory_setting); - DeleteDirectories(GetDirectories("output-net10.0-net8.0"), delete_directory_setting); - MoveDirectory("generated", "generated-net10.0-net8.0"); - MoveDirectory("output", "output-net10.0-net8.0"); + DeleteDirectories(GetDirectories("generated-net10.0"), delete_directory_setting); + DeleteDirectories(GetDirectories("output-net10.0"), delete_directory_setting); + MoveDirectory("generated", "generated-net10.0"); + MoveDirectory("output", "output-net10.0"); } ); @@ -393,65 +443,24 @@ Task ("copy-net8-with-net8-to-multi-target") ); -Task ("revert-changes-net8") - .Does - ( - () => - { - DeleteFile(path_global_json); - } - ); - -Task ("revert-changes-net10") - .Does - ( - () => - { - foreach(string file in files_net10.Keys) - { - StartProcess("git", $"restore {file}"); - } - - StartProcess("git", $"restore global.json"); - } - ); - -Task ("revert-changes-net10-net8") - .Does - ( - () => - { - foreach(string file in files_net10_net8.Keys) - { - StartProcess("git", $"restore {file}"); - } - - StartProcess("git", $"restore global.json"); - } - ); - -Task ("net10-prepare-binderate-build") +Task ("build-prepare-dotnet-android") .Does ( () => { - RunTarget("nuget-install"); - - if (build_dotnet_android) - { - dotnet = "../dotnet-android/dotnet-local.sh"; - } - else + if ( BuildSystem.IsRunningOnAzurePipelines || BuildSystem.IsRunningOnGitHubActions ) { - dotnet = "dotnet"; + Information("IsRunningOnAzurePipelines || IsRunningOnGitHubActions"); + RunTarget("prepare-dotnet-android"); } + Information("Local Build"); content_global_json = """ { "sdk": { - "version": "10.0.100-preview.2.25164.34", + "version": "8.0.407", "rollForward": "patch" }, "msbuild-sdks": @@ -465,100 +474,129 @@ Task ("net10-prepare-binderate-build") """; System.IO.File.WriteAllText(path_global_json, content_global_json); - Information("Change files"); - Parallel.ForEach - ( - files_net10.Keys, - new ParallelOptions - { - MaxDegreeOfParallelism = (int) Math.Round(0.75 * Environment.ProcessorCount) - }, - (string file) => - { - List<(string text_old, string text_new)> replacements = files_net10[file]; + string dir = "../dotnet-android/"; + DeleteDirectories(GetDirectories(dir), delete_directory_setting); - string content = System.IO.File.ReadAllText(file); + StartProcess("git", $"clone --recursive https://github.com/dotnet/android.git {dir}"); - foreach((string text_old, string text_new) pair in replacements) - { - content = content.Replace(pair.text_old, pair.text_new); - } + ProcessSettings ps = new ProcessSettings + { + WorkingDirectory = dir, + RedirectStandardOutput = true, + RedirectStandardError = true + }; - System.IO.File.WriteAllText(file, content); - } - ); + Cysharp.Text.Utf16ValueStringBuilder sb = Cysharp.Text.ZString.CreateStringBuilder(); - Information("binderate"); - RunTarget("binderate"); - StartProcess - ( - dotnet, - "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" - ); - Information("binderate"); - RunTarget("nuget"); + ps.RedirectedStandardOutputHandler = (output) => + { + sb.AppendLine(output); + return output; + }; - RunTarget("nuget-uninstall"); + Information("make prepare"); + ps.Arguments = new ProcessArgumentBuilder().Append("prepare"); + StartProcess("make",ps); + Information(sb.ToString()); + sb.Clear(); - DeleteDirectories(GetDirectories("generated-net10.0"), delete_directory_setting); - DeleteDirectories(GetDirectories("output-net10.0"), delete_directory_setting); - MoveDirectory("generated", "generated-net10.0"); - MoveDirectory("output", "output-net10.0"); + Information("make"); + ps.Arguments = new ProcessArgumentBuilder().Append(""); + StartProcess("make",ps); + + ps.Arguments = new ProcessArgumentBuilder().Append("--version"); + StartProcess($"{dir}/dotnet-local.sh", ps); } ); -Task ("net8-prepare-binderate-build") +Task ("prepare-dotnet-android") .Does ( () => { - DeleteDirectories(GetDirectories("./output/"), delete_directory_setting); - DeleteDirectories(GetDirectories("./externals/"), delete_directory_setting); - DeleteDirectories(GetDirectories("./generated*/"), delete_directory_setting); + if (IsRunningOnMacOs()) + { + Information("IsRunningOnMacOs"); + // https://github.com/dotnet/android/blob/main/Documentation/building/unix/dependencies.md - RunTarget("nuget-install"); + StartProcess("curl", $"-c \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""); - content_global_json = - """ + StartProcess("brew", $"install automake"); + StartProcess("brew", $"install autoconf"); + StartProcess("brew", $"install cmake"); + StartProcess("brew", $"install libtool"); + StartProcess("brew", $"install p7zip"); + StartProcess("brew", $"install gdk-pixbuf"); + StartProcess("brew", $"install gettext"); + StartProcess("brew", $"install coreutils"); + StartProcess("brew", $"install findutils"); + StartProcess("brew", $"install gnu-tar"); + StartProcess("brew", $"install gnu-sed"); + StartProcess("brew", $"install gawk"); + StartProcess("brew", $"install gnutls"); + StartProcess("brew", $"install gnu-indent"); + StartProcess("brew", $"install gnu-getopt"); + StartProcess("brew", $"install intltool"); + StartProcess("brew", $"install ninja"); + StartProcess("brew", $"install scons"); + StartProcess("brew", $"install wget"); + StartProcess("brew", $"install xz"); + + } + if (IsRunningOnWindows()) { - "sdk": - { - "version": "8.0.407", - "rollForward": "patch" - }, - "msbuild-sdks": - { - "MSBuild.Sdk.Extras": "3.0.44", - "Microsoft.Build.Traversal": "4.1.82", - "Microsoft.Build.NoTargets": "3.7.56", - "Xamarin.Legacy.Sdk": "0.2.0-alpha4" - } + Information("IsRunningOnWindows"); + // https://github.com/dotnet/android/blob/main/Documentation/building/windows/dependencies.md + // https://winget.run/search + + /* + StartProcess("winget", $"install -e --id JernejSimoncic.Wget"); + StartProcess("winget", $"install -e --id Ninja-build.Ninja"); + */ } - """; - System.IO.File.WriteAllText(path_global_json, content_global_json); - EnsureDirectoryExists("./output"); + + } + ); - dotnet = "dotnet"; +Task ("revert-changes-net8") + .Does + ( + () => + { + DeleteFile(path_global_json); + } + ); - Information($"{new string('=', 120)}"); - RunTarget("binderate"); - StartProcess - ( - dotnet, - "workload restore --project ./generated/androidx.activity.activity/androidx.activity.activity.csproj" - ); - RunTarget("nuget"); +Task ("revert-changes-net10") + .Does + ( + () => + { + foreach(string file in files_net10.Keys) + { + StartProcess("git", $"restore {file}"); + } - RunTarget("nuget-uninstall"); + StartProcess("git", $"restore global.json"); + } + ); - DeleteDirectories(GetDirectories("generated-net8.0"), delete_directory_setting); - DeleteDirectories(GetDirectories("output-net8.0"), delete_directory_setting); - MoveDirectory("generated", "generated-net8.0"); - MoveDirectory("output", "output-net8.0"); +Task ("revert-changes-net10-net8") + .Does + ( + () => + { + foreach(string file in files_net10_net8.Keys) + { + StartProcess("git", $"restore {file}"); + } + + StartProcess("git", $"restore global.json"); } ); + Dictionary> files_net10; Dictionary> files_net10_net8; @@ -576,6 +614,35 @@ files_net10 = new Dictionary> ] }, */ + { + "./workloads.json", + [ + ( + null, // replace all + """ + { + "microsoft.net.sdk.android": "35.99.0-preview.2.205/10.0.100-preview.2", + "microsoft.net.sdk.ios": "18.2.10552-net10-p2/10.0.100-preview.2", + "microsoft.net.sdk.maccatalyst": "18.2.10552-net10-p2/10.0.100-preview.2", + "microsoft.net.sdk.macos": "15.2.10552-net10-p2/10.0.100-preview.2", + "microsoft.net.sdk.maui": "10.0.0-preview.2.25165.1/10.0.100-preview.2", + "microsoft.net.sdk.tvos": "18.2.10552-net10-p2/10.0.100-preview.2", + "microsoft.net.workload.mono.toolchain.current": "10.0.0-preview.2.25163.2/10.0.100-preview.2", + "microsoft.net.workload.emscripten.current": "10.0.0-preview.2.25120.1/10.0.100-preview.2", + "microsoft.net.workload.emscripten.net6": "10.0.0-preview.2.25120.1/10.0.100-preview.2", + "microsoft.net.workload.emscripten.net7": "10.0.0-preview.2.25120.1/10.0.100-preview.2", + "microsoft.net.workload.emscripten.net8": "10.0.0-preview.2.25120.1/10.0.100-preview.2", + "microsoft.net.workload.emscripten.net9": "10.0.0-preview.2.25120.1/10.0.100-preview.2", + "microsoft.net.workload.mono.toolchain.net6": "10.0.0-preview.2.25163.2/10.0.100-preview.2", + "microsoft.net.workload.mono.toolchain.net7": "10.0.0-preview.2.25163.2/10.0.100-preview.2", + "microsoft.net.workload.mono.toolchain.net8": "10.0.0-preview.2.25163.2/10.0.100-preview.2", + "microsoft.net.workload.mono.toolchain.net9": "10.0.0-preview.2.25163.2/10.0.100-preview.2", + "microsoft.net.sdk.aspire": "8.2.2/8.0.100" + } + """ + ), + ], + }, { "./Directory.Build.props", [ @@ -638,6 +705,35 @@ files_net10_net8 = new Dictionary Date: Tue, 25 Mar 2025 12:55:24 +0100 Subject: [PATCH 136/140] build errors fixed --- build/cake/build-android-libraries-net10-net8.cake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/cake/build-android-libraries-net10-net8.cake b/build/cake/build-android-libraries-net10-net8.cake index 6321657c5..e179f5c2e 100644 --- a/build/cake/build-android-libraries-net10-net8.cake +++ b/build/cake/build-android-libraries-net10-net8.cake @@ -208,7 +208,7 @@ Task ("net10-net8-prepare-binderate-build") { if (pair.text_old == null) { - content = text_new; + content = pair.text_new; break; } else @@ -355,7 +355,7 @@ Task ("net10-prepare-binderate-build") { if (pair.text_old == null) { - content = text_new; + content = pair.text_new; break; } else @@ -641,7 +641,7 @@ files_net10 = new Dictionary> } """ ), - ], + ] }, { "./Directory.Build.props", @@ -732,7 +732,7 @@ files_net10_net8 = new Dictionary Date: Tue, 1 Apr 2025 13:53:41 +0200 Subject: [PATCH 137/140] Update NuGet.config --- NuGet.config | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9e2cceca5..e27a80ca1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,11 +2,10 @@ - - - + + @@ -26,4 +25,4 @@ - \ No newline at end of file + From 4faa8e88758e529bd6fe37e58a68d4a1c69d740a Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 1 Apr 2025 23:08:18 +0200 Subject: [PATCH 138/140] workload installation --- build/ci/build-and-test.yml | 5 ----- build/ci/setup-environment.yml | 32 +++++++++++++++++++++++++++++++- build/ci/variables.yml | 2 +- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/build/ci/build-and-test.yml b/build/ci/build-and-test.yml index 57bc2bec2..c350123e2 100644 --- a/build/ci/build-and-test.yml +++ b/build/ci/build-and-test.yml @@ -58,8 +58,3 @@ steps: command: test projects: util/**/*.Tests.csproj arguments: '-c $(configuration)' - - - pwsh: | - dotnet cake build.cake ` - --target=build-android-libraries-net10-net8 - displayName: 'Build build-android-libraries-net10-net8' diff --git a/build/ci/setup-environment.yml b/build/ci/setup-environment.yml index c097f305c..c6ab7b8fc 100644 --- a/build/ci/setup-environment.yml +++ b/build/ci/setup-environment.yml @@ -45,14 +45,44 @@ steps: - ${{ if eq(parameters.runDotnetNextTest, false) }}: - pwsh: | - dotnet workload install maui --verbosity diag --from-rollback-file $(dotnetWorkloadRollbackFile) --source $(dotnetWorkloadSource) --source $(dotnetNuGetOrgSource) + dotnet workload update --source https://api.nuget.org/v3/index.json --verbosity diag if ($LASTEXITCODE -ne 0) { Write-Host "##vso[task.logissue type=error]Failed to install workloads." Write-Host "##vso[task.complete result=Failed;]" exit 0 } + displayName: Update .NET Workloads + + - ${{ if eq(parameters.runDotnetNextTest, false) }}: + - pwsh: | + dotnet workload install maui android --source https://api.nuget.org/v3/index.json --verbosity diag + if ($LASTEXITCODE -ne 0) { + Write-Host "##vso[task.logissue type=error]Failed to install workloads: maui, android" + Write-Host "##vso[task.complete result=Failed;]" + exit 0 + } displayName: Install .NET Workloads + - ${{ if eq(parameters.runDotnetNextTest, false) }}: + - pwsh: | + dotnet workload install android-net8 --source https://api.nuget.org/v3/index.json --verbosity diag + if ($LASTEXITCODE -ne 0) { + Write-Host "##vso[task.logissue type=error]Failed to install workload: android-net8" + Write-Host "##vso[task.complete result=Failed;]" + exit 0 + } + displayName: Install .NET Workload + + - ${{ if eq(parameters.runDotnetNextTest, true) }}: + - pwsh: | + dotnet workload install maui android android-net8 --source https://api.nuget.org/v3/index.json --verbosity diag + if ($LASTEXITCODE -ne 0) { + Write-Host "##vso[task.logissue type=error]Failed to install workloads." + Write-Host "##vso[task.complete result=Failed;]" + exit 0 + } + displayName: Install Preview .NET Workloads + - ${{ if eq(parameters.runDotnetNextTest, true) }}: - pwsh: | dotnet workload install maui --verbosity diag diff --git a/build/ci/variables.yml b/build/ci/variables.yml index e9797ae89..c137e9727 100644 --- a/build/ci/variables.yml +++ b/build/ci/variables.yml @@ -22,7 +22,7 @@ variables: dotnetVersion: '8.0.407' # .NET version to install on agent dotnetWorkloadRollbackFile: 'workloads.json' # Rollback file specifying workload versions to install dotnetNuGetOrgSource: 'https://api.nuget.org/v3/index.json' # NuGet.org URL to find workloads - dotnetWorkloadSource: 'https://aka.ms/dotnet6/nuget/index.json' # .NET engineering URL to find workloads + dotnetWorkloadSource: 'https://aka.ms/dotnet8/nuget/index.json' # .NET engineering URL to find workloads # Standard test variables standardTestProject: tests/allpackages/AllPackagesTests.csproj # Standard tests project file From 00051fff441ba0fccfffa328478b45f6ea2678ca Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 2 Apr 2025 10:18:08 +0200 Subject: [PATCH 139/140] cake.filehelpers added for windows --- build/cake/nuget-install.cake | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/build/cake/nuget-install.cake b/build/cake/nuget-install.cake index 125a0e0e6..46697e721 100644 --- a/build/cake/nuget-install.cake +++ b/build/cake/nuget-install.cake @@ -15,7 +15,8 @@ https://www.nuget.org/api/v2/package/cake.coreclr/1.3.0/ Dictionary nuget_packages = new () { - // { "cake.coreclr", "1.3.0" } + // { "cake.coreclr", "1.3.0" }, + { "Cake.FileHelpers", "7.0.0"}, // migrated, but needed for windows only??? { "HolisticWare.Xamarin.Tools.ComponentGovernance", "0.0.1.4" }, { "HolisticWare.Core.Net.HTTP", "0.0.4" }, { "HolisticWare.Core.IO", "0.0.4" }, @@ -67,6 +68,13 @@ Task("nuget-install") } ); */ + { "Cake.FileHelpers", "7.0.0"}, // migrated, but needed for windows only??? + + DownloadFile + ( + "https://api.nuget.org/v3-flatcontainer/cake.filehelpers/7.0.0/cake.filehelpers.7.0.0.nupkg", + $"./output/cake.filehelpers.7.0.0.nupkg" + ); DownloadFile ( "https://api.nuget.org/v3-flatcontainer/cliwrap/3.8.2/cliwrap.3.8.2.nupkg", @@ -100,6 +108,11 @@ Task("nuget-uninstall") string file; // validation fails on CI if the package is in the output directory + file = $"./output/cake.filehelpers.7.0.0.nupkg"; + if (FileExists (file)) + { + DeleteFile (file); + } file = $"./output/cliwrap.3.8.2.nupkg"; if (FileExists (file)) { From af6aa618939b611ed2238d4333e134b6516972b1 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Mon, 28 Apr 2025 09:01:27 -0700 Subject: [PATCH 140/140] Install dotnet tools with DotNetCoreCLI task --- build/ci/setup-environment.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/build/ci/setup-environment.yml b/build/ci/setup-environment.yml index c6ab7b8fc..661c33214 100644 --- a/build/ci/setup-environment.yml +++ b/build/ci/setup-environment.yml @@ -29,11 +29,18 @@ steps: version: $(dotnetNextVersion) performMultiLevelLookup: true includePreviewVersions: true - + - ${{ each tool in parameters.dotnetTools }}: - ${{ each pair in tool }}: - - pwsh: dotnet tool update -g ${{ pair.key }} --version ${{ pair.value }} - displayName: 'Install tool: ${{ pair.key }}' + - task: DotNetCoreCLI@2 + displayName: 'Install tool: ${{ pair.key }} ${{ parameters.value }}' + inputs: + command: custom + custom: tool + arguments: >- + update -g ${{ pair.key }} -v:diag + --version ${{ pair.value }} + --add-source "https://api.nuget.org/v3/index.json" - ${{ if eq(parameters.runDotnetNextTest, true) }}: - pwsh: |