From 3e6f8c44fe53a8d18730589c34f395b26e23d85e Mon Sep 17 00:00:00 2001 From: Valeriy Mironov Date: Wed, 10 Jan 2018 10:27:13 +0200 Subject: [PATCH] Removed using C#7 features --- Resources/Resources.csproj.DotSettings | 2 ++ .../Elements/WeatherElements/SeparateTemperature.cs | 7 +++---- WatchFace.Parser/Elements/WeatherElements/WeatherIcon.cs | 2 +- WatchFace.Parser/Utils/DrawingOrderIterator.cs | 4 ++-- WatchFace.Parser/WatchFace.Parser.csproj.DotSettings | 2 ++ WatchFace/WatchFace.csproj.DotSettings | 2 ++ 6 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 Resources/Resources.csproj.DotSettings create mode 100644 WatchFace.Parser/WatchFace.Parser.csproj.DotSettings create mode 100644 WatchFace/WatchFace.csproj.DotSettings diff --git a/Resources/Resources.csproj.DotSettings b/Resources/Resources.csproj.DotSettings new file mode 100644 index 0000000..73e9656 --- /dev/null +++ b/Resources/Resources.csproj.DotSettings @@ -0,0 +1,2 @@ + + CSharp60 \ No newline at end of file diff --git a/WatchFace.Parser/Elements/WeatherElements/SeparateTemperature.cs b/WatchFace.Parser/Elements/WeatherElements/SeparateTemperature.cs index 47f66d1..8838cd6 100644 --- a/WatchFace.Parser/Elements/WeatherElements/SeparateTemperature.cs +++ b/WatchFace.Parser/Elements/WeatherElements/SeparateTemperature.cs @@ -1,5 +1,4 @@ -using System.Runtime.Serialization; -using Newtonsoft.Json; +using Newtonsoft.Json; using WatchFace.Parser.Attributes; using WatchFace.Parser.Elements.BasicElements; @@ -23,14 +22,14 @@ namespace WatchFace.Parser.Elements.WeatherElements [JsonProperty("Unknown3")] private Coordinates Unknown3 { - set => DayAlt = value; + set { DayAlt = value; } } // For compatibility with "Unknown4" JSON attribute [JsonProperty("Unknown4")] private Coordinates Unknown4 { - set => NightAlt = value; + set { NightAlt = value; } } } } \ No newline at end of file diff --git a/WatchFace.Parser/Elements/WeatherElements/WeatherIcon.cs b/WatchFace.Parser/Elements/WeatherElements/WeatherIcon.cs index 9ca7035..e9bb096 100644 --- a/WatchFace.Parser/Elements/WeatherElements/WeatherIcon.cs +++ b/WatchFace.Parser/Elements/WeatherElements/WeatherIcon.cs @@ -22,7 +22,7 @@ namespace WatchFace.Parser.Elements.WeatherElements [JsonProperty("Unknown3")] private Coordinates Unknown3 { - set => CoordinatesAlt = value; + set { CoordinatesAlt = value; } } } } \ No newline at end of file diff --git a/WatchFace.Parser/Utils/DrawingOrderIterator.cs b/WatchFace.Parser/Utils/DrawingOrderIterator.cs index ffb11df..f074e02 100644 --- a/WatchFace.Parser/Utils/DrawingOrderIterator.cs +++ b/WatchFace.Parser/Utils/DrawingOrderIterator.cs @@ -1,11 +1,11 @@ -using System.Collections; +using System.Collections.Generic; using WatchFace.Parser.Models; namespace WatchFace.Parser.Utils { public class DrawingOrderIterator { - public static IEnumerable Iterate(long drawingOrder) + public static IEnumerable Iterate(long drawingOrder) { var order = drawingOrder; while (order != 0) diff --git a/WatchFace.Parser/WatchFace.Parser.csproj.DotSettings b/WatchFace.Parser/WatchFace.Parser.csproj.DotSettings new file mode 100644 index 0000000..73e9656 --- /dev/null +++ b/WatchFace.Parser/WatchFace.Parser.csproj.DotSettings @@ -0,0 +1,2 @@ + + CSharp60 \ No newline at end of file diff --git a/WatchFace/WatchFace.csproj.DotSettings b/WatchFace/WatchFace.csproj.DotSettings new file mode 100644 index 0000000..73e9656 --- /dev/null +++ b/WatchFace/WatchFace.csproj.DotSettings @@ -0,0 +1,2 @@ + + CSharp60 \ No newline at end of file