xamarin · mattleibow · Jun 20, 2019 · Jun 14, 2019 · Jun 18, 2019 · Jun 20, 2019
diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml
@@ -16,6 +16,16 @@
     <RootNamespace>@(Model.NuGetPackageId.Replace("Xamarin.", ""))</RootNamespace>
     <AndroidDexTool>d8</AndroidDexTool>
     <AndroidEnableDesugar>true</AndroidEnableDesugar>
+    <!--
+      No warnings for:
+       - CS0618: 'member' is obsolete: 'text'
+       - CS0109: The member 'member' does not hide an inherited member. The new keyword is not required
+       - CS0114: 'function1' hides inherited member 'function2'. To make the current method override that implementation, add the override keyword. Otherwise add the new keyword.
+       - CS0628: 'member' : new protected member declared in sealed class
+       - CS0108: 'member1' hides inherited member 'member2'. Use the new keyword if hiding was intended.
+       - CS0809: Obsolete member 'member' overrides non-obsolete member 'member'
+    -->
+    <NoWarn>0618;0109;0114;0628;0108;0809</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/source/Metadata.common.xml b/source/Metadata.common.xml
@@ -1,3 +1,3 @@
 <metadata>
-    <remove-node path="/api/package/class[contains(@name, 'IcsImpl') or contains(@name, 'JellyBeanImpl') or contains(@name, 'JellyBeanMr2Impl') or contains(@name, 'Api16') or contains(@name, 'Api17') or contains(@name, 'Api18') or contains(@name, 'Api19') or contains(@name, 'Api20') or contains(@name, 'Api21') or contains(@name, 'Api22') or contains(@name, 'Api23') or contains(@name, 'Api24') or contains(@name, 'Api25') or contains(@name, 'Api26') or contains(@name, 'Api27') or contains(@name, 'Api28') or contains(@name, 'Api29') or contains(@name, 'Api30') or contains(@name, 'Honeycomb') or contains(@name, 'IceCreamSandwich') or contains(@name, 'Jellybean') or contains(@name, 'KitKat') or contains(@name, 'Lollipop') or contains(@name, 'Marshmallow') or contains(@name, 'Nougat') or contains(@name, 'Oreo') or contains(@name, 'ImplJB') or contains(@name, 'ImplICS') or contains(@name, 'ImplIcs') or contains(@name, 'ImplHC') or contains(@name, 'HcMr1') or contains(@name, 'HcMr2') or contains(@name, 'HcMr3') or contains(@name, 'JbMr2') or contains(@name, 'JbMr2') or contains(@name, 'JbMr1') or contains(@name, 'ICSMr1') or contains(@name, 'ICSMr2') or contains(@name, 'ImplV11') or contains(@name, 'ImplV21')]" />
+    <remove-node path="/api/package/*[contains(@name, 'IcsImpl') or contains(@name, 'JellyBeanImpl') or contains(@name, 'JellyBeanMr2Impl') or contains(@name, 'Api16') or contains(@name, 'Api17') or contains(@name, 'Api18') or contains(@name, 'Api19') or contains(@name, 'Api20') or contains(@name, 'Api21') or contains(@name, 'Api22') or contains(@name, 'Api23') or contains(@name, 'Api24') or contains(@name, 'Api25') or contains(@name, 'Api26') or contains(@name, 'Api27') or contains(@name, 'Api28') or contains(@name, 'Api29') or contains(@name, 'Api30') or contains(@name, 'Honeycomb') or contains(@name, 'IceCreamSandwich') or contains(@name, 'Jellybean') or contains(@name, 'KitKat') or contains(@name, 'Lollipop') or contains(@name, 'Marshmallow') or contains(@name, 'Nougat') or contains(@name, 'Oreo') or contains(@name, 'ImplJB') or contains(@name, 'ImplICS') or contains(@name, 'ImplIcs') or contains(@name, 'ImplHC') or contains(@name, 'HcMr1') or contains(@name, 'HcMr2') or contains(@name, 'HcMr3') or contains(@name, 'JbMr2') or contains(@name, 'JbMr2') or contains(@name, 'JbMr1') or contains(@name, 'ICSMr1') or contains(@name, 'ICSMr2') or contains(@name, 'ImplV11') or contains(@name, 'ImplV21')]" />
 </metadata>
