diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d0685dbcc..86b8a7311 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,9 +6,9 @@ pr: - main variables: - AndroidBinderatorVersion: 0.5.0 + AndroidBinderatorVersion: 0.5.2 AndroidXMigrationVersion: 1.0.8 - DotNetVersion: 6.0.100-rc.2.21505.57 + DotNetVersion: 6.0.100 DotNet6Source: https://aka.ms/dotnet6/nuget/index.json NuGetOrgSource: https://api.nuget.org/v3/index.json # NOTE: there wasn't a public release of 16.11 for macOS @@ -37,7 +37,11 @@ jobs: timeoutInMinutes: 120 validPackagePrefixes: [ 'Xamarin', 'GoogleGson' ] areaPath: 'DevDiv\VS Client - Runtime SDKs\Android' - xcode: 13.0 + macosImage: 'macOS-11' # the name of the macOS VM image + # BigSur 20211120 + xcode: 13.1 + dotnet: '5.0.403' # the version of .NET Core to use + dotnetStable: '3.1.415' # the stable version of .NET Core to use initSteps: - task: UseDotNet@2 displayName: install .NET $(DotNetVersion) diff --git a/config.json b/config.json index 9f1169567..e0707508c 100644 --- a/config.json +++ b/config.json @@ -29,16 +29,16 @@ { "groupId": "androidx.activity", "artifactId": "activity", - "version": "1.3.1", - "nugetVersion": "1.3.1.2", + "version": "1.4.0", + "nugetVersion": "1.4.0", "nugetId": "Xamarin.AndroidX.Activity", "dependencyOnly": false }, { "groupId": "androidx.activity", "artifactId": "activity-ktx", - "version": "1.3.1", - "nugetVersion": "1.3.1.2", + "version": "1.4.0", + "nugetVersion": "1.4.0", "nugetId": "Xamarin.AndroidX.Activity.Ktx", "dependencyOnly": false }, @@ -421,8 +421,8 @@ { "groupId": "androidx.core", "artifactId": "core", - "version": "1.6.0", - "nugetVersion": "1.6.0.3", + "version": "1.7.0", + "nugetVersion": "1.7.0", "nugetId": "Xamarin.AndroidX.Core", "dependencyOnly": false }, @@ -445,8 +445,8 @@ { "groupId": "androidx.core", "artifactId": "core-ktx", - "version": "1.6.0", - "nugetVersion": "1.6.0.3", + "version": "1.7.0", + "nugetVersion": "1.7.0", "nugetId": "Xamarin.AndroidX.Core.Core.Ktx", "dependencyOnly": false }, @@ -661,16 +661,16 @@ { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-common", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.Common", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-common-java8", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.Common.Java8", "dependencyOnly": false }, @@ -685,104 +685,104 @@ { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-core", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Core", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-core-ktx", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-ktx", - "version": "2.3.1", - "nugetVersion": "2.3.1.5", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-process", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.Process", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-reactivestreams", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.ReactiveStreams", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-reactivestreams-ktx", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.ReactiveStreams.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-runtime", - "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.Runtime", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-runtime-ktx", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.Runtime.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-service", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.Service", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.ViewModel", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel-ktx", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.ViewModel.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel-savedstate", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.ViewModelSavedState", "dependencyOnly": false }, @@ -1252,18 +1252,18 @@ }, { "groupId": "androidx.wear", - "artifactId": "wear-ongoing", - "version": "1.0.0", + "artifactId": "wear-input", + "version": "1.1.0", "nugetVersion": "1.0.0.0", - "nugetId": "Xamarin.AndroidX.Wear.Ongoing", + "nugetId": "Xamarin.AndroidX.Wear.Input", "dependencyOnly": false }, { "groupId": "androidx.wear", - "artifactId": "wear-input", - "version": "1.1.0", + "artifactId": "wear-ongoing", + "version": "1.0.0", "nugetVersion": "1.0.0.0", - "nugetId": "Xamarin.AndroidX.Wear.Input", + "nugetId": "Xamarin.AndroidX.Wear.Ongoing", "dependencyOnly": false }, { @@ -1279,7 +1279,7 @@ "artifactId": "wear-remote-interactions", "version": "1.0.0", "nugetVersion": "1.0.0.0", - "nugetId": "Xamarin.AndroidX.Wear.RemoteInteractions", + "nugetId": "Xamarin.AndroidX.Wear.RemoteInteractions", "dependencyOnly": false }, { @@ -1293,8 +1293,8 @@ { "groupId": "androidx.window", "artifactId": "window", - "version": "1.0.0-beta02", - "nugetVersion": "1.0.0.3-beta02", + "version": "1.0.0-beta04", + "nugetVersion": "1.0.0.4-beta04", "nugetId": "Xamarin.AndroidX.Window", "dependencyOnly": false }, @@ -1309,8 +1309,8 @@ { "groupId": "androidx.window", "artifactId": "window-java", - "version": "1.0.0-beta02", - "nugetVersion": "1.0.0.3-beta02", + "version": "1.0.0-beta04", + "nugetVersion": "1.0.0.4-beta04", "nugetId": "Xamarin.AndroidX.Window.WindowJava", "dependencyOnly": false }, @@ -1350,8 +1350,8 @@ { "groupId": "com.google.code.gson", "artifactId": "gson", - "version": "2.8.8", - "nugetVersion": "2.8.8.2", + "version": "2.8.9", + "nugetVersion": "2.8.9", "nugetId": "GoogleGson", "dependencyOnly": false, "templateSet": "gson" @@ -1476,6 +1476,15 @@ "dependencyOnly": false, "templateSet": "kotlinx" }, + { + "groupId": "org.jetbrains.kotlinx", + "artifactId": "kotlinx-coroutines-guava", + "version": "1.5.2", + "nugetVersion": "1.5.2", + "nugetId": "Xamarin.KotlinX.Coroutines.Guava", + "dependencyOnly": false, + "templateSet": "kotlinx" + }, { "groupId": "org.jetbrains.kotlinx", "artifactId": "kotlinx-coroutines-jdk8", @@ -1503,15 +1512,6 @@ "dependencyOnly": false, "templateSet": "kotlinx" }, - { - "groupId": "org.jetbrains.kotlinx", - "artifactId": "kotlinx-coroutines-guava", - "version": "1.5.0", - "nugetVersion": "1.5.0", - "nugetId": "Xamarin.KotlinX.Coroutines.Guava", - "dependencyOnly": false, - "templateSet": "kotlinx" - }, { "groupId": "org.reactivestreams", "artifactId": "reactive-streams", @@ -1521,14 +1521,6 @@ "dependencyOnly": false, "templateSet": "reactive-streams" }, - { - "groupId": "com.google.firebase", - "artifactId": "firebase-appindexing", - "version": "20.0.0", - "nugetVersion": "120.0.0.2", - "nugetId": "Xamarin.Firebase.AppIndexing", - "dependencyOnly": true - }, { "groupId": "com.google.android.gms", "artifactId": "play-services-basement", @@ -1545,6 +1537,14 @@ "nugetId": "Xamarin.GooglePlayServices.Wearable", "dependencyOnly": true }, + { + "groupId": "com.google.firebase", + "artifactId": "firebase-appindexing", + "version": "20.0.0", + "nugetVersion": "120.0.0.2", + "nugetId": "Xamarin.Firebase.AppIndexing", + "dependencyOnly": true + }, { "groupId": "com.google.guava", "artifactId": "failureaccess", @@ -1691,4 +1691,4 @@ } ] } -] \ No newline at end of file +] diff --git a/mappings/androidx-assemblies.csv b/mappings/androidx-assemblies.csv index d2b389c79..84902eb91 100644 --- a/mappings/androidx-assemblies.csv +++ b/mappings/androidx-assemblies.csv @@ -1,14 +1,14 @@ 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.11 Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,2.1.0.11 -Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,2.3.1.3 +Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,2.4.0 Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,2.2.0.10 -Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,2.3.1.3 -Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.3.1.3 -Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.3.1.3 -Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,2.3.1.3 -Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,2.3.1.4 -Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,2.3.1.3 +Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,2.4.0 +Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.4.0 +Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.4.0 +Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,2.4.0 +Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,2.4.0 +Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,2.4.0 Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,2.1.0.10 Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,2.1.0.10 Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,1.2.0.2 @@ -23,7 +23,7 @@ Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,Xamarin.Andro Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,22.0.0.2 Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,1.0.0.10 Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,1.1.0.10 -Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,1.6.0.3 +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.1.2 Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,7.0.3 Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,7.0.3 diff --git a/mappings/androidx-mapping.csv b/mappings/androidx-mapping.csv index 07e4ae72f..1ed9a67f5 100644 --- a/mappings/androidx-mapping.csv +++ b/mappings/androidx-mapping.csv @@ -808,7 +808,7 @@ Android.Support.V4.Print,PrintHelper.IOnPrintFinishCallback,AndroidX.Print,Print Android.Support.V4.Print,PrintHelper.IOnPrintFinishCallbackInvoker,AndroidX.Print,PrintHelper.IOnPrintFinishCallbackInvoker,Xamarin.Android.Support.Print,Xamarin.AndroidX.Print,android.support.v4.print,PrintHelper.OnPrintFinishCallback,androidx.print,PrintHelper.OnPrintFinishCallback, ,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.HolderFragment. ,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.HolderFragment.HolderFragmentManager. -Android.Arch.Lifecycle,ProcessLifecycleOwnerInitializer,AndroidX.Lifecycle,ProcessLifecycleOwnerInitializer,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,android.arch.lifecycle,ProcessLifecycleOwnerInitializer,androidx.lifecycle,ProcessLifecycleOwnerInitializer, +,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.ProcessLifecycleOwnerInitializer. Android.Arch.Lifecycle,ServiceLifecycleDispatcher,AndroidX.Lifecycle,ServiceLifecycleDispatcher,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,android.arch.lifecycle,ServiceLifecycleDispatcher,androidx.lifecycle,ServiceLifecycleDispatcher, ,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.ServiceLifecycleDispatcher.DispatchRunnable. Android.Arch.Lifecycle,ViewModelStores,AndroidX.Lifecycle,ViewModelStores,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,android.arch.lifecycle,ViewModelStores,androidx.lifecycle,ViewModelStores, diff --git a/mappings/dependencies.json b/mappings/dependencies.json index 4fd99c4e9..10bc3127e 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -30,7 +30,8 @@ "Xamarin.AndroidX.Lifecycle.ViewModelSavedState", "Xamarin.AndroidX.Lifecycle.ViewModel", "Xamarin.AndroidX.SavedState", - "Xamarin.AndroidX.Tracing.Tracing" + "Xamarin.AndroidX.Tracing.Tracing", + "Xamarin.Kotlin.StdLib" ] }, { @@ -51,6 +52,7 @@ "Xamarin.AndroidX.Annotation.Experimental", "Xamarin.AndroidX.Annotation", "Xamarin.AndroidX.Collection", + "Xamarin.AndroidX.Concurrent.Futures", "Xamarin.AndroidX.Lifecycle.Runtime", "Xamarin.AndroidX.VersionedParcelable" ] @@ -76,7 +78,8 @@ { "id": "Xamarin.AndroidX.Lifecycle.ViewModel", "dependencies": [ - "Xamarin.AndroidX.Annotation" + "Xamarin.AndroidX.Annotation", + "Xamarin.Kotlin.StdLib" ] }, { @@ -93,6 +96,13 @@ "Xamarin.AndroidX.Annotation" ] }, + { + "id": "Xamarin.Kotlin.StdLib", + "dependencies": [ + "Xamarin.Jetbrains.Annotations", + "Xamarin.Kotlin.StdLib.Common" + ] + }, { "id": "Xamarin.AndroidX.Activity.Ktx", "dependencies": [ @@ -136,13 +146,6 @@ "Xamarin.Kotlin.StdLib" ] }, - { - "id": "Xamarin.Kotlin.StdLib", - "dependencies": [ - "Xamarin.Jetbrains.Annotations", - "Xamarin.Kotlin.StdLib.Common" - ] - }, { "id": "Xamarin.AndroidX.Ads.Identifier", "dependencies": [ @@ -1024,7 +1027,8 @@ { "id": "Xamarin.AndroidX.Lifecycle.Process", "dependencies": [ - "Xamarin.AndroidX.Lifecycle.Runtime" + "Xamarin.AndroidX.Lifecycle.Runtime", + "Xamarin.AndroidX.Startup.StartupRuntime" ] }, { @@ -1042,6 +1046,13 @@ "Xamarin.KotlinX.Coroutines.Core" ] }, + { + "id": "Xamarin.AndroidX.Startup.StartupRuntime", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Tracing.Tracing" + ] + }, { "id": "Xamarin.AndroidX.Lifecycle.ReactiveStreams", "dependencies": [ @@ -1283,13 +1294,6 @@ "Xamarin.Kotlin.StdLib" ] }, - { - "id": "Xamarin.AndroidX.Startup.StartupRuntime", - "dependencies": [ - "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Tracing.Tracing" - ] - }, { "id": "Xamarin.AndroidX.Recommendation", "dependencies": [ diff --git a/samples/BuildAll/BuildAll/BuildAll.csproj b/samples/BuildAll/BuildAll/BuildAll.csproj index b48072671..f180faac0 100644 --- a/samples/BuildAll/BuildAll/BuildAll.csproj +++ b/samples/BuildAll/BuildAll/BuildAll.csproj @@ -36,7 +36,7 @@ 4 True None - False + true d8 r8 diff --git a/samples/BuildAll/BuildAll/Properties/AndroidManifest.xml b/samples/BuildAll/BuildAll/Properties/AndroidManifest.xml index 2f6c0edb7..087e7e52f 100644 --- a/samples/BuildAll/BuildAll/Properties/AndroidManifest.xml +++ b/samples/BuildAll/BuildAll/Properties/AndroidManifest.xml @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/samples/BuildAll/ClassLibrary/ClassLibrary.csproj b/samples/BuildAll/ClassLibrary/ClassLibrary.csproj index c79da2934..afee6023f 100644 --- a/samples/BuildAll/ClassLibrary/ClassLibrary.csproj +++ b/samples/BuildAll/ClassLibrary/ClassLibrary.csproj @@ -16,7 +16,7 @@ True Resources\Resource.designer.cs Off - v10.0 + v11.0 true @@ -52,6 +52,24 @@ + + + 29.0.0 + + + 1.0.1.4 + + + 1.0.0.4 + + + + 1.6.0.3 + + \ No newline at end of file diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml index 4fa5cc994..d42856f97 100644 --- a/source/AndroidXProject.cshtml +++ b/source/AndroidXProject.cshtml @@ -236,4 +236,4 @@ } - + \ No newline at end of file diff --git a/source/androidx.activity/activity/Transforms/Metadata.ParameterNames.xml b/source/androidx.activity/activity/Transforms/Metadata.ParameterNames.xml index 8b1b7b24f..b405e57df 100644 --- a/source/androidx.activity/activity/Transforms/Metadata.ParameterNames.xml +++ b/source/androidx.activity/activity/Transforms/Metadata.ParameterNames.xml @@ -1,2 +1,3 @@  + context \ No newline at end of file diff --git a/source/androidx.core/core/Transforms/Metadata.Namespaces.xml b/source/androidx.core/core/Transforms/Metadata.Namespaces.xml index 3f1c6e6b1..325027809 100644 --- a/source/androidx.core/core/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.core/core/Transforms/Metadata.Namespaces.xml @@ -50,5 +50,12 @@ > AndroidX.Core.Telephony + + AndroidX.Core.App.UnusedAppRestrictions + + \ No newline at end of file diff --git a/source/androidx.core/core/Transforms/Metadata.TemporaryParameterNames.xml b/source/androidx.core/core/Transforms/Metadata.TemporaryParameterNames.xml new file mode 100644 index 000000000..d94d4caa7 --- /dev/null +++ b/source/androidx.core/core/Transforms/Metadata.TemporaryParameterNames.xml @@ -0,0 +1,3442 @@ + + + + packageName + id + tag + notification + packageName + id + tag + packageName + packageName + id + tag + notification + packageName + id + tag + packageName + obj + code + data + reply + flags + impl + packageName + id + tag + notification + packageName + id + tag + packageName + parcel + obj + parcel + parcel + obj + parcel + resultCode + resultData + resultCode + resultData + obj + code + data + reply + flags + impl + resultCode + resultData + handler + resultCode + resultData + resultCode + resultData + out + flags + in + size + size + in + resultCode + resultData + info + packageManager + feedbackType + flag + info + capability + delegate + activity + activity + intent + requestCode + options + activity + intent + requestCode + fillInIntent + flagsMask + flagsValues + extraFlags + options + activity + activity + activity + activity + id + activity + callback + activity + callback + activity + activity + activity + permissions + requestCode + activity + permission + activity + dragEvent + activity + activity + locusId + bundle + requestCode + permissions + grantResults + activity + permissions + requestCode + activity + requestCode + resultCode + data + requestCode + sharedElementNames + sharedElements + sharedElementSnapshots + sharedElementNames + sharedElements + sharedElementSnapshots + rejectedSharedElements + names + sharedElements + sharedElement + viewToGlobalMatrix + screenBounds + context + snapshot + sharedElementNames + sharedElements + listener + activityManager + context + enterResId + exitResId + source + startX + startY + startWidth + startHeight + source + startX + startY + width + height + source + thumbnail + startX + startY + activity + sharedElement + sharedElementName + activity + sharedElements + screenSpacePixelRect + otherOptions + receiver + otherOptions + receiver + screenSpacePixelRect + alarmManager + triggerTime + showIntent + operation + alarmManager + type + triggerAtMillis + operation + alarmManager + type + triggerAtMillis + operation + alarmManager + type + triggerAtMillis + operation + cl + className + intent + cl + className + cl + className + intent + cl + className + cl + className + intent + cl + className + cl + className + intent + cl + className + intent + cl + className + intent + cl + className + context + activity + permission + context + op + uid + packageName + context + op + uid + packageName + context + op + proxiedPackageName + context + op + proxiedPackageName + bundle + key + bundle + key + binder + bundle + key + bundle + key + binder + extraData + savedInstanceState + outState + extraDataClass + event + event + event + cl + className + intent + cl + className + cl + className + intent + cl + className + cl + className + intent + dialog + id + metricTypeFlags + activity + activity + activity + activity + window + frameMetrics + dropCountSinceLastInvocation + activity + activity + intent + flags + startId + intent + context + cls + jobId + work + context + component + jobId + work + intent + interruptIfStopped + params + aVoid + aVoid + aVoid + aVoid + params + params + params + sourceActivity + targetIntent + sourceActivity + sourceActivity + upIntent + sourceActivity + context + sourceActivityClass + context + componentName + sourceActivity + context + componentName + id + importance + name + importance + description + groupId + showBadge + sound + audioAttributes + lights + argb + vibration + vibrationPattern + parentChannelId + conversationId + id + name + description + notification + notification + notification + actionIndex + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + notification + icon + title + intent + icon + title + intent + action + icon + title + intent + icon + title + intent + action + extras + remoteInput + allowGeneratedReplies + semanticAction + isContextual + showsUserInterface + extender + builder + action + builder + availableOffline + label + label + label + hintLaunchesActivity + hintDisplayInline + builder + title + cs + b + b + builder + extras + extras + builder + title + cs + cs + builder + extras + extras + extras + flags + compatMetadata + platformMetadata + shortcutId + intent + icon + intent + icon + height + heightResId + shouldExpand + shouldSuppressNotif + deleteIntent + context + notification + context + channelId + context + when + show + icon + b + countsDown + icon + icon + level + silent + title + text + text + text + text + number + info + max + progress + indeterminate + views + intent + intent + intent + highPriority + tickerText + tickerText + views + icon + sound + sound + streamType + pattern + argb + onMs + offMs + ongoing + colorize + onlyAlertOnce + autoCancel + b + category + defaults + pri + uri + person + groupKey + isGroupSummary + sortKey + extras + extras + icon + title + intent + action + icon + title + intent + action + style + argb + visibility + n + contentView + contentView + contentView + channelId + durationMs + shortcutId + shortcutInfo + locusId + icon + groupAlertBehavior + data + extender + allowed + cs + notification + builder + color + largeIcon + unreadConversation + name + message + pendingIntent + remoteInput + pendingIntent + timestamp + builder + builder + builder + builder + builder + builder + title + cs + cs + builder + extras + extras + userDisplayName + user + conversationTitle + text + timestamp + sender + text + timestamp + person + message + message + isGroupConversation + notification + builder + extras + extras + extras + text + timestamp + person + text + timestamp + sender + dataMimeType + dataUri + builder + builder + builder + builder + builder + extras + extras + extras + notification + showSmallIcon + resId + fitIn1U + iconId + color + outerView + innerView + notification + builder + action + actions + intent + page + pages + background + icon + contentIconGravity + actionIndex + gravity + sizePreset + height + startScrollBottom + contentIntentAvailableOffline + hintHideIcon + hintShowBackgroundOnly + hintAvoidBackgroundClipping + timeout + hintAmbientBigPicture + hintContentIntentLaunchesActivity + dismissalId + bridgeTag + intent + packageName + id + tag + notification + packageName + id + tag + packageName + packageName + id + tag + notification + packageName + id + tag + packageName + context + id + tag + id + id + notification + tag + id + notification + channel + channel + group + group + channels + channels + groups + groups + channelId + groupId + channelIds + channelId + channelId + channelId + conversationId + channelId + conversationId + channelGroupId + channelGroupId + context + service + service + task + msg + componentName + iBinder + componentName + service + bundle + bundle + person + name + icon + uri + key + bot + important + icon + title + contentDescription + intent + other + remoteAction + enabled + shouldShowIcon + parcel + obj + parcel + intent + remoteInputResultKey + intent + remoteInputs + intent + results + remoteInput + intent + results + intent + source + intent + resultKey + label + choices + mimeType + doAllow + allowFreeFormTextInput + editChoicesBeforeSending + extras + service + flags + calledActivity + calledActivity + item + shareIntent + menu + menuItemId + shareIntent + launchingActivity + launchingContext + title + resId + mimeType + text + htmlText + streamUri + streamUri + addresses + address + addresses + addresses + address + addresses + addresses + address + addresses + subject + activity + activity + context + intent + index + sharedElementNames + sharedElements + sharedElementSnapshots + sharedElementNames + sharedElements + sharedElementSnapshots + rejectedSharedElements + names + sharedElements + sharedElement + viewToGlobalMatrix + screenBounds + context + snapshot + sharedElementNames + sharedElements + listener + context + context + nextIntent + nextIntent + sourceActivity + sourceActivityClass + sourceActivityName + index + index + options + requestCode + flags + requestCode + flags + options + provider + resolver + uri + projection + selection + selectionArgs + sortOrder + cancellationSignal + context + context + intents + context + intents + options + context + intent + options + context + context + context + type + context + context + id + context + id + context + id + context + permission + context + context + context + context + context + context + intent + context + serviceClass + context + serviceClass + context + info + context + authority + file + context + authority + file + displayName + uri + projection + selection + selectionArgs + sortOrder + uri + uri + values + uri + values + selection + selectionArgs + uri + selection + selectionArgs + uri + mode + file + uri + file + uri + selectorAction + selectorCategory + id + obj + locusId + mimeType + filter + mimeType + filters + mimeTypes + filter + mimeTypes + filter + context + permission + pid + uid + packageName + context + permission + context + permission + packageName + context + permission + editor + editor + info + packageManager + packageName + packageManager + packageName + certificatesAndType + matchExact + permissionInfo + permissionInfo + shortcuts + shortcuts + shortcutIds + shortcutIds + context + id + shortcutInfo + context + shortcutInfo + shortLabel + longLabel + disabledMessage + intent + intents + icon + locusId + activity + person + persons + categories + longLived + rank + extras + capability + capability + parameter + parameterValues + sliceUri + shortcuts + shortcutIds + shortcuts + shortcutIds + shortcutIds + shortcuts + context + context + shortcut + callback + context + shortcut + context + matchFlags + context + shortcutInfoList + context + context + context + context + context + shortcutId + context + shortcutInfoList + context + context + shortcutInfoList + context + shortcutIds + disabledMessage + context + shortcutInfoList + context + shortcutIds + context + context + shortcutIds + context + shortcut + context + intent + resources + resId + theme + r + parser + theme + r + parser + attrs + theme + color + stateSet + resources + resId + theme + resources + parser + resources + resources + certsId + entries + fileName + weight + italic + variationSettings + ttcIndex + resourceId + request + strategy + timeoutMs + systemFontFamilyName + request + strategy + timeoutMs + res + id + theme + res + id + density + theme + res + id + theme + res + id + theme + res + id + context + id + context + id + context + id + fontCallback + handler + context + id + value + style + fontCallback + o + typeface + reason + typeface + handler + reason + handler + handler + theme + parser + attrName + a + parser + attrName + resId + defaultValue + a + parser + attrName + resId + defaultValue + a + parser + attrName + resId + defaultValue + a + parser + attrName + resId + defaultValue + a + parser + theme + attrName + resId + defaultValue + a + parser + theme + attrName + resId + a + parser + attrName + resId + defaultValue + a + parser + attrName + resId + a + parser + attrName + resId + res + theme + set + attrs + a + index + fallbackIndex + defaultValue + a + index + fallbackIndex + a + index + fallbackIndex + defaultValue + a + index + fallbackIndex + defaultValue + a + index + fallbackIndex + a + index + fallbackIndex + a + index + fallbackIndex + context + attr + fallbackAttr + name + windowSizeBytes + a + b + originalValues + newValues + cursor + fillWindowForwardOnly + bitmap + bitmap + hasMipMap + bitmap + color + blendModeCompat + name + foreground + background + foreground + background + color + foreground + background + foreground + background + minContrastRatio + r + g + b + outHsl + color + outHsl + hsl + color + alpha + color + outLab + r + g + b + outLab + color + outXyz + r + g + b + outXyz + x + y + z + outLab + l + a + b + outXyz + x + y + z + l + a + b + labX + labY + color1 + color2 + ratio + hsl1 + hsl2 + ratio + outResult + lab1 + lab2 + ratio + outResult + left + top + right + bottom + r + a + b + a + b + a + b + a + b + o + insets + insets + paint + string + paint + blendMode + pathData + pathData + source + nodesFrom + nodesTo + target + source + target + from + to + fraction + node + path + nodeFrom + nodeTo + fraction + start + startFraction + end + endFraction + o + path + path + error + resources + id + style + context + entry + resources + id + style + fontCallback + handler + isRequestFromLayoutInflator + context + resources + id + path + style + context + cancellationSignal + fonts + style + context + family + style + fontCallback + typeface + reason + family + context + entry + resources + style + context + cancellationSignal + fonts + style + context + resources + id + path + style + fontFamily + fontFamily + fontFamily + fontFamily + fontFamily + fontFamily + family + fontFamily + fonts + style + context + is + context + cancellationSignal + fonts + style + context + familyEntry + resources + style + context + resources + id + path + style + context + context + cancellationSignal + uri + context + res + id + file + is + file + res + id + c + context + fonts + cancellationSignal + drawable + drawable + mirrored + drawable + drawable + x + y + drawable + left + top + right + bottom + drawable + tint + drawable + tint + drawable + tintMode + drawable + drawable + theme + drawable + drawable + drawable + drawable + res + parser + attrs + theme + drawable + drawable + drawable + layoutDirection + drawable + context + resId + r + pkg + resId + bits + bits + data + offset + length + uri + uri + uri + uri + tint + tintList + mode + context + context + context + context + outIntent + badge + c + isStream + bundle + context + icon + icon + icon + parcel + obj + parcel + canvas + metrics + density + gravity + mipMap + aa + filter + dither + canvas + alpha + cf + circular + cornerRadius + bounds + res + bitmap + res + filepath + res + is + mipMap + tint + tint + tintMode + drawable + context + displayId + category + context + crypto + flags + cancel + callback + handler + errMsgId + errString + helpMsgId + helpString + result + errMsgId + errString + helpMsgId + helpString + result + crypto + signature + cipher + mac + enabled + actionEnum + actionEnum + view + resId + actionProvider + contentDescription + tooltipText + numericChar + alphaChar + numericModifiers + alphaModifiers + numericChar + numericModifiers + alphaChar + alphaModifiers + tint + tintMode + tooltipText + contentDescription + gnssStatus + gpsStatus + satelliteIndex + satelliteIndex + satelliteIndex + satelliteIndex + satelliteIndex + satelliteIndex + satelliteIndex + satelliteIndex + satelliteIndex + satelliteIndex + satelliteIndex + satelliteIndex + ttffMillis + status + location + location + location + location + mock + locationManager + locationManager + provider + cancellationSignal + executor + consumer + locationManager + locationManager + locationManager + callback + handler + locationManager + executor + callback + locationManager + callback + location + location + timeoutMs + provider + status + extras + provider + p + location + ttffMillis + status + executor + event + command + executor + ttffMillis + status + value + min + max + value + min + max + value + min + max + value + min + max + cm + cm + intent + cm + uri + uri + uri + uri + operationCount + tag + operationCount + tag + socket + socket + socket + socket + uri + codename + buildCodename + listener + configuration + path + handler + command + looper + looper + callback + handler + r + token + delayMillis + handler + r + looper + looper + callback + handler + r + token + delayMillis + handler + r + localeList + localeList + localeList + index + locale + supportedLocales + list + other + message + async + message + message + in + out + value + callbacks + in + in + loader + size + in + loader + size + uid + sectionName + methodName + cookie + methodName + cookie + counterName + counterValue + uid + context + providerAuthority + providerPackage + query + certificates + providerAuthority + providerPackage + query + certificates + context + cancellationSignal + fonts + context + cancellationSignal + request + context + request + callback + handler + context + request + style + isBlockingFetch + timeout + handler + callback + context + request + fontCallback + handler + isBlockingFetch + timeout + style + context + fonts + cancellationSignal + packageManager + request + resources + statusCode + fonts + uri + ttcIndex + weight + italic + resultCode + typeface + reason + threadName + priority + destructAfterMillisec + callable + reply + callable + timeoutMillis + msg + value + subId + telephonyManager + telephonyManager + context + serviceInfo + rtlContext + locale + str + str + str + heuristic + isolate + str + heuristic + isolate + str + heuristic + str + heuristic + str + isolate + str + isolate + str + str + rtlContext + locale + stereoReset + heuristic + source + flags + source + flags + imageGetter + tagHandler + text + options + locale + text + params + paraIndex + paraIndex + charSequence + params + executor + what + start + end + flags + what + start + end + type + tag + tag + tag + start + limit + type + index + start + end + wrapped + other + o + paint + strategy + frequency + textDir + array + start + count + cs + start + count + cs + start + count + cs + start + count + cs + start + count + array + start + count + cs + start + count + s + locale + text + mask + text + mask + text + pattern + scheme + text + pattern + scheme + matchFilter + transformFilter + text + pattern + defaultScheme + schemes + matchFilter + transformFilter + text + pattern + scheme + spannable + pattern + scheme + matchFilter + transformFilter + spannable + pattern + defaultScheme + schemes + matchFilter + transformFilter + a + b + a + b + baseName + str + str + t + cls + out + tag + buf + offset + count + a + b + o + values + o + nullDefault + obj + obj + message + first + second + o + a + b + instance + maxPoolSize + instance + maxPoolSize + element + expression + expression + errorMessage + string + string + errorMessage + string + messageTemplate + messageArgs + reference + reference + errorMessage + expression + message + expression + requestedFlags + allowedFlags + value + errorMessage + value + value + lower + upper + valueName + t + duration + builder + duration + pw + fieldLen + duration + pw + time + now + pw + originalDelegate + host + eventType + host + event + host + event + host + event + host + event + host + info + host + child + event + host + host + action + args + host + event + host + event + host + info + host + event + host + child + event + host + eventType + host + event + host + host + action + args + context + forItem + subMenu + isVisible + listener + listener + isVisible + isVisible + itemPredicate + other + clip + source + clip + source + flags + linkUri + extras + context + display + context + display + context + display + safeInsets + boundingRects + safeInsets + boundLeft + boundTop + boundRight + boundBottom + waterfallInsets + o + activity + dragEvent + view + listener + v + event + v + point + v + v + event + v + helper + context + listener + context + listener + handler + event + enabled + listener + ev + enabled + listener + onDoubleTapListener + isLongpressEnabled + ev + msg + ev + enabled + listener + gravity + w + h + container + outRect + layoutDirection + gravity + w + h + container + xAdj + yAdj + outRect + layoutDirection + gravity + display + inoutObj + layoutDirection + gravity + layoutDirection + root + event + component + root + callback + event + event + inflater + factory + inflater + factory + inflater + name + context + attrs + parent + name + context + attributeSet + parent + name + context + attrs + lp + lp + lp + marginStart + lp + marginEnd + lp + lp + lp + layoutDirection + lp + layoutDirection + item + actionEnum + menu + enabled + item + actionEnum + item + view + item + resId + item + item + provider + item + item + item + item + item + listener + item + contentDescription + item + item + tooltipText + item + item + numericChar + alphaChar + numericModifiers + alphaModifiers + item + numericChar + numericModifiers + item + item + alphaChar + alphaModifiers + item + item + tint + item + item + tintMode + item + item + item + item + item + event + event + event + pointerId + event + pointerIndex + event + pointerIndex + event + pointerIndex + event + event + event + source + event + axis + event + axis + pointerIndex + event + enabled + axes + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + offsetInWindow + dx + dy + consumed + offsetInWindow + velocityX + velocityY + consumed + velocityX + velocityY + axes + type + type + type + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + offsetInWindow + type + dx + dy + consumed + offsetInWindow + type + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + offsetInWindow + type + consumed + view + enabled + type + axes + axes + type + type + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + offsetInWindow + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + offsetInWindow + type + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + offsetInWindow + type + consumed + dx + dy + consumed + offsetInWindow + dx + dy + consumed + offsetInWindow + type + velocityX + velocityY + consumed + velocityX + velocityY + child + child + target + axes + child + target + axes + target + target + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + target + dx + dy + consumed + target + velocityX + velocityY + consumed + target + velocityX + velocityY + child + target + axes + type + child + target + axes + type + target + type + target + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + type + target + dx + dy + consumed + type + target + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + type + consumed + viewGroup + child + target + axes + child + target + axes + type + target + target + type + v + insets + view + payload + payload + view + runnable + v + v + context + style + bitmap + hotSpotX + hotSpotY + resources + resourceId + scaleGestureDetector + enabled + scaleGestureDetector + enabled + scaleGestureDetector + scaleGestureDetector + tint + tintMode + tracker + pointerId + tracker + pointerId + view + context + styleable + attrs + t + defStyleAttr + defStyleRes + view + direction + view + direction + v + v + overScrollMode + v + event + v + event + v + info + v + delegate + v + autofillHints + v + v + mode + v + view + view + view + view + hasTransientState + view + view + left + top + right + bottom + view + action + view + action + delayMillis + view + view + mode + view + view + action + arguments + view + label + command + view + replacedAction + label + command + view + actionId + view + stateDescription + view + view + view + view + view + layerType + paint + view + view + view + labeledId + view + paint + view + view + layoutDirection + view + view + id + view + size + measureSpec + childMeasuredState + view + view + view + curState + newState + view + view + mode + view + view + view + start + top + end + bottom + view + view + view + view + view + view + view + view + view + value + view + value + view + value + view + value + view + value + view + value + view + value + view + value + view + value + view + value + view + view + value + view + view + value + view + view + view + view + view + view + view + view + elevation + view + view + translationZ + view + view + transitionName + view + view + view + viewGroup + enabled + v + view + fitSystemWindows + v + v + listener + view + insets + view + insets + view + rects + view + view + view + insets + outLocalInsets + view + view + callback + view + mimeTypes + listener + view + view + payload + v + enabled + view + activated + view + view + view + background + view + view + tintList + view + view + mode + view + enabled + view + view + axes + view + view + view + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + offsetInWindow + view + dx + dy + consumed + offsetInWindow + view + axes + type + view + type + view + type + view + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + offsetInWindow + type + consumed + view + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + offsetInWindow + type + view + dx + dy + consumed + offsetInWindow + type + view + velocityX + velocityY + consumed + view + velocityX + velocityY + view + view + view + view + view + z + view + offset + view + offset + view + clipBounds + view + view + view + view + indicators + view + indicators + mask + view + view + pointerIcon + view + view + tooltipText + v + data + shadowBuilder + localState + flags + v + v + shadowBuilder + view + view + nextClusterForwardId + view + view + isCluster + view + view + isFocusedByDefault + view + currentCluster + direction + view + views + direction + view + view + v + listener + v + listener + view + screenReaderFocusable + view + view + accessibilityPaneTitle + view + view + view + isHeading + payload + view + view + v + view + insets + v + view + v + event + v + event + config + config + config + context + config + context + config + config + context + group + child + event + group + split + group + group + mode + group + isTransitionGroup + group + group + parent + child + event + parent + child + target + nestedScrollAxes + parent + child + target + nestedScrollAxes + parent + target + parent + target + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + parent + target + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + type + parent + target + dx + dy + consumed + parent + child + target + nestedScrollAxes + type + parent + child + target + nestedScrollAxes + type + parent + target + type + parent + target + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + type + consumed + parent + target + dx + dy + consumed + type + parent + target + velocityX + velocityY + consumed + parent + target + velocityX + velocityY + parent + child + source + changeType + value + value + value + value + value + runnable + value + value + value + value + value + value + value + value + value + value + value + value + value + value + value + value + value + value + value + value + value + value + runnable + listener + listener + animation + animation + animation + valueAnimator + view + view + view + view + view + view + view + view + view + view + window + id + window + decorFitsSystemWindows + window + view + typeMask + interpolator + durationMillis + fraction + alpha + lowerBound + upperBound + insets + bounds + dispatchMode + animation + animation + bounds + insets + runningAnimations + animation + fraction + alpha + v + insets + animator + animator + fraction + view + callback + bounds + bounds + bounds + animation + animation + bounds + insets + runningAnimations + animation + controller + types + controller + controller + insets + alpha + fraction + shown + insets + alpha + fraction + insets + alpha + fraction + src + insets + insets + view + left + top + right + bottom + systemWindowInsets + insets + left + top + right + bottom + typeMask + typeMask + typeMask + o + v + insets + insets + insets + insets + insets + typeMask + insets + typeMask + insets + typeMask + visible + insets + displayCutout + o + insetsTypeMask + stableInsets + typeMask + typeMask + type + ignoreVisibility + type + insetsTypeMask + o + stableInsets + o + stableInsets + typeMask + typeMask + typeMask + window + view + insetsController + types + types + isLight + isLight + types + durationMillis + interpolator + cancellationSignal + listener + behavior + listener + listener + isLight + isLight + systemUiFlag + systemUiFlag + windowFlag + windowFlag + isLight + isLight + isLight + isLight + controller + types + controller + controller + controller + typeMask + controller + typeMask + originalClickableSpanId + nodeInfoCompat + clickableSpanActionId + unused + event + event + record + event + index + event + event + changeTypes + event + event + granularity + event + event + action + event + manager + listener + manager + listener + manager + manager + feedbackTypeFlags + manager + manager + listener + manager + listener + enabled + o + enabled + enabled + o + enabled + info + info + source + root + virtualDescendantId + info + source + root + virtualDescendantId + focus + direction + index + child + root + virtualDescendantId + child + root + virtualDescendantId + action + action + action + action + action + arguments + granularities + text + parent + root + virtualDescendantId + outBounds + bounds + outBounds + bounds + checkable + checked + focusable + focused + visibleToUser + focused + selected + clickable + longClickable + enabled + password + scrollable + important + packageName + className + text + text + view + text + contentDescription + stateDescription + viewId + mode + drawingOrderInParent + collectionInfo + collectionItemInfo + rangeInfo + contentInvalid + contextClickable + hintText + error + labeled + root + virtualDescendantId + label + root + virtualDescendantId + opensPopup + viewId + inputType + max + start + end + view + root + virtualDescendantId + view + root + virtualDescendantId + dismissable + editable + multiLine + tooltipText + paneTitle + screenReaderFocusable + showingHintText + isHeading + isTextEntryKey + roleDescription + delegatedInfo + obj + actionId + label + actionId + label + command + view + arguments + label + command + obj + rowCount + columnCount + hierarchical + selectionMode + rowCount + columnCount + hierarchical + rowIndex + rowSpan + columnIndex + columnSpan + heading + selected + rowIndex + rowSpan + columnIndex + columnSpan + heading + type + min + max + current + targetMap + index + region + provider + virtualViewId + virtualViewId + action + arguments + text + virtualViewId + focus + virtualViewId + info + extraDataKey + arguments + virtualViewId + text + virtualViewId + virtualViewId + action + arguments + focus + virtualViewId + info + extraDataKey + arguments + record + record + source + root + virtualDescendantId + record + root + virtualDescendantId + isChecked + isEnabled + isPassword + isFullScreen + scrollable + itemCount + currentItemIndex + fromIndex + toIndex + scrollX + scrollY + record + maxScrollX + record + maxScrollX + record + maxScrollY + record + maxScrollY + addedCount + removedCount + className + beforeText + contentDescription + parcelableData + obj + view + arguments + bundle + outBounds + index + info + obj + path + controlX + controlY + controlX1 + controlY1 + controlX2 + controlY2 + editorInfo + contentMimeTypes + editorInfo + editorInfo + sourceText + editorInfo + subText + subTextStart + editorInfo + length + flags + editorInfo + flags + editorInfo + length + flags + inputConnection + editorInfo + inputContentInfo + flags + opts + inputConnection + editorInfo + onCommitContentListener + inputContentInfo + flags + opts + action + data + inputContentInfo + flags + opts + contentUri + description + linkUri + inputContentInfo + target + enabled + exclusive + horizontalMax + verticalMax + horizontalMin + verticalMin + horizontal + vertical + type + horizontal + vertical + horizontalMax + verticalMax + delayMillis + durationMillis + durationMillis + v + event + deltaX + deltaY + direction + direction + durationMillis + durationMillis + x + y + autoSizeTextType + autoSizeMinTextSize + autoSizeMaxTextSize + autoSizeStepGranularity + unit + presetSizes + unit + textView + tint + textView + textView + tintMode + textView + textView + button + tint + button + button + tintMode + button + button + context + context + attrs + context + width + height + deltaDistance + deltaDistance + displacement + edgeEffect + deltaDistance + displacement + velocity + canvas + view + view + tintList + view + view + mode + listPopupWindow + src + listPopupWindow + src + target + deltaX + deltaY + direction + direction + listView + y + listView + direction + context + context + attrs + context + attrs + defStyleAttr + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + offsetInWindow + type + consumed + axes + type + type + type + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + offsetInWindow + type + dx + dy + consumed + offsetInWindow + type + enabled + axes + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + offsetInWindow + dx + dy + consumed + offsetInWindow + velocityX + velocityY + consumed + velocityX + velocityY + target + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + type + consumed + child + target + axes + type + child + target + axes + type + target + type + target + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + type + target + dx + dy + consumed + type + child + target + nestedScrollAxes + child + target + nestedScrollAxes + target + target + dxConsumed + dyConsumed + dxUnconsumed + dyUnconsumed + target + dx + dy + consumed + target + velocityX + velocityY + consumed + target + velocityX + velocityY + child + child + index + child + params + child + index + params + l + fillViewport + smoothScrollingEnabled + l + t + oldl + oldt + widthMeasureSpec + heightMeasureSpec + event + event + disallowIntercept + ev + ev + event + scrollX + scrollY + clampedX + clampedY + direction + direction + direction + dx + dy + dx + dy + scrollDurationMs + x + y + x + y + scrollDurationMs + child + parentWidthMeasureSpec + parentHeightMeasureSpec + child + parentWidthMeasureSpec + widthUsed + parentHeightMeasureSpec + heightUsed + rect + child + focused + direction + previouslyFocusedRect + child + rectangle + immediate + changed + l + t + r + b + w + h + oldw + oldh + velocityY + x + y + canvas + state + host + action + arguments + host + info + host + event + v + scrollX + scrollY + oldScrollX + oldScrollY + dest + flags + in + size + size + in + popupMenu + popup + anchor + xoff + yoff + gravity + popupWindow + overlapAnchor + popupWindow + popupWindow + layoutType + popupWindow + context + context + interpolator + startX + startY + dx + dy + startX + startY + dx + dy + duration + startX + startY + velocityX + velocityY + minX + maxX + minY + maxY + startX + startY + velocityX + velocityY + minX + maxX + minY + maxY + overX + overY + startX + startY + minX + maxX + minY + maxY + startX + finalX + overX + startY + finalY + overY + textView + start + top + end + bottom + textView + start + top + end + bottom + textView + start + top + end + bottom + textView + textView + textView + resId + textView + textView + autoSizeTextType + textView + autoSizeMinTextSize + autoSizeMaxTextSize + autoSizeStepGranularity + unit + textView + presetSizes + unit + textView + textView + textView + textView + textView + textView + callback + textView + callback + callback + textView + firstBaselineToTopHeight + textView + lastBaselineToBottomHeight + textView + textView + textView + lineHeight + textView + textView + params + textView + precomputed + textView + tint + textView + textView + tintMode + textView + mode + menu + mode + menu + mode + item + mode + view + payload + tint + tintMode + tint + tintMode + tint + tintMode + tint + tintMode + \ No newline at end of file diff --git a/source/androidx.lifecycle/lifecycle-process/Transforms/Metadata.xml b/source/androidx.lifecycle/lifecycle-process/Transforms/Metadata.xml index 88e9ecce3..fc7b641a6 100644 --- a/source/androidx.lifecycle/lifecycle-process/Transforms/Metadata.xml +++ b/source/androidx.lifecycle/lifecycle-process/Transforms/Metadata.xml @@ -1,10 +1,9 @@  - + \ No newline at end of file diff --git a/source/androidx.window/window/Transforms/Metadata.Namespaces.xml b/source/androidx.window/window/Transforms/Metadata.Namespaces.xml index c2a15f0c0..ccb3fb71e 100644 --- a/source/androidx.window/window/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.window/window/Transforms/Metadata.Namespaces.xml @@ -19,4 +19,11 @@ > AndroidX.Window.Core + + AndroidX.Window.Embedding + + \ No newline at end of file diff --git a/source/migration/BuildTasks/Xamarin.AndroidX.Migration.BuildTasks.csproj b/source/migration/BuildTasks/Xamarin.AndroidX.Migration.BuildTasks.csproj index 8dc29e2d3..90b839880 100644 --- a/source/migration/BuildTasks/Xamarin.AndroidX.Migration.BuildTasks.csproj +++ b/source/migration/BuildTasks/Xamarin.AndroidX.Migration.BuildTasks.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/source/migration/Migration/Xamarin.AndroidX.Migration.Core.csproj b/source/migration/Migration/Xamarin.AndroidX.Migration.Core.csproj index 152777839..6444bba23 100644 --- a/source/migration/Migration/Xamarin.AndroidX.Migration.Core.csproj +++ b/source/migration/Migration/Xamarin.AndroidX.Migration.Core.csproj @@ -7,7 +7,7 @@ - + diff --git a/source/migration/Tool/Xamarin.AndroidX.Migration.Tool.csproj b/source/migration/Tool/Xamarin.AndroidX.Migration.Tool.csproj index 8fd61038a..c025aa9f6 100644 --- a/source/migration/Tool/Xamarin.AndroidX.Migration.Tool.csproj +++ b/source/migration/Tool/Xamarin.AndroidX.Migration.Tool.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2;netcoreapp3.1 + netcoreapp3.1;net5.0 latest AndroidXMigrator androidx-migrator @@ -27,10 +27,10 @@ - - + + - + diff --git a/tests/AndroidXMigrationTests/Aarxercise.Binding.AndroidX/Aarxercise.Binding.AndroidX.csproj b/tests/AndroidXMigrationTests/Aarxercise.Binding.AndroidX/Aarxercise.Binding.AndroidX.csproj index 6ef81cbfb..28785b141 100644 --- a/tests/AndroidXMigrationTests/Aarxercise.Binding.AndroidX/Aarxercise.Binding.AndroidX.csproj +++ b/tests/AndroidXMigrationTests/Aarxercise.Binding.AndroidX/Aarxercise.Binding.AndroidX.csproj @@ -40,8 +40,8 @@ - - + + diff --git a/tests/AndroidXMigrationTests/Aarxercise.Managed.AndroidX/Aarxercise.Managed.AndroidX.csproj b/tests/AndroidXMigrationTests/Aarxercise.Managed.AndroidX/Aarxercise.Managed.AndroidX.csproj index c2fd03baa..cd93886e3 100644 --- a/tests/AndroidXMigrationTests/Aarxercise.Managed.AndroidX/Aarxercise.Managed.AndroidX.csproj +++ b/tests/AndroidXMigrationTests/Aarxercise.Managed.AndroidX/Aarxercise.Managed.AndroidX.csproj @@ -47,10 +47,10 @@ - - - - + + + + diff --git a/tests/AndroidXMigrationTests/Aarxercise.Old.AndroidX/Aarxercise.Old.AndroidX.csproj b/tests/AndroidXMigrationTests/Aarxercise.Old.AndroidX/Aarxercise.Old.AndroidX.csproj index 7aa9a6cea..9f51763af 100644 --- a/tests/AndroidXMigrationTests/Aarxercise.Old.AndroidX/Aarxercise.Old.AndroidX.csproj +++ b/tests/AndroidXMigrationTests/Aarxercise.Old.AndroidX/Aarxercise.Old.AndroidX.csproj @@ -44,7 +44,7 @@ - + diff --git a/tests/AndroidXMigrationTests/Aarxercise.Reference.AndroidX/Aarxercise.Reference.AndroidX.csproj b/tests/AndroidXMigrationTests/Aarxercise.Reference.AndroidX/Aarxercise.Reference.AndroidX.csproj index 82e1345ce..ca8433eab 100644 --- a/tests/AndroidXMigrationTests/Aarxercise.Reference.AndroidX/Aarxercise.Reference.AndroidX.csproj +++ b/tests/AndroidXMigrationTests/Aarxercise.Reference.AndroidX/Aarxercise.Reference.AndroidX.csproj @@ -40,7 +40,7 @@ - + diff --git a/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs b/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs index 1e6434076..49662acca 100644 --- a/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs +++ b/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs @@ -313,6 +313,9 @@ public void XamarinFormsTopLevelPackagesExpandToAll() "Xamarin.AndroidX.ViewPager2", "Xamarin.Google.Android.Material", "Xamarin.Google.Guava.ListenableFuture", + "Xamarin.Jetbrains.Annotations", + "Xamarin.Kotlin.StdLib", + "Xamarin.Kotlin.StdLib.Common", }; var tree = PackageDependencyTree.Load(); diff --git a/tests/AndroidXMigrationTests/Tests/Xamarin.AndroidX.Migration.Tests.csproj b/tests/AndroidXMigrationTests/Tests/Xamarin.AndroidX.Migration.Tests.csproj index 500c2e51f..34ea9c476 100644 --- a/tests/AndroidXMigrationTests/Tests/Xamarin.AndroidX.Migration.Tests.csproj +++ b/tests/AndroidXMigrationTests/Tests/Xamarin.AndroidX.Migration.Tests.csproj @@ -1,16 +1,16 @@  - netcoreapp3.1 + netcoreapp3.1;net5.0 false - - + + - runtime; build; native; contentfiles; analyzers; buildtransitive + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/utilities.cake b/utilities.cake index 9e7afd0a7..5bfe72b30 100644 --- a/utilities.cake +++ b/utilities.cake @@ -42,6 +42,7 @@ Task ("list-artifacts") lines1.Add(Environment.NewLine); lines2.Add(Environment.NewLine); lines2.Add(Environment.NewLine); + // | Maven Fully Qualified Artifact | NuGet Package | lines1.Add($@"|{space.PadRight(width1)}|{space.PadRight(width1)}|"); lines1.Add($@"|{dash.PadRight(width1, '-')}|{dash.PadRight(width1, '-')}|"); lines2.Add($@"|{space.PadRight(width1)}|{space.PadRight(width2)}|{space.PadRight(width1)}|{space.PadRight(width2)}|");