diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github7996.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github7996.cs index 97dd0732689..3b9b8c20212 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github7996.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github7996.cs @@ -37,7 +37,7 @@ protected override void Init() CultureInfo.CurrentUICulture = culture; } }; - + var textLabel2 = new Label { Text = "Resolved Binding Value:" diff --git a/Xamarin.Forms.Controls/App.cs b/Xamarin.Forms.Controls/App.cs index 2a2665934aa..a7872ffecf2 100644 --- a/Xamarin.Forms.Controls/App.cs +++ b/Xamarin.Forms.Controls/App.cs @@ -115,7 +115,7 @@ public Page CreateDefaultMainPage() Flyout = CoreGallery.GetFlyoutPage(), Detail = CoreGallery.GetMainPage() }; - + mdp.SetAutomationPropertiesName("Main page"); mdp.SetAutomationPropertiesHelpText("Main page help text"); mdp.Flyout.IconImageSource.SetAutomationPropertiesHelpText("This as MDP icon"); diff --git a/Xamarin.Forms.Core/BindingExpression.cs b/Xamarin.Forms.Core/BindingExpression.cs index c9b527cfbcf..19521af8736 100644 --- a/Xamarin.Forms.Core/BindingExpression.cs +++ b/Xamarin.Forms.Core/BindingExpression.cs @@ -455,14 +455,15 @@ internal static bool TryConvert(ref object value, BindableProperty targetPropert } object original = value; - try + try { convertTo = Nullable.GetUnderlyingType(convertTo) ?? convertTo; var stringValue = value as string ?? string.Empty; // see: https://bugzilla.xamarin.com/show_bug.cgi?id=32871 // do not canonicalize "*.[.]"; "1." should not update bound BindableProperty - if (stringValue.EndsWith(CultureInfo.CurrentUICulture.NumberFormat.NumberDecimalSeparator, StringComparison.Ordinal) && DecimalTypes.Contains(convertTo)) { + if (stringValue.EndsWith(CultureInfo.CurrentUICulture.NumberFormat.NumberDecimalSeparator, StringComparison.Ordinal) && DecimalTypes.Contains(convertTo)) + { value = original; return false; } diff --git a/Xamarin.Forms.Platform.GTK/Renderers/Shapes/ShapeRenderer.cs b/Xamarin.Forms.Platform.GTK/Renderers/Shapes/ShapeRenderer.cs index ff824079a8b..70fa1840b7b 100644 --- a/Xamarin.Forms.Platform.GTK/Renderers/Shapes/ShapeRenderer.cs +++ b/Xamarin.Forms.Platform.GTK/Renderers/Shapes/ShapeRenderer.cs @@ -1,11 +1,11 @@ using System; -using System.Linq; using System.ComponentModel; +using System.Linq; +using Cairo; using Xamarin.Forms.Platform.GTK.Controls; using Xamarin.Forms.Platform.GTK.Extensions; using Xamarin.Forms.PlatformConfiguration.GTKSpecific; using Xamarin.Forms.Shapes; -using Cairo; namespace Xamarin.Forms.Platform.GTK.Renderers {