diff --git a/source/androidx.appcompat/appcompat/transforms/Metadata.xml b/source/androidx.appcompat/appcompat/transforms/Metadata.xml
@@ -105,12 +105,12 @@
     <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.OnMenuVisibilityListener']/method[@name='onMenuVisibilityChanged' and count(parameter)=1 and parameter[1][@type='boolean']]/parameter[1]" name="managedName">isVisible</attr>
     <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.OnNavigationListener']/method[@name='onNavigationItemSelected' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='long']]/parameter[1]" name="managedName">itemPosition</attr>
     <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.OnNavigationListener']/method[@name='onNavigationItemSelected' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='long']]/parameter[1]" name="managedName">itemId</attr>
-    <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.TabListener']/method[@name='onTabReselected' and count(parameter)=2 and parameter[1][@type='androidx.appcompat.app.ActionBar.Tab'] and parameter[2][@type='androidx.core.app.FragmentTransaction']]/parameter[1]" name="managedName">tab</attr>
-    <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.TabListener']/method[@name='onTabReselected' and count(parameter)=2 and parameter[1][@type='androidx.appcompat.app.ActionBar.Tab'] and parameter[2][@type='androidx.core.app.FragmentTransaction']]/parameter[2]" name="managedName">ft</attr>
-    <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.TabListener']/method[@name='onTabSelected' and count(parameter)=2 and parameter[1][@type='androidx.appcompat.app.ActionBar.Tab'] and parameter[2][@type='androidx.core.app.FragmentTransaction']]/parameter[1]" name="managedName">tab</attr>
-    <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.TabListener']/method[@name='onTabSelected' and count(parameter)=2 and parameter[1][@type='androidx.appcompat.app.ActionBar.Tab'] and parameter[2][@type='androidx.core.app.FragmentTransaction']]/parameter[2]" name="managedName">ft</attr>
-    <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.TabListener']/method[@name='onTabUnselected' and count(parameter)=2 and parameter[1][@type='androidx.appcompat.app.ActionBar.Tab'] and parameter[2][@type='androidx.core.app.FragmentTransaction']]/parameter[1]" name="managedName">tab</attr>
-    <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.TabListener']/method[@name='onTabUnselected' and count(parameter)=2 and parameter[1][@type='androidx.appcompat.app.ActionBar.Tab'] and parameter[2][@type='androidx.core.app.FragmentTransaction']]/parameter[2]" name="managedName">ft</attr>
+    <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.TabListener']/method[@name='onTabReselected' and count(parameter)=2 and parameter[1][@type='androidx.appcompat.app.ActionBar.Tab'] and parameter[2][@type='androidx.fragment.app.FragmentTransaction']]/parameter[1]" name="managedName">tab</attr>
+    <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.TabListener']/method[@name='onTabReselected' and count(parameter)=2 and parameter[1][@type='androidx.appcompat.app.ActionBar.Tab'] and parameter[2][@type='androidx.fragment.app.FragmentTransaction']]/parameter[2]" name="managedName">ft</attr>
+    <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.TabListener']/method[@name='onTabSelected' and count(parameter)=2 and parameter[1][@type='androidx.appcompat.app.ActionBar.Tab'] and parameter[2][@type='androidx.fragment.app.FragmentTransaction']]/parameter[1]" name="managedName">tab</attr>
+    <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.TabListener']/method[@name='onTabSelected' and count(parameter)=2 and parameter[1][@type='androidx.appcompat.app.ActionBar.Tab'] and parameter[2][@type='androidx.fragment.app.FragmentTransaction']]/parameter[2]" name="managedName">ft</attr>
+    <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.TabListener']/method[@name='onTabUnselected' and count(parameter)=2 and parameter[1][@type='androidx.appcompat.app.ActionBar.Tab'] and parameter[2][@type='androidx.fragment.app.FragmentTransaction']]/parameter[1]" name="managedName">tab</attr>
+    <attr path="/api/package[@name='androidx.appcompat.app']/interface[@name='ActionBar.TabListener']/method[@name='onTabUnselected' and count(parameter)=2 and parameter[1][@type='androidx.appcompat.app.ActionBar.Tab'] and parameter[2][@type='androidx.fragment.app.FragmentTransaction']]/parameter[2]" name="managedName">ft</attr>
     <attr path="/api/package[@name='androidx.appcompat.widget']/interface[@name='ActionMenuView.OnMenuItemClickListener']/method[@name='onMenuItemClick' and count(parameter)=1 and parameter[1][@type='android.view.MenuItem']]/parameter[1]" name="managedName">item</attr>
     <attr path="/api/package[@name='androidx.appcompat.widget']/interface[@name='PopupMenu.OnDismissListener']/method[@name='onDismiss' and count(parameter)=1 and parameter[1][@type='androidx.appcompat.widget.PopupMenu']]/parameter[1]" name="managedName">menu</attr>
     <attr path="/api/package[@name='androidx.appcompat.widget']/interface[@name='PopupMenu.OnMenuItemClickListener']/method[@name='onMenuItemClick' and count(parameter)=1 and parameter[1][@type='android.view.MenuItem']]/parameter[1]" name="managedName">item</attr>

