diff options
Diffstat (limited to 'Xamarin.Forms.Core')
| -rw-r--r-- | Xamarin.Forms.Core/Cells/EntryCell.cs | 2 | ||||
| -rw-r--r-- | Xamarin.Forms.Core/Label.cs | 16 | ||||
| -rw-r--r-- | Xamarin.Forms.Core/Span.cs | 2 | ||||
| -rw-r--r-- | Xamarin.Forms.Core/TapGestureRecognizer.cs | 2 | ||||
| -rw-r--r-- | Xamarin.Forms.Core/TypeConverter.cs | 2 | ||||
| -rw-r--r-- | Xamarin.Forms.Core/VisualElement.cs | 6 | ||||
| -rw-r--r-- | Xamarin.Forms.Core/Xamarin.Forms.Core.csproj | 9 |
7 files changed, 36 insertions, 3 deletions
diff --git a/Xamarin.Forms.Core/Cells/EntryCell.cs b/Xamarin.Forms.Core/Cells/EntryCell.cs index d74e365e..cccdcae1 100644 --- a/Xamarin.Forms.Core/Cells/EntryCell.cs +++ b/Xamarin.Forms.Core/Cells/EntryCell.cs @@ -74,7 +74,9 @@ namespace Xamarin.Forms static void OnHorizontalTextAlignmentPropertyChanged(BindableObject bindable, object oldValue, object newValue) { var label = (EntryCell)bindable; +#pragma warning disable 0618 // retain until XAlign removed label.OnPropertyChanged(nameof(XAlign)); +#pragma warning restore } } }
\ No newline at end of file diff --git a/Xamarin.Forms.Core/Label.cs b/Xamarin.Forms.Core/Label.cs index fed021f8..d34f1176 100644 --- a/Xamarin.Forms.Core/Label.cs +++ b/Xamarin.Forms.Core/Label.cs @@ -176,11 +176,15 @@ namespace Xamarin.Forms var family = (string)values[0]; if (family != null) { +#pragma warning disable 0618 // retain until Font removed label.Font = Font.OfSize(family, (double)values[1]).WithAttributes(attributes); +#pragma warning restore } else { +#pragma warning disable 0618 // retain until Font removed label.Font = Font.SystemFontOfSize((double)values[1], attributes); +#pragma warning restore } label._cancelEvents = false; @@ -201,11 +205,15 @@ namespace Xamarin.Forms var family = (string)newValue; if (family != null) { +#pragma warning disable 0618 // retain until Font removed label.Font = Font.OfSize(family, (double)values[0]).WithAttributes((FontAttributes)values[1]); +#pragma warning restore } else { +#pragma warning disable 0618 // retain until Font removed label.Font = Font.SystemFontOfSize((double)values[0], (FontAttributes)values[1]); +#pragma warning restore } label._cancelEvents = false; @@ -226,11 +234,15 @@ namespace Xamarin.Forms var family = (string)values[0]; if (family != null) { +#pragma warning disable 0618 // retain until Font removed label.Font = Font.OfSize(family, size).WithAttributes((FontAttributes)values[1]); +#pragma warning restore } else { +#pragma warning disable 0618 // retain until Font removed label.Font = Font.SystemFontOfSize(size, (FontAttributes)values[1]); +#pragma warning restore } label._cancelEvents = false; @@ -246,7 +258,9 @@ namespace Xamarin.Forms static void OnHorizontalTextAlignmentPropertyChanged(BindableObject bindable, object oldValue, object newValue) { var label = (Label)bindable; +#pragma warning disable 0618 // retain until XAlign removed label.OnPropertyChanged(nameof(XAlign)); +#pragma warning restore } static void OnTextPropertyChanged(BindableObject bindable, object oldvalue, object newvalue) @@ -264,7 +278,9 @@ namespace Xamarin.Forms static void OnVerticalTextAlignmentPropertyChanged(BindableObject bindable, object oldValue, object newValue) { var label = (Label)bindable; +#pragma warning disable 0618 // retain until YAlign removed label.OnPropertyChanged(nameof(YAlign)); +#pragma warning restore } } }
\ No newline at end of file diff --git a/Xamarin.Forms.Core/Span.cs b/Xamarin.Forms.Core/Span.cs index 3789ddff..6ffc3f17 100644 --- a/Xamarin.Forms.Core/Span.cs +++ b/Xamarin.Forms.Core/Span.cs @@ -126,6 +126,7 @@ namespace Xamarin.Forms handler(this, new PropertyChangedEventArgs(propertyName)); } +#pragma warning disable 0618 // retain until Span.Font removed void UpdateFontPropertiesFromStruct() { if (_inUpdate) @@ -166,4 +167,5 @@ namespace Xamarin.Forms _inUpdate = false; } } +#pragma warning restore }
\ No newline at end of file diff --git a/Xamarin.Forms.Core/TapGestureRecognizer.cs b/Xamarin.Forms.Core/TapGestureRecognizer.cs index 0489985d..8449f105 100644 --- a/Xamarin.Forms.Core/TapGestureRecognizer.cs +++ b/Xamarin.Forms.Core/TapGestureRecognizer.cs @@ -45,9 +45,11 @@ namespace Xamarin.Forms if (handler != null) handler(sender, new TappedEventArgs(CommandParameter)); +#pragma warning disable 0618 // retain until TappedCallback removed Action<View, object> callback = TappedCallback; if (callback != null) callback(sender, TappedCallbackParameter); +#pragma warning restore } #region obsolete cruft diff --git a/Xamarin.Forms.Core/TypeConverter.cs b/Xamarin.Forms.Core/TypeConverter.cs index 7bbf221f..57ea3b4c 100644 --- a/Xamarin.Forms.Core/TypeConverter.cs +++ b/Xamarin.Forms.Core/TypeConverter.cs @@ -27,7 +27,9 @@ namespace Xamarin.Forms public virtual object ConvertFromInvariantString(string value) { +#pragma warning disable 0618 // retain until ConvertFrom removed return ConvertFrom(CultureInfo.InvariantCulture, value); +#pragma warning restore } } }
\ No newline at end of file diff --git a/Xamarin.Forms.Core/VisualElement.cs b/Xamarin.Forms.Core/VisualElement.cs index 16efe730..c85b379a 100644 --- a/Xamarin.Forms.Core/VisualElement.cs +++ b/Xamarin.Forms.Core/VisualElement.cs @@ -511,7 +511,9 @@ namespace Xamarin.Forms public SizeRequest Measure(double widthConstraint, double heightConstraint, MeasureFlags flags = MeasureFlags.None) { +#pragma warning disable 0618 // retain until GetSizeRequest removed SizeRequest result = GetSizeRequest(widthConstraint, heightConstraint); +#pragma warning restore if ((flags & MeasureFlags.IncludeMargins) != 0) { @@ -577,11 +579,14 @@ namespace Xamarin.Forms protected virtual SizeRequest OnMeasure(double widthConstraint, double heightConstraint) { +#pragma warning disable 0618 // retain until OnSizeRequest removed return OnSizeRequest(widthConstraint, heightConstraint); +#pragma warning restore } protected override void OnParentSet() { +#pragma warning disable 0618 // retain until ParentView removed base.OnParentSet(); if (ParentView != null) @@ -592,6 +597,7 @@ namespace Xamarin.Forms { NavigationProxy.Inner = null; } +#pragma warning restore } protected virtual void OnSizeAllocated(double width, double height) diff --git a/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj b/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj index 139c261a..70d721d6 100644 --- a/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj +++ b/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj @@ -22,7 +22,8 @@ <WarningLevel>4</WarningLevel> <ConsolePause>false</ConsolePause> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn>0618</NoWarn> + <NoWarn> + </NoWarn> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>full</DebugType> @@ -32,14 +33,16 @@ <WarningLevel>4</WarningLevel> <ConsolePause>false</ConsolePause> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn>0618</NoWarn> + <NoWarn> + </NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'"> <DebugSymbols>true</DebugSymbols> <OutputPath>bin\Turkey\</OutputPath> <DefineConstants>DEBUG;</DefineConstants> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn>0618</NoWarn> + <NoWarn> + </NoWarn> <DebugType>full</DebugType> <PlatformTarget>AnyCPU</PlatformTarget> <ErrorReport>prompt</ErrorReport> |