From 173f556de970113b1f15d4787804184bc4c2f7cd Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 16 Mar 2022 19:11:38 +0100 Subject: [PATCH 1/5] mappings updates --- mappings/androidx-assemblies.csv | 2 +- mappings/dependencies.json | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/mappings/androidx-assemblies.csv b/mappings/androidx-assemblies.csv index 035e13968..015f0179d 100644 --- a/mappings/androidx-assemblies.csv +++ b/mappings/androidx-assemblies.csv @@ -38,7 +38,7 @@ Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,Xamarin.Android.S Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,2.2.21.5 Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.3.2 Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,1.2.0 -Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,1.5.0 +Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,1.5.0.1 Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,1.6.10 Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,1.0.1.12 Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,1.1.1.7 diff --git a/mappings/dependencies.json b/mappings/dependencies.json index ffb4f6725..10e538b16 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -1149,20 +1149,10 @@ "Xamarin.Google.Guava.ListenableFuture" ] }, - { - "id": "Xamarin.AndroidX.Migration", - "dependencies": [ - "Xamarin.AndroidX.MultiDex" - ] - }, { "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, - { - "id": "Xamarin.AndroidX.Migration.Tool", - "dependencies": [] - }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ From f83fb870562f65f18fac505e6e9961ad52b8ef16 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 16 Mar 2022 19:22:44 +0100 Subject: [PATCH 2/5] CreateIntent parameter fix --- .../activity/Additions/ActivityResultContracts.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/source/androidx.activity/activity/Additions/ActivityResultContracts.cs b/source/androidx.activity/activity/Additions/ActivityResultContracts.cs index 8557ca3d7..0bd2258e2 100644 --- a/source/androidx.activity/activity/Additions/ActivityResultContracts.cs +++ b/source/androidx.activity/activity/Additions/ActivityResultContracts.cs @@ -180,7 +180,15 @@ public partial class RequestMultiplePermissions // : global::AndroidX.Activity.R } } - + } + public partial class CreateDocument //: global::AndroidX.Activity.Result.Contract.ActivityResultContract + { + public global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, string input) + { + return CreateIntent (context, (Java.Lang.Object) input); + } } - } + } + + } From 0907a544c28a832152b0856273b07d4e72b50848 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 5 Apr 2022 18:19:59 +0200 Subject: [PATCH 3/5] Update androidx-assemblies.csv --- mappings/androidx-assemblies.csv | 166 +++++++++++++++---------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/mappings/androidx-assemblies.csv b/mappings/androidx-assemblies.csv index 015f0179d..4d61d8d55 100644 --- a/mappings/androidx-assemblies.csv +++ b/mappings/androidx-assemblies.csv @@ -1,84 +1,84 @@ Support .NET assembly,AndroidX .NET assembly,Support NuGet,AndroidX NuGet,AndroidX NuGet Version -Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,2.1.0.13 -Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,2.1.0.13 -Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,2.4.1 -Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,2.2.0.12 -Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,2.4.1 -Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.4.1 -Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.4.1 -Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,2.4.1 -Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,2.4.1 -Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,2.4.1 -Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,2.2.0 -Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,2.2.0 -Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,1.2.1 -Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,2.4.2 -Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,2.4.2 -Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,2.7.1.2 -Xamarin.Android.Support.Animated.Vector.Drawable,Xamarin.AndroidX.VectorDrawable.Animated,Xamarin.Android.Support.Animated.Vector.Drawable,Xamarin.AndroidX.VectorDrawable.Animated,1.1.0.12 -Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava,2.2.21.5 -Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.3.2 -Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,1.3.0.2 -Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,1.2.1 -Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,23.0.0.2 -Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,1.0.0.12 -Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,1.2.0.2 -Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,1.7.0 -Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,2.1.3 -Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,7.1.2 -Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,7.1.2 -Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,7.1.2 -Xamarin.Android.Support.Constraint.Layout.Solver,Xamarin.AndroidX.ConstraintLayout.Solver,Xamarin.Android.Support.Constraint.Layout.Solver,Xamarin.AndroidX.ConstraintLayout.Solver,2.0.4.7 -Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,1.2.0 -Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,1.0.0.13 -Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,1.0.0.12 -Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,1.0.0.12 -Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,1.4.0 -Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,1.1.0.11 -Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,2.2.21.5 -Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.3.2 -Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,1.2.0 -Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,1.5.0.1 -Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,1.6.10 -Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,1.0.1.12 -Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,1.1.1.7 -Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,1.0.0.12 -Xamarin.Android.Support.Emoji,Xamarin.AndroidX.Emoji,Xamarin.Android.Support.Emoji,Xamarin.AndroidX.Emoji,1.1.0.7 -Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,1.1.0.7 -Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,1.1.0.7 -Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,1.3.3.4 -Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,1.4.1 -Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,1.0.0.12 -Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,1.0.0.12 -Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,1.1.0.12 -Xamarin.Android.Support.LocalBroadcastManager,Xamarin.AndroidX.LocalBroadcastManager,Xamarin.Android.Support.LocalBroadcastManager,Xamarin.AndroidX.LocalBroadcastManager,1.1.0 -Xamarin.Android.Support.Media.Compat,Xamarin.AndroidX.Media,Xamarin.Android.Support.Media.Compat,Xamarin.AndroidX.Media,1.5.0 -Xamarin.Android.Support.MultiDex,Xamarin.AndroidX.MultiDex,Xamarin.Android.Support.MultiDex,Xamarin.AndroidX.MultiDex,2.0.1.12 -Xamarin.Android.Support.Percent,Xamarin.AndroidX.PercentLayout,Xamarin.Android.Support.Percent,Xamarin.AndroidX.PercentLayout,1.0.0.13 -Xamarin.Android.Support.Print,Xamarin.AndroidX.Print,Xamarin.Android.Support.Print,Xamarin.AndroidX.Print,1.0.0.12 -Xamarin.Android.Support.Recommendation,Xamarin.AndroidX.Recommendation,Xamarin.Android.Support.Recommendation,Xamarin.AndroidX.Recommendation,1.0.0.12 -Xamarin.Android.Support.RecyclerView.Selection,Xamarin.AndroidX.RecyclerView.Selection,Xamarin.Android.Support.RecyclerView.Selection,Xamarin.AndroidX.RecyclerView.Selection,1.1.0.6 -Xamarin.Android.Support.Slices.Builders,Xamarin.AndroidX.Slice.Builders,Xamarin.Android.Support.Slices.Builders,Xamarin.AndroidX.Slice.Builders,1.0.0.12 -Xamarin.Android.Support.Slices.Core,Xamarin.AndroidX.Slice.Core,Xamarin.Android.Support.Slices.Core,Xamarin.AndroidX.Slice.Core,1.0.0.12 -Xamarin.Android.Support.Slices.View,Xamarin.AndroidX.Slice.View,Xamarin.Android.Support.Slices.View,Xamarin.AndroidX.Slice.View,1.0.0.12 -Xamarin.Android.Support.SlidingPaneLayout,Xamarin.AndroidX.SlidingPaneLayout,Xamarin.Android.Support.SlidingPaneLayout,Xamarin.AndroidX.SlidingPaneLayout,1.2.0 -Xamarin.Android.Support.SwipeRefreshLayout,Xamarin.AndroidX.SwipeRefreshLayout,Xamarin.Android.Support.SwipeRefreshLayout,Xamarin.AndroidX.SwipeRefreshLayout,1.1.0.7 -Xamarin.Android.Support.Transition,Xamarin.AndroidX.Transition,Xamarin.Android.Support.Transition,Xamarin.AndroidX.Transition,1.4.1.5 -Xamarin.Android.Support.TV.Provider,Xamarin.AndroidX.TvProvider,Xamarin.Android.Support.TV.Provider,Xamarin.AndroidX.TvProvider,1.0.0.14 -Xamarin.Android.Support.v13,Xamarin.AndroidX.Legacy.Support.V13,Xamarin.Android.Support.v13,Xamarin.AndroidX.Legacy.Support.V13,1.0.0.12 -Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,1.0.0.14 -Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,1.0.0.12 -Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,1.0.0.12 -Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,1.4.1 -Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,1.4.1 -Xamarin.Android.Support.v7.CardView,Xamarin.AndroidX.CardView,Xamarin.Android.Support.v7.CardView,Xamarin.AndroidX.CardView,1.0.0.14 -Xamarin.Android.Support.v7.GridLayout,Xamarin.AndroidX.GridLayout,Xamarin.Android.Support.v7.GridLayout,Xamarin.AndroidX.GridLayout,1.0.0.12 -Xamarin.Android.Support.v7.MediaRouter,Xamarin.AndroidX.MediaRouter,Xamarin.Android.Support.v7.MediaRouter,Xamarin.AndroidX.MediaRouter,1.2.6 -Xamarin.Android.Support.v7.Palette,Xamarin.AndroidX.Palette,Xamarin.Android.Support.v7.Palette,Xamarin.AndroidX.Palette,1.0.0.12 -Xamarin.Android.Support.v7.Preference,Xamarin.AndroidX.Preference,Xamarin.Android.Support.v7.Preference,Xamarin.AndroidX.Preference,1.2.0 -Xamarin.Android.Support.v7.RecyclerView,Xamarin.AndroidX.RecyclerView,Xamarin.Android.Support.v7.RecyclerView,Xamarin.AndroidX.RecyclerView,1.2.1.5 -Xamarin.Android.Support.Vector.Drawable,Xamarin.AndroidX.VectorDrawable,Xamarin.Android.Support.Vector.Drawable,Xamarin.AndroidX.VectorDrawable,1.1.0.12 -Xamarin.Android.Support.VersionedParcelable,Xamarin.AndroidX.VersionedParcelable,Xamarin.Android.Support.VersionedParcelable,Xamarin.AndroidX.VersionedParcelable,1.1.1.12 -Xamarin.Android.Support.ViewPager,Xamarin.AndroidX.ViewPager,Xamarin.Android.Support.ViewPager,Xamarin.AndroidX.ViewPager,1.0.0.12 -Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,1.2.0.4 -Xamarin.Android.Support.WebKit,Xamarin.AndroidX.WebKit,Xamarin.Android.Support.WebKit,Xamarin.AndroidX.WebKit,1.4.0.6 +Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,2.1.0.14 +Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,2.1.0.14 +Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,2.4.1.1 +Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,2.2.0.13 +Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,2.4.1.1 +Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.4.1.1 +Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.4.1.1 +Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,2.4.1.1 +Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,2.4.1.1 +Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,2.4.1.1 +Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,2.2.0.1 +Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,2.2.0.1 +Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,1.2.1.1 +Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,2.4.2.1 +Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,2.4.2.1 +Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,2.7.1.3 +Xamarin.Android.Support.Animated.Vector.Drawable,Xamarin.AndroidX.VectorDrawable.Animated,Xamarin.Android.Support.Animated.Vector.Drawable,Xamarin.AndroidX.VectorDrawable.Animated,1.1.0.13 +Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava,2.2.21.6 +Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.4.1 +Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,1.3.0.3 +Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,1.2.1.1 +Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,23.0.0.3 +Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,1.0.0.13 +Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,1.2.0.3 +Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,1.7.0.1 +Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,2.1.3.1 +Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,7.1.2.1 +Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,7.1.2.1 +Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,7.1.2.1 +Xamarin.Android.Support.Constraint.Layout.Solver,Xamarin.AndroidX.ConstraintLayout.Solver,Xamarin.Android.Support.Constraint.Layout.Solver,Xamarin.AndroidX.ConstraintLayout.Solver,2.0.4.8 +Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,1.2.0.1 +Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,1.0.0.14 +Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,1.0.0.13 +Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,1.0.0.13 +Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,1.4.0.1 +Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,1.1.0.12 +Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,2.2.21.6 +Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.4.1 +Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,1.2.0.1 +Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,1.5.0.2 +Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,1.6.20.1 +Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,1.0.1.13 +Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,1.1.1.8 +Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,1.0.0.13 +Xamarin.Android.Support.Emoji,Xamarin.AndroidX.Emoji,Xamarin.Android.Support.Emoji,Xamarin.AndroidX.Emoji,1.1.0.8 +Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,1.1.0.8 +Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,1.1.0.8 +Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,1.3.3.5 +Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,1.4.1.1 +Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,1.0.0.13 +Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,1.0.0.13 +Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,1.1.0.13 +Xamarin.Android.Support.LocalBroadcastManager,Xamarin.AndroidX.LocalBroadcastManager,Xamarin.Android.Support.LocalBroadcastManager,Xamarin.AndroidX.LocalBroadcastManager,1.1.0.1 +Xamarin.Android.Support.Media.Compat,Xamarin.AndroidX.Media,Xamarin.Android.Support.Media.Compat,Xamarin.AndroidX.Media,1.5.0.1 +Xamarin.Android.Support.MultiDex,Xamarin.AndroidX.MultiDex,Xamarin.Android.Support.MultiDex,Xamarin.AndroidX.MultiDex,2.0.1.13 +Xamarin.Android.Support.Percent,Xamarin.AndroidX.PercentLayout,Xamarin.Android.Support.Percent,Xamarin.AndroidX.PercentLayout,1.0.0.14 +Xamarin.Android.Support.Print,Xamarin.AndroidX.Print,Xamarin.Android.Support.Print,Xamarin.AndroidX.Print,1.0.0.13 +Xamarin.Android.Support.Recommendation,Xamarin.AndroidX.Recommendation,Xamarin.Android.Support.Recommendation,Xamarin.AndroidX.Recommendation,1.0.0.13 +Xamarin.Android.Support.RecyclerView.Selection,Xamarin.AndroidX.RecyclerView.Selection,Xamarin.Android.Support.RecyclerView.Selection,Xamarin.AndroidX.RecyclerView.Selection,1.1.0.7 +Xamarin.Android.Support.Slices.Builders,Xamarin.AndroidX.Slice.Builders,Xamarin.Android.Support.Slices.Builders,Xamarin.AndroidX.Slice.Builders,1.0.0.13 +Xamarin.Android.Support.Slices.Core,Xamarin.AndroidX.Slice.Core,Xamarin.Android.Support.Slices.Core,Xamarin.AndroidX.Slice.Core,1.0.0.13 +Xamarin.Android.Support.Slices.View,Xamarin.AndroidX.Slice.View,Xamarin.Android.Support.Slices.View,Xamarin.AndroidX.Slice.View,1.0.0.13 +Xamarin.Android.Support.SlidingPaneLayout,Xamarin.AndroidX.SlidingPaneLayout,Xamarin.Android.Support.SlidingPaneLayout,Xamarin.AndroidX.SlidingPaneLayout,1.2.0.1 +Xamarin.Android.Support.SwipeRefreshLayout,Xamarin.AndroidX.SwipeRefreshLayout,Xamarin.Android.Support.SwipeRefreshLayout,Xamarin.AndroidX.SwipeRefreshLayout,1.1.0.8 +Xamarin.Android.Support.Transition,Xamarin.AndroidX.Transition,Xamarin.Android.Support.Transition,Xamarin.AndroidX.Transition,1.4.1.6 +Xamarin.Android.Support.TV.Provider,Xamarin.AndroidX.TvProvider,Xamarin.Android.Support.TV.Provider,Xamarin.AndroidX.TvProvider,1.0.0.15 +Xamarin.Android.Support.v13,Xamarin.AndroidX.Legacy.Support.V13,Xamarin.Android.Support.v13,Xamarin.AndroidX.Legacy.Support.V13,1.0.0.13 +Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,1.0.0.15 +Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,1.0.0.13 +Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,1.0.0.13 +Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,1.4.1.1 +Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,1.4.1.1 +Xamarin.Android.Support.v7.CardView,Xamarin.AndroidX.CardView,Xamarin.Android.Support.v7.CardView,Xamarin.AndroidX.CardView,1.0.0.15 +Xamarin.Android.Support.v7.GridLayout,Xamarin.AndroidX.GridLayout,Xamarin.Android.Support.v7.GridLayout,Xamarin.AndroidX.GridLayout,1.0.0.13 +Xamarin.Android.Support.v7.MediaRouter,Xamarin.AndroidX.MediaRouter,Xamarin.Android.Support.v7.MediaRouter,Xamarin.AndroidX.MediaRouter,1.2.6.1 +Xamarin.Android.Support.v7.Palette,Xamarin.AndroidX.Palette,Xamarin.Android.Support.v7.Palette,Xamarin.AndroidX.Palette,1.0.0.13 +Xamarin.Android.Support.v7.Preference,Xamarin.AndroidX.Preference,Xamarin.Android.Support.v7.Preference,Xamarin.AndroidX.Preference,1.2.0.1 +Xamarin.Android.Support.v7.RecyclerView,Xamarin.AndroidX.RecyclerView,Xamarin.Android.Support.v7.RecyclerView,Xamarin.AndroidX.RecyclerView,1.2.1.6 +Xamarin.Android.Support.Vector.Drawable,Xamarin.AndroidX.VectorDrawable,Xamarin.Android.Support.Vector.Drawable,Xamarin.AndroidX.VectorDrawable,1.1.0.13 +Xamarin.Android.Support.VersionedParcelable,Xamarin.AndroidX.VersionedParcelable,Xamarin.Android.Support.VersionedParcelable,Xamarin.AndroidX.VersionedParcelable,1.1.1.13 +Xamarin.Android.Support.ViewPager,Xamarin.AndroidX.ViewPager,Xamarin.Android.Support.ViewPager,Xamarin.AndroidX.ViewPager,1.0.0.13 +Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,1.2.0.5 +Xamarin.Android.Support.WebKit,Xamarin.AndroidX.WebKit,Xamarin.Android.Support.WebKit,Xamarin.AndroidX.WebKit,1.4.0.7 From d66ef327b3f36a224231cb3e6991bba62087753f Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 5 Apr 2022 18:20:27 +0200 Subject: [PATCH 4/5] fix with metadata instead of c# --- .../activity/Additions/ActivityResultContracts.cs | 9 --------- .../androidx.activity/activity/Transforms/Metadata.xml | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/source/androidx.activity/activity/Additions/ActivityResultContracts.cs b/source/androidx.activity/activity/Additions/ActivityResultContracts.cs index 0bd2258e2..d387bc091 100644 --- a/source/androidx.activity/activity/Additions/ActivityResultContracts.cs +++ b/source/androidx.activity/activity/Additions/ActivityResultContracts.cs @@ -181,14 +181,5 @@ public partial class RequestMultiplePermissions // : global::AndroidX.Activity.R } } - public partial class CreateDocument //: global::AndroidX.Activity.Result.Contract.ActivityResultContract - { - public global::Android.Content.Intent CreateIntent (global::Android.Content.Context context, string input) - { - return CreateIntent (context, (Java.Lang.Object) input); - } - } } - - } diff --git a/source/androidx.activity/activity/Transforms/Metadata.xml b/source/androidx.activity/activity/Transforms/Metadata.xml index 35b2930b8..044b2142a 100644 --- a/source/androidx.activity/activity/Transforms/Metadata.xml +++ b/source/androidx.activity/activity/Transforms/Metadata.xml @@ -217,9 +217,9 @@ - java.lang.Object + Java.Lang.Object Date: Tue, 5 Apr 2022 20:05:19 +0200 Subject: [PATCH 5/5] fix as remove-node + copy-code + cast --- .../Additions/ActivityResultContracts.cs | 31 +++++++++++++++++++ .../activity/Transforms/Metadata.xml | 6 +++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/source/androidx.activity/activity/Additions/ActivityResultContracts.cs b/source/androidx.activity/activity/Additions/ActivityResultContracts.cs index d387bc091..3aee40e69 100644 --- a/source/androidx.activity/activity/Additions/ActivityResultContracts.cs +++ b/source/androidx.activity/activity/Additions/ActivityResultContracts.cs @@ -183,3 +183,34 @@ public partial class RequestMultiplePermissions // : global::AndroidX.Activity.R } } } + +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); + } + } + } + } +} + diff --git a/source/androidx.activity/activity/Transforms/Metadata.xml b/source/androidx.activity/activity/Transforms/Metadata.xml index 044b2142a..66b009d2d 100644 --- a/source/androidx.activity/activity/Transforms/Metadata.xml +++ b/source/androidx.activity/activity/Transforms/Metadata.xml @@ -214,7 +214,7 @@ Java.Lang.Object - + +