diff --git a/...e/androidx.asynclayoutinflater/asynclayoutinflater/transforms/Metadata.ParameterNames.xml b/...e/androidx.asynclayoutinflater/asynclayoutinflater/transforms/Metadata.ParameterNames.xml
@@ -1 +1,5 @@
-<metadata></metadata>
+<metadata>
+    <attr path="/api/package[@name='androidx.asynclayoutinflater.view']/interface[@name='AsyncLayoutInflater.OnInflateFinishedListener']/method[@name='onInflateFinished' and count(parameter)=3 and parameter[1][@type='android.view.View'] and parameter[2][@type='int'] and parameter[3][@type='android.view.ViewGroup']]/parameter[1]" name="managedName">view</attr>
+    <attr path="/api/package[@name='androidx.asynclayoutinflater.view']/interface[@name='AsyncLayoutInflater.OnInflateFinishedListener']/method[@name='onInflateFinished' and count(parameter)=3 and parameter[1][@type='android.view.View'] and parameter[2][@type='int'] and parameter[3][@type='android.view.ViewGroup']]/parameter[2]" name="managedName">resid</attr>
+    <attr path="/api/package[@name='androidx.asynclayoutinflater.view']/interface[@name='AsyncLayoutInflater.OnInflateFinishedListener']/method[@name='onInflateFinished' and count(parameter)=3 and parameter[1][@type='android.view.View'] and parameter[2][@type='int'] and parameter[3][@type='android.view.ViewGroup']]/parameter[3]" name="managedName">parent</attr>
+</metadata>
diff --git a/source/androidx.asynclayoutinflater/asynclayoutinflater/transforms/Metadata.xml b/source/androidx.asynclayoutinflater/asynclayoutinflater/transforms/Metadata.xml
@@ -1,5 +1 @@
-<metadata>
-    <attr path="/api/package[@name='androidx.customview.view']/interface[@name='AsyncLayoutInflater.OnInflateFinishedListener']/method[@name='onInflateFinished' and count(parameter)=3 and parameter[1][@type='android.view.View'] and parameter[2][@type='int'] and parameter[3][@type='android.view.ViewGroup']]/parameter[1]" name="managedName">view</attr>
-    <attr path="/api/package[@name='androidx.customview.view']/interface[@name='AsyncLayoutInflater.OnInflateFinishedListener']/method[@name='onInflateFinished' and count(parameter)=3 and parameter[1][@type='android.view.View'] and parameter[2][@type='int'] and parameter[3][@type='android.view.ViewGroup']]/parameter[2]" name="managedName">resid</attr>
-    <attr path="/api/package[@name='androidx.customview.view']/interface[@name='AsyncLayoutInflater.OnInflateFinishedListener']/method[@name='onInflateFinished' and count(parameter)=3 and parameter[1][@type='android.view.View'] and parameter[2][@type='int'] and parameter[3][@type='android.view.ViewGroup']]/parameter[3]" name="managedName">parent</attr>
-</metadata>
+<metadata></metadata>
diff --git a/source/androidx.constraintlayout/constraintlayout-solver/Transforms/Metadata.Namespaces.xml b/source/androidx.constraintlayout/constraintlayout-solver/Transforms/Metadata.Namespaces.xml
@@ -7,7 +7,6 @@
         Package
     </attr>
     -->
-    <attr path="/api/package[@name='androidx.constraintlayout.widget']" name="managedName">AndroidX.ConstraintLayout.Widget</attr>
     <attr path="/api/package[@name='androidx.constraintlayout.solver']" name="managedName">AndroidX.ConstraintLayout.Solver</attr>
     <attr path="/api/package[@name='androidx.constraintlayout.solver.widgets']" name="managedName">AndroidX.ConstraintLayout.Solver.Widgets</attr>
 </metadata>
