Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Commit

Permalink
Mop up enabling warnings as errors (#78)
Browse files Browse the repository at this point in the history
  • Loading branch information
kingces95 authored and Jason Smith committed Apr 12, 2016
1 parent 73defe4 commit 10f6c08
Show file tree
Hide file tree
Showing 19 changed files with 79 additions and 27 deletions.
2 changes: 2 additions & 0 deletions Xamarin.Forms.Core/Cells/EntryCell.cs
Expand Up @@ -74,7 +74,9 @@ internal void SendCompleted()
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
}
}
}
16 changes: 16 additions & 0 deletions Xamarin.Forms.Core/Label.cs
Expand Up @@ -176,11 +176,15 @@ static void OnFontAttributesChanged(BindableObject bindable, object oldValue, ob
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;
Expand All @@ -201,11 +205,15 @@ static void OnFontFamilyChanged(BindableObject bindable, object oldValue, object
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;
Expand All @@ -226,11 +234,15 @@ static void OnFontSizeChanged(BindableObject bindable, object oldValue, object n
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;
Expand All @@ -246,7 +258,9 @@ void OnFormattedTextChanged(object sender, PropertyChangedEventArgs e)
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)
Expand All @@ -264,7 +278,9 @@ static void OnTextPropertyChanged(BindableObject bindable, object oldvalue, obje
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
}
}
}
2 changes: 2 additions & 0 deletions Xamarin.Forms.Core/Span.cs
Expand Up @@ -126,6 +126,7 @@ void OnPropertyChanged([CallerMemberName] string propertyName = null)
handler(this, new PropertyChangedEventArgs(propertyName));
}

#pragma warning disable 0618 // retain until Span.Font removed
void UpdateFontPropertiesFromStruct()
{
if (_inUpdate)
Expand Down Expand Up @@ -166,4 +167,5 @@ void UpdateStructFromFontProperties()
_inUpdate = false;
}
}
#pragma warning restore
}
2 changes: 2 additions & 0 deletions Xamarin.Forms.Core/TapGestureRecognizer.cs
Expand Up @@ -45,9 +45,11 @@ internal void SendTapped(View sender)
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
Expand Down
2 changes: 2 additions & 0 deletions Xamarin.Forms.Core/TypeConverter.cs
Expand Up @@ -27,7 +27,9 @@ public virtual object ConvertFrom(CultureInfo culture, object o)

public virtual object ConvertFromInvariantString(string value)
{
#pragma warning disable 0618 // retain until ConvertFrom removed
return ConvertFrom(CultureInfo.InvariantCulture, value);
#pragma warning restore
}
}
}
6 changes: 6 additions & 0 deletions Xamarin.Forms.Core/VisualElement.cs
Expand Up @@ -511,7 +511,9 @@ public void Layout(Rectangle bounds)

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)
{
Expand Down Expand Up @@ -577,11 +579,14 @@ protected void OnChildrenReordered()

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)
Expand All @@ -592,6 +597,7 @@ protected override void OnParentSet()
{
NavigationProxy.Inner = null;
}
#pragma warning restore
}

protected virtual void OnSizeAllocated(double width, double height)
Expand Down
9 changes: 6 additions & 3 deletions Xamarin.Forms.Core/Xamarin.Forms.Core.csproj
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Forms.Maps.Android/MapRenderer.cs
Expand Up @@ -260,7 +260,7 @@ void RemovePins (IList pins)
return;

foreach (Pin p in pins) {
var marker = _markers.FirstOrDefault (m => m.Id == p.Id);
var marker = _markers.FirstOrDefault (m => (object)m.Id == p.Id);
if (marker == null)
continue;
marker.Remove ();
Expand Down
9 changes: 6 additions & 3 deletions Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
Expand Up @@ -28,7 +28,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>0253</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -38,7 +39,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>0253</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -51,7 +53,8 @@
<WarningLevel>4</WarningLevel>
<Optimize>false</Optimize>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>0253</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
Expand Down
2 changes: 2 additions & 0 deletions Xamarin.Forms.Maps.UWP/MapRenderer.cs
Expand Up @@ -133,7 +133,9 @@ void LoadPins()
void ClearPins()
{
Control.Children.Clear();
#pragma warning disable 4014 // don't wanna block UI thread
UpdateIsShowingUser();
#pragma warning restore
}

void RemovePin(Pin pinToRemove)
Expand Down
6 changes: 4 additions & 2 deletions Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj
Expand Up @@ -27,7 +27,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>4014</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -38,7 +39,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>4014</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<PlatformTarget>x86</PlatformTarget>
Expand Down
Expand Up @@ -26,7 +26,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>4014</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -36,7 +37,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>4014</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<DebugSymbols>true</DebugSymbols>
Expand Down
2 changes: 2 additions & 0 deletions Xamarin.Forms.Maps.WinRT.Tablet/MapRenderer.cs
Expand Up @@ -110,7 +110,9 @@ void LoadPins()
void ClearPins()
{
Control.Children.Clear();
#pragma warning disable 4014 // don't wanna block UI thread
UpdateIsShowingUser();
#pragma warning restore
}

void RemovePin(Pin pinToRemove)
Expand Down
Expand Up @@ -42,7 +42,8 @@
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants>
<NoWarn>2008;4014</NoWarn>
<NoWarn>
</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
Expand All @@ -54,7 +55,8 @@
<OutputPath>bin\ARM\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>2008;4014</NoWarn>
<NoWarn>
</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
Expand Down
12 changes: 8 additions & 4 deletions Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.Classic.csproj
Expand Up @@ -25,7 +25,8 @@
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>0414</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
Expand All @@ -37,7 +38,8 @@
<ConsolePause>false</ConsolePause>
<CodesignKey>iPhone Developer</CodesignKey>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>0414</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -49,11 +51,13 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>0414</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppStore|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>0414</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Xamarin.Forms.Core\Properties\GlobalAssemblyInfo.cs">
Expand Down
12 changes: 8 additions & 4 deletions Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj
Expand Up @@ -24,7 +24,8 @@
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>0414</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
Expand All @@ -35,7 +36,8 @@
<ConsolePause>false</ConsolePause>
<CodesignKey>iPhone Developer</CodesignKey>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>0414</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -47,11 +49,13 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>0414</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppStore|AnyCPU'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>0414</NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Xamarin.Forms.Core\Properties\GlobalAssemblyInfo.cs">
Expand Down
4 changes: 2 additions & 2 deletions Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
Expand Up @@ -27,7 +27,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>1998;0618;0169</NoWarn>
<NoWarn>1998</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -38,7 +38,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>1998;0618;0169</NoWarn>
<NoWarn>1998</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<PlatformTarget>ARM</PlatformTarget>
Expand Down
2 changes: 0 additions & 2 deletions Xamarin.Forms.Platform.WinRT/ListViewRenderer.cs
Expand Up @@ -165,8 +165,6 @@ protected override void Dispose(bool disposing)

sealed class BrushedElement
{
bool _isBound;

public BrushedElement(FrameworkElement element, WBinding brushBinding = null, Brush brush = null)
{
Element = element;
Expand Down

0 comments on commit 10f6c08

Please sign in to comment.