Add [EditorBrowsable(EditorBrowsableState.Never)] to public classes/interfaces in XF.Internals (#806)

53 files changed, 99 insertions, 94 deletions

diff --git a/Xamarin.Forms.Core/ActionSheetArguments.cs b/Xamarin.Forms.Core/ActionSheetArguments.cs
index a7336027..c3f7e8a4 100644
--- a/Xamarin.Forms.Core/ActionSheetArguments.cs
+++ b/Xamarin.Forms.Core/ActionSheetArguments.cs
@@ -1,8 +1,10 @@
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Threading.Tasks;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class ActionSheetArguments
 	{
 		public ActionSheetArguments(string title, string cancel, string destruction, IEnumerable<string> buttons)
diff --git a/Xamarin.Forms.Core/AlertArguments.cs b/Xamarin.Forms.Core/AlertArguments.cs
index 4e172537..50fff7d0 100644
--- a/Xamarin.Forms.Core/AlertArguments.cs
+++ b/Xamarin.Forms.Core/AlertArguments.cs
@@ -1,7 +1,9 @@
+using System.ComponentModel;
 using System.Threading.Tasks;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class AlertArguments
 	{
 		public AlertArguments(string title, string message, string accept, string cancel)
diff --git a/Xamarin.Forms.Core/BindableObject.cs b/Xamarin.Forms.Core/BindableObject.cs
index 8ce583c6..e87282d9 100644
--- a/Xamarin.Forms.Core/BindableObject.cs
+++ b/Xamarin.Forms.Core/BindableObject.cs
@@ -648,6 +648,7 @@ namespace Xamarin.Forms
 	namespace Internals
 	{
 		[Flags]
+		[EditorBrowsable(EditorBrowsableState.Never)]
 		public enum SetValueFlags
 		{
 			None = 0,
diff --git a/Xamarin.Forms.Core/CustomKeyboard.cs b/Xamarin.Forms.Core/CustomKeyboard.cs
index daf0d241..87eb34ee 100644
--- a/Xamarin.Forms.Core/CustomKeyboard.cs
+++ b/Xamarin.Forms.Core/CustomKeyboard.cs
@@ -2,6 +2,7 @@ using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public sealed class CustomKeyboard : Keyboard
 	{
 		internal CustomKeyboard(KeyboardFlags flags)
@@ -10,7 +11,6 @@ namespace Xamarin.Forms.Internals
 		}
 
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public KeyboardFlags Flags { get; private set; }
 	}
 }
\ No newline at end of file
diff --git a/Xamarin.Forms.Core/DataTemplateExtensions.cs b/Xamarin.Forms.Core/DataTemplateExtensions.cs
index 06667557..3589fb01 100644
--- a/Xamarin.Forms.Core/DataTemplateExtensions.cs
+++ b/Xamarin.Forms.Core/DataTemplateExtensions.cs
@@ -2,9 +2,9 @@ using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class DataTemplateExtensions
 	{
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static object CreateContent(this DataTemplate self, object item, BindableObject container)
 		{
 			var selector = self as DataTemplateSelector;
diff --git a/Xamarin.Forms.Core/DelegateLogListener.cs b/Xamarin.Forms.Core/DelegateLogListener.cs
index ba0e9d1b..1c7d0eff 100644
--- a/Xamarin.Forms.Core/DelegateLogListener.cs
+++ b/Xamarin.Forms.Core/DelegateLogListener.cs
@@ -1,8 +1,10 @@
 using System;
+using System.ComponentModel;
 using Xamarin.Forms.Internals;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class DelegateLogListener : LogListener
 	{
 		readonly Action<string, string> _log;
diff --git a/Xamarin.Forms.Core/DeviceInfo.cs b/Xamarin.Forms.Core/DeviceInfo.cs
index 722ef504..f433a327 100644
--- a/Xamarin.Forms.Core/DeviceInfo.cs
+++ b/Xamarin.Forms.Core/DeviceInfo.cs
@@ -4,12 +4,12 @@ using System.Runtime.CompilerServices;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public abstract class DeviceInfo : INotifyPropertyChanged, IDisposable
 	{
 		DeviceOrientation _currentOrientation;
 		bool _disposed;
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public DeviceOrientation CurrentOrientation
 		{
 			get { return _currentOrientation; }
diff --git a/Xamarin.Forms.Core/DeviceOrientation.cs b/Xamarin.Forms.Core/DeviceOrientation.cs
index 58385af8..0f50db8a 100644
--- a/Xamarin.Forms.Core/DeviceOrientation.cs
+++ b/Xamarin.Forms.Core/DeviceOrientation.cs
@@ -1,5 +1,8 @@
+using System.ComponentModel;
+
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public enum DeviceOrientation
 	{
 		Portrait,
diff --git a/Xamarin.Forms.Core/DeviceOrientationExtensions.cs b/Xamarin.Forms.Core/DeviceOrientationExtensions.cs
index 9dc97694..fae2e76a 100644
--- a/Xamarin.Forms.Core/DeviceOrientationExtensions.cs
+++ b/Xamarin.Forms.Core/DeviceOrientationExtensions.cs
@@ -2,15 +2,14 @@ using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class DeviceOrientationExtensions
 	{
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static bool IsLandscape(this DeviceOrientation orientation)
 		{
 			return orientation == DeviceOrientation.Landscape || orientation == DeviceOrientation.LandscapeLeft || orientation == DeviceOrientation.LandscapeRight;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static bool IsPortrait(this DeviceOrientation orientation)
 		{
 			return orientation == DeviceOrientation.Portrait || orientation == DeviceOrientation.PortraitDown || orientation == DeviceOrientation.PortraitUp;
diff --git a/Xamarin.Forms.Core/EnumerableExtensions.cs b/Xamarin.Forms.Core/EnumerableExtensions.cs
index db9f8c90..985206d7 100644
--- a/Xamarin.Forms.Core/EnumerableExtensions.cs
+++ b/Xamarin.Forms.Core/EnumerableExtensions.cs
@@ -4,6 +4,7 @@ using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class EnumerableExtensions
 	{
 		public static IEnumerable<T> GetGesturesFor<T>(this IEnumerable<IGestureRecognizer> gestures, Func<T, bool> predicate = null) where T : GestureRecognizer
@@ -32,7 +33,6 @@ namespace Xamarin.Forms.Internals
 			yield return item;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static void ForEach<T>(this IEnumerable<T> enumeration, Action<T> action)
 		{
 			foreach (T item in enumeration)
@@ -41,7 +41,6 @@ namespace Xamarin.Forms.Internals
 			}
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static int IndexOf<T>(this IEnumerable<T> enumerable, T item)
 		{
 			if (enumerable == null)
@@ -59,7 +58,6 @@ namespace Xamarin.Forms.Internals
 			return -1;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static int IndexOf<T>(this IEnumerable<T> enumerable, Func<T, bool> predicate)
 		{
 			var i = 0;
@@ -74,7 +72,6 @@ namespace Xamarin.Forms.Internals
 			return -1;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static IEnumerable<T> Prepend<T>(this IEnumerable<T> enumerable, T item)
 		{
 			yield return item;
diff --git a/Xamarin.Forms.Core/EventArg.cs b/Xamarin.Forms.Core/EventArg.cs
index 64136349..d0b25085 100644
--- a/Xamarin.Forms.Core/EventArg.cs
+++ b/Xamarin.Forms.Core/EventArg.cs
@@ -1,7 +1,9 @@
 using System;
+using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class EventArg<T> : EventArgs
 	{
 		// Property variable
diff --git a/Xamarin.Forms.Core/ExpressionSearch.cs b/Xamarin.Forms.Core/ExpressionSearch.cs
index 002f654c..327be2ad 100644
--- a/Xamarin.Forms.Core/ExpressionSearch.cs
+++ b/Xamarin.Forms.Core/ExpressionSearch.cs
@@ -2,9 +2,9 @@ using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public abstract class ExpressionSearch
 	{
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static IExpressionSearch Default { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/Xamarin.Forms.Core/FileAccess.cs b/Xamarin.Forms.Core/FileAccess.cs
index e6c40fbe..418dfa9d 100644
--- a/Xamarin.Forms.Core/FileAccess.cs
+++ b/Xamarin.Forms.Core/FileAccess.cs
@@ -1,5 +1,8 @@
+using System.ComponentModel;
+
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public enum FileAccess
 	{
 		Read = 0x00000001,
diff --git a/Xamarin.Forms.Core/FileMode.cs b/Xamarin.Forms.Core/FileMode.cs
index b83861d4..fa278bae 100644
--- a/Xamarin.Forms.Core/FileMode.cs
+++ b/Xamarin.Forms.Core/FileMode.cs
@@ -1,5 +1,8 @@
+using System.ComponentModel;
+
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public enum FileMode
 	{
 		CreateNew = 1,
diff --git a/Xamarin.Forms.Core/FileShare.cs b/Xamarin.Forms.Core/FileShare.cs
index a23832b1..25bda2b3 100644
--- a/Xamarin.Forms.Core/FileShare.cs
+++ b/Xamarin.Forms.Core/FileShare.cs
@@ -1,8 +1,10 @@
 using System;
+using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
 	[Flags]
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public enum FileShare
 	{
 		None = 0,
diff --git a/Xamarin.Forms.Core/IDeserializer.cs b/Xamarin.Forms.Core/IDeserializer.cs
index e1380179..4ddfd3f1 100644
--- a/Xamarin.Forms.Core/IDeserializer.cs
+++ b/Xamarin.Forms.Core/IDeserializer.cs
@@ -1,8 +1,10 @@
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Threading.Tasks;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public interface IDeserializer
 	{
 		Task<IDictionary<string, object>> DeserializePropertiesAsync();
diff --git a/Xamarin.Forms.Core/IExpressionSearch.cs b/Xamarin.Forms.Core/IExpressionSearch.cs
index f4ee871c..7f8107b7 100644
--- a/Xamarin.Forms.Core/IExpressionSearch.cs
+++ b/Xamarin.Forms.Core/IExpressionSearch.cs
@@ -1,8 +1,10 @@
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq.Expressions;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public interface IExpressionSearch
 	{
 		List<T> FindObjects<T>(Expression expression) where T : class;
diff --git a/Xamarin.Forms.Core/IFontElement.cs b/Xamarin.Forms.Core/IFontElement.cs
index 39a618e3..a70b811c 100644
--- a/Xamarin.Forms.Core/IFontElement.cs
+++ b/Xamarin.Forms.Core/IFontElement.cs
@@ -1,5 +1,8 @@
+using System.ComponentModel;
+
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public interface IFontElement
 	{
 		//note to implementor: implement the properties publicly
diff --git a/Xamarin.Forms.Core/IIsolatedStorageFile.cs b/Xamarin.Forms.Core/IIsolatedStorageFile.cs
index 684d402c..f30e8433 100644
--- a/Xamarin.Forms.Core/IIsolatedStorageFile.cs
+++ b/Xamarin.Forms.Core/IIsolatedStorageFile.cs
@@ -1,9 +1,11 @@
 using System;
+using System.ComponentModel;
 using System.IO;
 using System.Threading.Tasks;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public interface IIsolatedStorageFile
 	{
 		Task CreateDirectoryAsync(string path);
diff --git a/Xamarin.Forms.Core/IPlatform.cs b/Xamarin.Forms.Core/IPlatform.cs
index 39c6423f..2ff02879 100644
--- a/Xamarin.Forms.Core/IPlatform.cs
+++ b/Xamarin.Forms.Core/IPlatform.cs
@@ -1,5 +1,8 @@
+using System.ComponentModel;
+
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public interface IPlatform
 	{
 		SizeRequest GetNativeSize(VisualElement view, double widthConstraint, double heightConstraint);
diff --git a/Xamarin.Forms.Core/IPlatformServices.cs b/Xamarin.Forms.Core/IPlatformServices.cs
index 89465eb1..73c4dcc6 100644
--- a/Xamarin.Forms.Core/IPlatformServices.cs
+++ b/Xamarin.Forms.Core/IPlatformServices.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.IO;
 using System.Reflection;
 using System.Threading;
@@ -7,6 +8,7 @@ using Xamarin.Forms.Internals;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public interface IPlatformServices
 	{
 		bool IsInvokeRequired { get; }
diff --git a/Xamarin.Forms.Core/IResourceDictionary.cs b/Xamarin.Forms.Core/IResourceDictionary.cs
index 6a145b03..606c6de1 100644
--- a/Xamarin.Forms.Core/IResourceDictionary.cs
+++ b/Xamarin.Forms.Core/IResourceDictionary.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public interface IResourceDictionary : IEnumerable<KeyValuePair<string, object>>
 	{
 		bool TryGetValue(string key, out object value);
diff --git a/Xamarin.Forms.Core/ISystemResourcesProvider.cs b/Xamarin.Forms.Core/ISystemResourcesProvider.cs
index 77a58415..db905ae0 100644
--- a/Xamarin.Forms.Core/ISystemResourcesProvider.cs
+++ b/Xamarin.Forms.Core/ISystemResourcesProvider.cs
@@ -1,5 +1,8 @@
+using System.ComponentModel;
+
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public interface ISystemResourcesProvider
 	{
 		IResourceDictionary GetSystemResources();
diff --git a/Xamarin.Forms.Core/Internals/CellExtensions.cs b/Xamarin.Forms.Core/Internals/CellExtensions.cs
index f15268b1..2cc05f64 100644
--- a/Xamarin.Forms.Core/Internals/CellExtensions.cs
+++ b/Xamarin.Forms.Core/Internals/CellExtensions.cs
@@ -1,7 +1,9 @@
 using System;
+using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class CellExtensions
 	{
 		public static bool GetIsGroupHeader<TView, TItem>(this TItem cell) where TView : BindableObject, ITemplatedItemsView<TItem> where TItem : BindableObject
diff --git a/Xamarin.Forms.Core/Internals/DynamicResource.cs b/Xamarin.Forms.Core/Internals/DynamicResource.cs
index 3724daec..1aa52af4 100644
--- a/Xamarin.Forms.Core/Internals/DynamicResource.cs
+++ b/Xamarin.Forms.Core/Internals/DynamicResource.cs
@@ -1,5 +1,8 @@
+using System.ComponentModel;
+
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class DynamicResource
 	{
 		public DynamicResource(string key)
diff --git a/Xamarin.Forms.Core/Internals/EffectUtilities.cs b/Xamarin.Forms.Core/Internals/EffectUtilities.cs
index 4fd1b73d..f066ca4e 100644
--- a/Xamarin.Forms.Core/Internals/EffectUtilities.cs
+++ b/Xamarin.Forms.Core/Internals/EffectUtilities.cs
@@ -1,5 +1,8 @@
+using System.ComponentModel;
+
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class EffectUtilities
 	{
 		public static void RegisterEffectControlProvider(IEffectControlProvider self, IElementController oldElement, IElementController newElement)
diff --git a/Xamarin.Forms.Core/Internals/EvalRequested.cs b/Xamarin.Forms.Core/Internals/EvalRequested.cs
index 0f697922..a8979f1a 100644
--- a/Xamarin.Forms.Core/Internals/EvalRequested.cs
+++ b/Xamarin.Forms.Core/Internals/EvalRequested.cs
@@ -1,7 +1,9 @@
 using System;
+using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class EvalRequested : EventArgs
 	{
 		public string Script { get; }
diff --git a/Xamarin.Forms.Core/Internals/IDataTemplate.cs b/Xamarin.Forms.Core/Internals/IDataTemplate.cs
index d6947ae8..48049336 100644
--- a/Xamarin.Forms.Core/Internals/IDataTemplate.cs
+++ b/Xamarin.Forms.Core/Internals/IDataTemplate.cs
@@ -1,8 +1,10 @@
 using System;
+using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
 	[Obsolete]
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public interface IDataTemplate
 	{
 		Func<object> LoadTemplate { get; set; }
diff --git a/Xamarin.Forms.Core/Internals/IDynamicResourceHandler.cs b/Xamarin.Forms.Core/Internals/IDynamicResourceHandler.cs
index 1885d8ab..cd79cf3b 100644
--- a/Xamarin.Forms.Core/Internals/IDynamicResourceHandler.cs
+++ b/Xamarin.Forms.Core/Internals/IDynamicResourceHandler.cs
@@ -1,5 +1,8 @@
+using System.ComponentModel;
+
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public interface IDynamicResourceHandler
 	{
 		void SetDynamicResource(BindableProperty property, string key);
diff --git a/Xamarin.Forms.Core/Internals/INameScope.cs b/Xamarin.Forms.Core/Internals/INameScope.cs
index 6485527b..7b0fcb35 100644
--- a/Xamarin.Forms.Core/Internals/INameScope.cs
+++ b/Xamarin.Forms.Core/Internals/INameScope.cs
@@ -1,8 +1,10 @@
 using System;
+using System.ComponentModel;
 using System.Xml;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public interface INameScope
 	{
 		object FindByName(string name);
diff --git a/Xamarin.Forms.Core/Internals/InvalidationTrigger.cs b/Xamarin.Forms.Core/Internals/InvalidationTrigger.cs
index 9a4180e4..e3ed4aff 100644
--- a/Xamarin.Forms.Core/Internals/InvalidationTrigger.cs
+++ b/Xamarin.Forms.Core/Internals/InvalidationTrigger.cs
@@ -1,8 +1,10 @@
 using System;
+using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
 	[Flags]
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public enum InvalidationTrigger
 	{
 		Undefined = 0,
diff --git a/Xamarin.Forms.Core/Internals/NameScope.cs b/Xamarin.Forms.Core/Internals/NameScope.cs
index 7bb5ff52..c32ca29e 100644
--- a/Xamarin.Forms.Core/Internals/NameScope.cs
+++ b/Xamarin.Forms.Core/Internals/NameScope.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Xml;
 using Xamarin.Forms.Xaml;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class NameScope : INameScope
 	{
 		public static readonly BindableProperty NameScopeProperty = BindableProperty.CreateAttached("NameScope", typeof(INameScope), typeof(NameScope), default(INameScope));
diff --git a/Xamarin.Forms.Core/Internals/NavigationRequestedEventArgs.cs b/Xamarin.Forms.Core/Internals/NavigationRequestedEventArgs.cs
index 32022f14..81a545cd 100644
--- a/Xamarin.Forms.Core/Internals/NavigationRequestedEventArgs.cs
+++ b/Xamarin.Forms.Core/Internals/NavigationRequestedEventArgs.cs
@@ -1,7 +1,9 @@
+using System.ComponentModel;
 using System.Threading.Tasks;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class NavigationRequestedEventArgs : NavigationEventArgs
 	{
 		public NavigationRequestedEventArgs(Page page, bool animated, bool realize = true) : base(page)
diff --git a/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsEx.cs b/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsEx.cs
index b398c7d9..73fdd77c 100644
--- a/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsEx.cs
+++ b/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsEx.cs
@@ -1,8 +1,10 @@
 using System.Collections;
 using System.Collections.Specialized;
+using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class NotifyCollectionChangedEventArgsEx : NotifyCollectionChangedEventArgs
 	{
 		public NotifyCollectionChangedEventArgsEx(int count, NotifyCollectionChangedAction action) : base(action)
diff --git a/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsExtensions.cs b/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsExtensions.cs
index 8b88dc38..b659ecf5 100644
--- a/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsExtensions.cs
+++ b/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsExtensions.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class NotifyCollectionChangedEventArgsExtensions
 	{
 		public static void Apply<TFrom>(this NotifyCollectionChangedEventArgs self, IList<TFrom> from, IList<object> to)
diff --git a/Xamarin.Forms.Core/Internals/PreserveAttribute.cs b/Xamarin.Forms.Core/Internals/PreserveAttribute.cs
index 0ba191e2..6cf09cd6 100644
--- a/Xamarin.Forms.Core/Internals/PreserveAttribute.cs
+++ b/Xamarin.Forms.Core/Internals/PreserveAttribute.cs
@@ -1,8 +1,10 @@
 using System;
+using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
 	[AttributeUsage(AttributeTargets.All)]
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class PreserveAttribute : Attribute
 	{
 		public bool AllMembers;
diff --git a/Xamarin.Forms.Core/Internals/Ticker.cs b/Xamarin.Forms.Core/Internals/Ticker.cs
index 9b7c575b..b0b62591 100644
--- a/Xamarin.Forms.Core/Internals/Ticker.cs
+++ b/Xamarin.Forms.Core/Internals/Ticker.cs
@@ -6,6 +6,7 @@ using System.Linq;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public abstract class Ticker
 	{
 		static Ticker s_ticker;
@@ -23,7 +24,6 @@ namespace Xamarin.Forms.Internals
 			_stopwatch = new Stopwatch();
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static void SetDefault(Ticker ticker) => Default = ticker;
 		public static Ticker Default
 		{
diff --git a/Xamarin.Forms.Core/Internals/ToolbarTracker.cs b/Xamarin.Forms.Core/Internals/ToolbarTracker.cs
index 69f275e8..cd43d584 100644
--- a/Xamarin.Forms.Core/Internals/ToolbarTracker.cs
+++ b/Xamarin.Forms.Core/Internals/ToolbarTracker.cs
@@ -7,6 +7,7 @@ using System.Linq;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class ToolbarTracker
 	{
 		int _masterDetails;
diff --git a/Xamarin.Forms.Core/LockableObservableListWrapper.cs b/Xamarin.Forms.Core/LockableObservableListWrapper.cs
index 6bfdb39a..abb0b1ff 100644
--- a/Xamarin.Forms.Core/LockableObservableListWrapper.cs
+++ b/Xamarin.Forms.Core/LockableObservableListWrapper.cs
@@ -10,6 +10,7 @@ using Xamarin.Forms.Platform;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class LockableObservableListWrapper : IList<string>, ICollection<string>, INotifyCollectionChanged, INotifyPropertyChanged, IReadOnlyList<string>, IReadOnlyCollection<string>, IEnumerable<string>, IEnumerable
 	{
 		public readonly ObservableCollection<string> _list = new ObservableCollection<string>();
diff --git a/Xamarin.Forms.Core/Log.cs b/Xamarin.Forms.Core/Log.cs
index 2e1c318c..21a2568b 100644
--- a/Xamarin.Forms.Core/Log.cs
+++ b/Xamarin.Forms.Core/Log.cs
@@ -1,7 +1,9 @@
 using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class Log
 	{
 		static Log()
diff --git a/Xamarin.Forms.Core/LogListener.cs b/Xamarin.Forms.Core/LogListener.cs
index 66777971..a25f3702 100644
--- a/Xamarin.Forms.Core/LogListener.cs
+++ b/Xamarin.Forms.Core/LogListener.cs
@@ -1,5 +1,8 @@
+using System.ComponentModel;
+
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public abstract class LogListener
 	{
 		public abstract void Warning(string category, string message);
diff --git a/Xamarin.Forms.Core/NativeBindingHelpers.cs b/Xamarin.Forms.Core/NativeBindingHelpers.cs
index ea577978..5a163972 100644
--- a/Xamarin.Forms.Core/NativeBindingHelpers.cs
+++ b/Xamarin.Forms.Core/NativeBindingHelpers.cs
@@ -10,9 +10,9 @@ using static System.String;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class NativeBindingHelpers
 	{
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static void SetBinding<TNativeView>(TNativeView target, string targetProperty, BindingBase bindingBase, string updateSourceEventName = null) where TNativeView : class
 		{
 			var binding = bindingBase as Binding;
@@ -26,7 +26,6 @@ namespace Xamarin.Forms.Internals
 			SetBinding(target, targetProperty, bindingBase, eventWrapper);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static void SetBinding<TNativeView>(TNativeView target, string targetProperty, BindingBase bindingBase, INotifyPropertyChanged propertyChanged) where TNativeView : class
 		{
 			if (target == null)
@@ -95,7 +94,6 @@ namespace Xamarin.Forms.Internals
 			bindable.SetValueCore(property, value);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static void SetBinding<TNativeView>(TNativeView target, BindableProperty targetProperty, BindingBase binding) where TNativeView : class
 		{
 			if (target == null)
@@ -109,7 +107,6 @@ namespace Xamarin.Forms.Internals
 			proxy.BindingsBackpack.Add(new KeyValuePair<BindableProperty, BindingBase>(targetProperty, binding));
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static void SetValue<TNativeView>(TNativeView target, BindableProperty targetProperty, object value) where TNativeView : class
 		{
 			if (target == null)
@@ -121,7 +118,6 @@ namespace Xamarin.Forms.Internals
 			proxy.ValuesBackpack.Add(new KeyValuePair<BindableProperty, object>(targetProperty, value));
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static void SetBindingContext<TNativeView>(TNativeView target, object bindingContext, Func<TNativeView, IEnumerable<TNativeView>> getChild = null) where TNativeView : class
 		{
 			if (target == null)
@@ -139,7 +135,6 @@ namespace Xamarin.Forms.Internals
 					SetBindingContext(child, bindingContext, getChild);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static void TransferBindablePropertiesToWrapper<TNativeView, TNativeWrapper>(TNativeView nativeView, TNativeWrapper wrapper)
 			where TNativeView : class
 			where TNativeWrapper : View
diff --git a/Xamarin.Forms.Core/NavigationMenu.cs b/Xamarin.Forms.Core/NavigationMenu.cs
index 3e9724fd..771e0a7f 100644
--- a/Xamarin.Forms.Core/NavigationMenu.cs
+++ b/Xamarin.Forms.Core/NavigationMenu.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using Xamarin.Forms.Platform;
 
@@ -7,6 +8,7 @@ namespace Xamarin.Forms.Internals
 {
 	// Mark as internal until renderers are ready for release after 1.0
 	[RenderWith(typeof(_NavigationMenuRenderer))]
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class NavigationMenu : View, INavigationMenuController, IElementConfiguration<NavigationMenu>
 	{
 		readonly List<Page> _targets = new List<Page>();
diff --git a/Xamarin.Forms.Core/NavigationModel.cs b/Xamarin.Forms.Core/NavigationModel.cs
index a3dab61e..987e801c 100644
--- a/Xamarin.Forms.Core/NavigationModel.cs
+++ b/Xamarin.Forms.Core/NavigationModel.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class NavigationModel
 	{
 		readonly List<Page> _modalStack = new List<Page>();
diff --git a/Xamarin.Forms.Core/NavigationProxy.cs b/Xamarin.Forms.Core/NavigationProxy.cs
index 0b686c07..9fc37875 100644
--- a/Xamarin.Forms.Core/NavigationProxy.cs
+++ b/Xamarin.Forms.Core/NavigationProxy.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class NavigationProxy : INavigation
 	{
 		INavigation _inner;
@@ -13,7 +14,6 @@ namespace Xamarin.Forms.Internals
 
 		Lazy<List<Page>> _pushStack = new Lazy<List<Page>>(() => new List<Page>());
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public INavigation Inner
 		{
 			get { return _inner; }
@@ -54,67 +54,56 @@ namespace Xamarin.Forms.Internals
 			}
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public void InsertPageBefore(Page page, Page before)
 		{
 			OnInsertPageBefore(page, before);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public IReadOnlyList<Page> ModalStack
 		{
 			get { return GetModalStack(); }
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public IReadOnlyList<Page> NavigationStack
 		{
 			get { return GetNavigationStack(); }
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Task<Page> PopAsync()
 		{
 			return OnPopAsync(true);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Task<Page> PopAsync(bool animated)
 		{
 			return OnPopAsync(animated);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Task<Page> PopModalAsync()
 		{
 			return OnPopModal(true);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Task<Page> PopModalAsync(bool animated)
 		{
 			return OnPopModal(animated);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Task PopToRootAsync()
 		{
 			return OnPopToRootAsync(true);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Task PopToRootAsync(bool animated)
 		{
 			return OnPopToRootAsync(animated);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Task PushAsync(Page root)
 		{
 			return PushAsync(root, true);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Task PushAsync(Page root, bool animated)
 		{
 			if (root.RealParent != null)
@@ -122,13 +111,11 @@ namespace Xamarin.Forms.Internals
 			return OnPushAsync(root, animated);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Task PushModalAsync(Page modal)
 		{
 			return PushModalAsync(modal, true);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Task PushModalAsync(Page modal, bool animated)
 		{
 			if (modal.RealParent != null)
@@ -136,7 +123,6 @@ namespace Xamarin.Forms.Internals
 			return OnPushModal(modal, animated);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public void RemovePage(Page page)
 		{
 			OnRemovePage(page);
diff --git a/Xamarin.Forms.Core/NumericExtensions.cs b/Xamarin.Forms.Core/NumericExtensions.cs
index fb7c78ae..f5fb5ded 100644
--- a/Xamarin.Forms.Core/NumericExtensions.cs
+++ b/Xamarin.Forms.Core/NumericExtensions.cs
@@ -3,16 +3,15 @@ using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class NumericExtensions
 	{
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static double Clamp(this double self, double min, double max)
 		{
 			return Math.Min(max, Math.Max(self, min));
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static int Clamp(this int self, int min, int max)
 		{
 			return Math.Min(max, Math.Max(self, min));
diff --git a/Xamarin.Forms.Core/Performance.cs b/Xamarin.Forms.Core/Performance.cs
index 2497b082..c44a02b4 100644
--- a/Xamarin.Forms.Core/Performance.cs
+++ b/Xamarin.Forms.Core/Performance.cs
@@ -8,18 +8,17 @@ using System.Text;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class Performance
 	{
 		static readonly Dictionary<string, Stats> Statistics = new Dictionary<string, Stats>();
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		[Conditional("PERF")]
 		public static void Clear()
 		{
 			Statistics.Clear();
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static void Count(string tag = null, [CallerFilePath] string path = null, [CallerMemberName] string member = null)
 		{
 			string id = path + ":" + member + (tag != null ? "-" + tag : string.Empty);
@@ -31,14 +30,12 @@ namespace Xamarin.Forms.Internals
 			stats.CallCount++;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		[Conditional("PERF")]
 		public static void DumpStats()
 		{
 			Debug.WriteLine(GetStats());
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static string GetStats()
 		{
 			var b = new StringBuilder();
@@ -54,7 +51,6 @@ namespace Xamarin.Forms.Internals
 			return b.ToString();
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		[Conditional("PERF")]
 		public static void Start(string tag = null, [CallerFilePath] string path = null, [CallerMemberName] string member = null)
 		{
@@ -68,7 +64,6 @@ namespace Xamarin.Forms.Internals
 			stats.StartTimes.Push(Stopwatch.GetTimestamp());
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		[Conditional("PERF")]
 		public static void Stop(string tag = null, [CallerFilePath] string path = null, [CallerMemberName] string member = null)
 		{
diff --git a/Xamarin.Forms.Core/ReflectionExtensions.cs b/Xamarin.Forms.Core/ReflectionExtensions.cs
index 7a8b98b0..c2b8082b 100644
--- a/Xamarin.Forms.Core/ReflectionExtensions.cs
+++ b/Xamarin.Forms.Core/ReflectionExtensions.cs
@@ -6,33 +6,29 @@ using System.Reflection;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class ReflectionExtensions
 	{
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static FieldInfo GetField(this Type type, Func<FieldInfo, bool> predicate)
 		{
 			return GetFields(type).FirstOrDefault(predicate);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static FieldInfo GetField(this Type type, string name)
 		{
 			return type.GetField(fi => fi.Name == name);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static IEnumerable<FieldInfo> GetFields(this Type type)
 		{
 			return GetParts(type, i => i.DeclaredFields);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static IEnumerable<PropertyInfo> GetProperties(this Type type)
 		{
 			return GetParts(type, ti => ti.DeclaredProperties);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static PropertyInfo GetProperty(this Type type, string name)
 		{
 			Type t = type;
@@ -49,13 +45,11 @@ namespace Xamarin.Forms.Internals
 			return null;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static bool IsAssignableFrom(this Type self, Type c)
 		{
 			return self.GetTypeInfo().IsAssignableFrom(c.GetTypeInfo());
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static bool IsInstanceOfType(this Type self, object o)
 		{
 			return self.GetTypeInfo().IsAssignableFrom(o.GetType().GetTypeInfo());
diff --git a/Xamarin.Forms.Core/Registrar.cs b/Xamarin.Forms.Core/Registrar.cs
index 617066af..fc80b2fd 100644
--- a/Xamarin.Forms.Core/Registrar.cs
+++ b/Xamarin.Forms.Core/Registrar.cs
@@ -7,6 +7,7 @@ using System.Reflection;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class Registrar<TRegistrable> where TRegistrable : class
 	{
 		readonly Dictionary<Type, Type> _handlers = new Dictionary<Type, Type>();
@@ -26,13 +27,11 @@ namespace Xamarin.Forms.Internals
 			return (TRegistrable)handler;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public TOut GetHandler<TOut>(Type type) where TOut : TRegistrable
 		{
 			return (TOut)GetHandler(type);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Type GetHandlerType(Type viewType)
 		{
 			Type type;
@@ -88,6 +87,7 @@ namespace Xamarin.Forms.Internals
 		}
 	}
 
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static class Registrar
 	{
 		static Registrar()
@@ -97,13 +97,10 @@ namespace Xamarin.Forms.Internals
 
 		internal static Dictionary<string, Type> Effects { get; } = new Dictionary<string, Type>();
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static IEnumerable<Assembly> ExtraAssemblies { get; set; }
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static Registrar<IRegisterable> Registered { get; }
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static void RegisterAll(Type[] attrTypes)
 		{
 			Assembly[] assemblies = Device.GetAssemblies();
diff --git a/Xamarin.Forms.Core/ResourcesChangedEventArgs.cs b/Xamarin.Forms.Core/ResourcesChangedEventArgs.cs
index 95056c36..c05cd57a 100644
--- a/Xamarin.Forms.Core/ResourcesChangedEventArgs.cs
+++ b/Xamarin.Forms.Core/ResourcesChangedEventArgs.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class ResourcesChangedEventArgs : EventArgs
 	{
 		public ResourcesChangedEventArgs(IEnumerable<KeyValuePair<string, object>> values)
diff --git a/Xamarin.Forms.Core/TableModel.cs b/Xamarin.Forms.Core/TableModel.cs
index db33000f..795a0697 100644
--- a/Xamarin.Forms.Core/TableModel.cs
+++ b/Xamarin.Forms.Core/TableModel.cs
@@ -4,9 +4,9 @@ using Xamarin.Forms.Internals;
 
 namespace Xamarin.Forms.Internals
 {
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public abstract class TableModel: ITableModel
 	{
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public virtual Cell GetCell(int section, int row)
 		{
 			object item = GetItem(section, row);
@@ -17,46 +17,36 @@ namespace Xamarin.Forms.Internals
 			return new TextCell { Text = item.ToString() };
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public virtual Cell GetHeaderCell(int section)
 		{
 			return null;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public abstract object GetItem(int section, int row);
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public abstract int GetRowCount(int section);
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public abstract int GetSectionCount();
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public virtual string[] GetSectionIndexTitles()
 		{
 			return null;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public virtual string GetSectionTitle(int section)
 		{
 			return null;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public event EventHandler<EventArg<object>> ItemLongPressed;
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public event EventHandler<EventArg<object>> ItemSelected;
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public void RowLongPressed(int section, int row)
 		{
 			RowLongPressed(GetItem(section, row));
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public void RowLongPressed(object item)
 		{
 			if (ItemLongPressed != null)
@@ -65,13 +55,11 @@ namespace Xamarin.Forms.Internals
 			OnRowLongPressed(item);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public void RowSelected(int section, int row)
 		{
 			RowSelected(GetItem(section, row));
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public void RowSelected(object item)
 		{
 			if (ItemSelected != null)
diff --git a/Xamarin.Forms.Core/TemplatedItemsList.cs b/Xamarin.Forms.Core/TemplatedItemsList.cs
index e132d045..31823c8e 100644
--- a/Xamarin.Forms.Core/TemplatedItemsList.cs
+++ b/Xamarin.Forms.Core/TemplatedItemsList.cs
@@ -11,14 +11,13 @@ using Xamarin.Forms.Internals;
 namespace Xamarin.Forms.Internals
 {
 
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public sealed class TemplatedItemsList<TView, TItem> : BindableObject, ITemplatedItemsList<TItem>, IList, IDisposable
 												where TView : BindableObject, IItemsView<TItem>
 												where TItem : BindableObject
 	{
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static readonly BindableProperty NameProperty = BindableProperty.Create("Name", typeof(string), typeof(TemplatedItemsList<TView, TItem>), null);
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static readonly BindableProperty ShortNameProperty = BindableProperty.Create("ShortName", typeof(string), typeof(TemplatedItemsList<TView, TItem>), null);
 
 		static readonly BindablePropertyKey HeaderContentPropertyKey = BindableProperty.CreateReadOnly("HeaderContent", typeof(TItem), typeof(TemplatedItemsList<TView, TItem>), null);
@@ -96,7 +95,6 @@ namespace Xamarin.Forms.Internals
 			remove { PropertyChanged -= value; }
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public BindingBase GroupDisplayBinding
 		{
 			get { return _groupDisplayBinding; }
@@ -107,7 +105,6 @@ namespace Xamarin.Forms.Internals
 			}
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public DataTemplate GroupHeaderTemplate
 		{
 			get
@@ -129,10 +126,8 @@ namespace Xamarin.Forms.Internals
 			}
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public BindableProperty GroupHeaderTemplateProperty { get; set; }
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public BindingBase GroupShortNameBinding
 		{
 			get { return _groupShortNameBinding; }
@@ -143,49 +138,40 @@ namespace Xamarin.Forms.Internals
 			}
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public TItem HeaderContent
 		{
 			get { return (TItem)GetValue(HeaderContentPropertyKey.BindableProperty); }
 			private set { SetValue(HeaderContentPropertyKey, value); }
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public bool IsGroupingEnabled
 		{
 			get { return (IsGroupingEnabledProperty != null) && (bool)_itemsView.GetValue(IsGroupingEnabledProperty); }
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public BindableProperty IsGroupingEnabledProperty { get; set; }
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public IEnumerable ItemsSource
 		{
 			get { return ListProxy.ProxiedEnumerable; }
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public string Name
 		{
 			get { return (string)GetValue(NameProperty); }
 			set { SetValue(NameProperty, value); }
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public TemplatedItemsList<TView, TItem> Parent { get; }
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public BindableProperty ProgressiveLoadingProperty { get; set; }
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public string ShortName
 		{
 			get { return (string)GetValue(ShortNameProperty); }
 			set { SetValue(ShortNameProperty, value); }
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public IReadOnlyList<string> ShortNames
 		{
 			get { return _shortNames; }
@@ -339,22 +325,18 @@ namespace Xamarin.Forms.Internals
 			throw new NotSupportedException();
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public event NotifyCollectionChangedEventHandler CollectionChanged;
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public int Count
 		{
 			get { return ListProxy.Count; }
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public TItem this[int index]
 		{
 			get { return GetOrCreateContent(index, ListProxy[index]); }
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public int GetDescendantCount()
 		{
 			if (!IsGroupingEnabled)
@@ -370,7 +352,6 @@ namespace Xamarin.Forms.Internals
 			return count;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public int GetGlobalIndexForGroup(ITemplatedItemsList<TItem> group)
 		{
 			if (group == null)
@@ -385,7 +366,6 @@ namespace Xamarin.Forms.Internals
 			return index;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public int GetGlobalIndexOfGroup(object item)
 		{
 			var count = 0;
@@ -402,7 +382,6 @@ namespace Xamarin.Forms.Internals
 			return -1;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public int GetGlobalIndexOfItem(object item)
 		{
 			if (!IsGroupingEnabled)
@@ -426,7 +405,6 @@ namespace Xamarin.Forms.Internals
 			return -1;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public int GetGlobalIndexOfItem(object group, object item)
 		{
 			if (!IsGroupingEnabled)
@@ -453,7 +431,6 @@ namespace Xamarin.Forms.Internals
 			return -1;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Tuple<int, int> GetGroupAndIndexOfItem(object item)
 		{
 			if (item == null)
@@ -477,7 +454,6 @@ namespace Xamarin.Forms.Internals
 			return new Tuple<int, int>(-1, -1);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Tuple<int, int> GetGroupAndIndexOfItem(object group, object item)
 		{
 			if (!IsGroupingEnabled)
@@ -506,7 +482,6 @@ namespace Xamarin.Forms.Internals
 			return new Tuple<int, int>(-1, -1);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public int GetGroupIndexFromGlobal(int globalIndex, out int leftOver)
 		{
 			leftOver = 0;
@@ -532,7 +507,6 @@ namespace Xamarin.Forms.Internals
 			return -1;
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public event NotifyCollectionChangedEventHandler GroupedCollectionChanged;
 		event NotifyCollectionChangedEventHandler ITemplatedItemsList<TItem>.GroupedCollectionChanged
 		{
@@ -540,7 +514,6 @@ namespace Xamarin.Forms.Internals
 			remove { GroupedCollectionChanged -= value; }
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public int IndexOf(TItem item)
 		{
 			TemplatedItemsList<TView, TItem> group = GetGroup(item);
@@ -550,7 +523,6 @@ namespace Xamarin.Forms.Internals
 			return GetIndex(item);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
 		public TItem CreateContent(int index, object item, bool insert = false)
 		{
 			TItem content = ItemTemplate != null ? (TItem)ItemTemplate.CreateContent(item, _itemsView) : _itemsView.CreateDefault(item);
diff --git a/Xamarin.Forms.Core/TypedBinding.cs b/Xamarin.Forms.Core/TypedBinding.cs
index 27adf95f..51c2aec9 100644
--- a/Xamarin.Forms.Core/TypedBinding.cs
+++ b/Xamarin.Forms.Core/TypedBinding.cs
@@ -9,6 +9,7 @@ using Xamarin.Forms.Internals;
 namespace Xamarin.Forms.Internals
 {
 	//FIXME: need a better name for this, and share with Binding, so we can share more unittests
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public abstract class TypedBindingBase : BindingBase
 	{
 		IValueConverter _converter;
@@ -53,6 +54,7 @@ namespace Xamarin.Forms.Internals
 		}
 	}
 
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public sealed class TypedBinding<TSource, TProperty> : TypedBindingBase
 	{
 		readonly Func<TSource, TProperty> _getter;