diff --git a/source/androidx.constraintlayout/constraintlayout-solver/Transforms/Metadata.xml b/source/androidx.constraintlayout/constraintlayout-solver/Transforms/Metadata.xml
@@ -0,0 +1,11 @@
+<metadata>
+    <attr path="/api/package[@name='androidx.constraintlayout.solver.widgets']/class[@name='ConstraintAnchor']/method[@name='getType' and count(parameter)=0]" name="managedName">GetAnchorType</attr>
+
+    <attr path="/api/package[@name='androidx.constraintlayout.solver.widgets']/class[@name='Guideline']/field[@name='RELATIVE_END']" name="managedName">RELATIVE_END</attr>
+    <attr path="/api/package[@name='androidx.constraintlayout.solver.widgets']/class[@name='Guideline']/field[@name='RELATIVE_BEGIN']" name="managedName">RELATIVE_BEGIN</attr>
+    <attr path="/api/package[@name='androidx.constraintlayout.solver.widgets']/class[@name='Guideline']/field[@name='RELATIVE_PERCENT']" name="managedName">RELATIVE_PERCENT</attr>
+    <!-- Yes, google typo'd this, we'll fix it, and eventually they probably will too -->
+    <attr path="/api/package[@name='androidx.constraintlayout.solver.widgets']/class[@name='Guideline']/field[@name='RELATIVE_UNKNWON']" name="managedName">RELATIVE_UNKNOWN</attr>
+    <attr path="/api/package[@name='androidx.constraintlayout.solver.widgets']/class[@name='Guideline']/field[@name='VERTICAL']" name="managedName">VERTICAL</attr>
+    <attr path="/api/package[@name='androidx.constraintlayout.solver.widgets']/class[@name='Guideline']/field[@name='HORIZONTAL']" name="managedName">HORIZONTAL</attr>
+</metadata>
diff --git a/source/androidx.constraintlayout/constraintlayout-solver/additions/Additions.cs b/source/androidx.constraintlayout/constraintlayout-solver/additions/Additions.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using Android.Runtime;
+
+namespace AndroidX.ConstraintLayout.Solver.Widgets
+{
+	public partial class ConstraintWidget
+	{
+		[Obsolete("Use MNextChainWidget instead.")]
+		protected IList<ConstraintWidget> MListNextVisibleWidget
+		{
+			get => MNextChainWidget;
+			set => MNextChainWidget = value;
+		}
+	}
+}
diff --git a/source/androidx.coordinatorlayout/coordinatorlayout/transforms/EnumMethods.xml b/source/androidx.coordinatorlayout/coordinatorlayout/transforms/EnumMethods.xml
@@ -1,5 +1 @@
-<enum-method-mappings>
-    <mapping jni-class="androidx/coordinatorlayout/widget/CoordinatorLayout">
-        <method jni-name="setVisibility" parameter="visibility" clr-enum-type="Android.Views.ViewStates" />
-    </mapping>
-</enum-method-mappings>
+<enum-method-mappings></enum-method-mappings>
diff --git a/source/androidx.coordinatorlayout/coordinatorlayout/transforms/Metadata.xml b/source/androidx.coordinatorlayout/coordinatorlayout/transforms/Metadata.xml
@@ -1,6 +1,11 @@
 <metadata>
+    <!--
+        Sad, but for backwards compatibility, we need to use Object
+        We could create a generic (like java) and then derive from the Object one, but for now just use Object
+        <attr path="//parameter[@type='V']" name="type">android.view.View</attr>
+    -->
     <attr path="/api/package[@name='androidx.coordinatorlayout.widget']/class[@name='CoordinatorLayout.ViewElevationComparator']/method[@name='compare' and count(parameter)=2 and parameter[1][@type='android.view.View'] and parameter[2][@type='android.view.View']]/parameter[1]" name="managedType">Java.Lang.Object</attr>
     <attr path="/api/package[@name='androidx.coordinatorlayout.widget']/class[@name='CoordinatorLayout.ViewElevationComparator']/method[@name='compare' and count(parameter)=2 and parameter[1][@type='android.view.View'] and parameter[2][@type='android.view.View']]/parameter[2]" name="managedType">Java.Lang.Object</attr>
+
     <attr path="/api/package[@name='androidx.coordinatorlayout.widget']/interface[@name='CoordinatorLayout.AttachedBehavior']/method[@name='getBehavior']" name="propertyName"></attr>
-    <attr path="//parameter[@type='V']" name="type">android.view.View</attr>
 </metadata>
diff --git a/source/androidx.core/core/additions/Additions.cs b/source/androidx.core/core/additions/Additions.cs
@@ -2,48 +2,6 @@
 using System.Collections;
 using Android.Runtime;
 
-//namespace AndroidX.Core.Core
-//{
-//	public partial class ArrayMap
-//	{
-//		static Delegate cb_entrySet;
-//#pragma warning disable 0169
-//		static Delegate GetEntrySetHandler()
-//		{
-//			if (cb_entrySet == null)
-//				cb_entrySet = JNINativeWrapper.CreateDelegate((Func<IntPtr, IntPtr, IntPtr>)n_EntrySet);
-//			return cb_entrySet;
-//		}
-
-//		static IntPtr n_EntrySet(IntPtr jnienv, IntPtr native__this)
-//		{
-//			global::Android.Support.V4.Util.ArrayMap __this = global::Java.Lang.Object.GetObject<global::Android.Support.V4.Util.ArrayMap>(jnienv, native__this, JniHandleOwnership.DoNotTransfer);
-//			return global::Android.Runtime.JavaSet<global::Java.Util.IMapEntry>.ToLocalJniHandle(__this.EntrySet());
-//		}
-//#pragma warning restore 0169
-
-//		static IntPtr id_entrySet;
-//		// Metadata.xml XPath method reference: path="/api/package[@name='android.support.v4.util']/class[@name='ArrayMap']/method[@name='entrySet' and count(parameter)=0]"
-//		[Register("entrySet", "()Ljava/util/Set;", "GetEntrySetHandler")]
-//		public virtual unsafe global::System.Collections.ICollection EntrySet()
-//		{
-//			if (id_entrySet == IntPtr.Zero)
-//				id_entrySet = JNIEnv.GetMethodID(class_ref, "entrySet", "()Ljava/util/Set;");
-//			try
-//			{
-
-//				if (GetType() == ThresholdType)
-//					return (ICollection)global::Android.Runtime.JavaSet<global::Java.Util.IMapEntry>.FromJniHandle(JNIEnv.CallObjectMethod(Handle, id_entrySet), JniHandleOwnership.TransferLocalRef);
-//				else
-//					return (ICollection)global::Android.Runtime.JavaSet<global::Java.Util.IMapEntry>.FromJniHandle(JNIEnv.CallNonvirtualObjectMethod(Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "entrySet", "()Ljava/util/Set;")), JniHandleOwnership.TransferLocalRef);
-//			}
-//			finally
-//			{
-//			}
-//		}
-//	}
-//}
-
 namespace AndroidX.Core.Text
 {
 	public partial class PrecomputedTextCompat
@@ -60,6 +18,3 @@ public System.Collections.Generic.IEnumerator<char> GetEnumerator()
 		}
 	}
 }
-
-
-
diff --git a/source/androidx.core/core/transforms/EnumMethods.xml b/source/androidx.core/core/transforms/EnumMethods.xml
@@ -1,12 +1,7 @@
 <enum-method-mappings>
     <mapping jni-interface="androidx/core/app/ActivityCompat$OnRequestPermissionsResultCallback">
-        <method jni-name="onRequestPermissionsResult" parameter="grantResults" clr-enum-type="Android.Content.PM.Permission[]" />
         <method jni-name="onRequestPermissionsResult" parameter="p2" clr-enum-type="Android.Content.PM.Permission[]" />
     </mapping>
-    <!-- Manually did JNI for this as it's not generated properly, but maybe in the future? -->
-    <!--	<mapping jni-class="androidx/core/app/FragmentActivity">
-		<method jni-name="onRequestPermissionsResult" parameter="grantResults" clr-enum-type="Android.Content.PM.Permission" />
-	</mapping>-->
     <mapping jni-class="androidx/core/content/ContextCompat">
         <method jni-name="checkSelfPermission" parameter="return" clr-enum-type="Android.Content.PM.Permission" />
     </mapping>
@@ -18,16 +13,12 @@
     </mapping>
     <mapping jni-interface="androidx/core/view/NestedScrollingChild">
         <method jni-name="startNestedScroll" parameter="p0" clr-enum-type="Android.Views.ScrollAxis" />
-        <method jni-name="startNestedScroll" parameter="axes" clr-enum-type="Android.Views.ScrollAxis" />
     </mapping>
     <mapping jni-interface="androidx/core/view/NestedScrollingChild2">
         <method jni-name="startNestedScroll" parameter="p0" clr-enum-type="Android.Views.ScrollAxis" />
-        <method jni-name="startNestedScroll" parameter="axes" clr-enum-type="Android.Views.ScrollAxis" />
     </mapping>
     <mapping jni-interface="androidx/core/view/NestedScrollingParent">
-        <method jni-name="onNestedScrollAccepted" parameter="nestedScrollAxes" clr-enum-type="Android.Views.ScrollAxis" />
         <method jni-name="onNestedScrollAccepted" parameter="p2" clr-enum-type="Android.Views.ScrollAxis" />
-        <method jni-name="onStartNestedScroll" parameter="nestedScrollAxes" clr-enum-type="Android.Views.ScrollAxis" />
         <method jni-name="onStartNestedScroll" parameter="p2" clr-enum-type="Android.Views.ScrollAxis" />
         <method jni-name="getNestedScrollAxes" parameter="return" clr-enum-type="Android.Views.ScrollAxis" />
     </mapping>