Merge pull request #7 from GeoJSON-Net/feature/only-net-standard20

Feature/only net standard20

Author: MartinCarpentier

.github/workflows/ci-build.yml

@@ -19,7 +19,7 @@ jobs:
   build:
 
     name: 'Build and Test'
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     env: 
       VSTEST_CONNECTION_TIMEOUT: 900

.github/workflows/continous-benchmark.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   benchmark:
     name: Continuous benchmarking
-    runs-on: ubuntu-latest
+    runs-on: windows-2019
 
     defaults:
       run:

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
   deploy:
     name: 'Deploy to Nuget'
     if: github.event_name == 'release'
-    runs-on: ubuntu-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v2

src/GeoJSON.Text.Test.Benchmark/SerializeAndDeserialize.cs

@@ -11,10 +11,10 @@ public class SerializeAndDeserialize
         string fileContents = "";
 
         // GeoJson.NET
-        private Net.Feature.FeatureCollection featureCollectionGeoJsonNET = new Net.Feature.FeatureCollection();
+        private readonly Net.Feature.FeatureCollection featureCollectionGeoJsonNET = new Net.Feature.FeatureCollection();
 
         // GeoJson.Text
-        private Text.Feature.FeatureCollection featureCollectionGeoJsonTEXT = new Text.Feature.FeatureCollection();
+        private readonly Text.Feature.FeatureCollection featureCollectionGeoJsonTEXT = new Text.Feature.FeatureCollection();
 
         [Params(1000, 10000)]
         public int N;

src/GeoJSON.Text.Test.Unit/Feature/FeatureTests.cs

@@ -462,7 +462,7 @@ public void Feature_Equals_All_Geometry_Null_Issue115()
         }
 
 
-        private IGeometryObject GetGeometry()
+        private static IGeometryObject GetGeometry()
         {
             var coordinates = new List<LineString>
             {

src/GeoJSON.Text/Converters/PositionEnumerableConverter.cs

@@ -14,7 +14,7 @@ namespace GeoJSON.Text.Converters
     /// </summary>
     public class PositionEnumerableConverter : JsonConverter<IReadOnlyCollection<IPosition>>
     {
-        private static readonly PositionConverter PositionConverter = new PositionConverter();
+        private static readonly PositionConverter PositionConverter = new();
 
         /// <summary>
         ///     Determines whether this instance can convert the specified object type.

src/GeoJSON.Text/Feature/Feature.cs

@@ -143,7 +143,7 @@ public TProps Properties {
         /// <returns></returns>
         public bool Equals(Feature<TGeometry, TProps> other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
             return base.Equals(other)
                    && string.Equals(Id, other.Id)
@@ -153,7 +153,7 @@ public bool Equals(Feature<TGeometry, TProps> other)
 
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != GetType()) return false;
             return Equals((Feature<TGeometry, TProps>) obj);
@@ -271,7 +271,7 @@ private static Dictionary<string, object> GetDictionaryOfPublicProperties(object
 
         public bool Equals(Feature<TGeometry> other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
 
             if (Geometry == null && other.Geometry == null)
@@ -294,7 +294,7 @@ public bool Equals(Feature<TGeometry> other)
 
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             return obj.GetType() == GetType() && Equals((Feature<TGeometry>) obj);
         }
@@ -306,12 +306,12 @@ public override int GetHashCode()
 
         public static bool operator ==(Feature<TGeometry> left, Feature<TGeometry> right)
         {
-            return left?.Equals(right) ?? ReferenceEquals(null, right);
+            return left?.Equals(right) ?? right is null;
         }
 
         public static bool operator !=(Feature<TGeometry> left, Feature<TGeometry> right)
         {
-            return !(left?.Equals(right) ?? ReferenceEquals(null, right));
+            return !(left?.Equals(right) ?? right is null);
         }
     }
 }

src/GeoJSON.Text/GeoJSON.Text.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net5;net6</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0</TargetFrameworks>
 		<LangVersion>Latest</LangVersion>
 		<Description>.Net types for the GeoJSON RFC to be used with System.Text.Json</Description>
 		<Authors>Matt Hunt</Authors>
@@ -15,6 +15,7 @@
 		<PackageTags>geojson;geo;json;geolocation</PackageTags>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageReleaseNotes></PackageReleaseNotes>
+		<EnableNETAnalyzers>true</EnableNETAnalyzers>
 
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -31,6 +32,10 @@
 	</PropertyGroup>	
 
 	<ItemGroup>
+		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 		<PackageReference Include="System.Text.Json" Version="6.0.1" />
 	</ItemGroup>

src/GeoJSON.Text/GeoJSONObject.cs

@@ -15,7 +15,7 @@ namespace GeoJSON.Text
     /// </summary>
     public abstract class GeoJSONObject : IGeoJSONObject, IEqualityComparer<GeoJSONObject>, IEquatable<GeoJSONObject>
     {
-        internal static readonly DoubleTenDecimalPlaceComparer DoubleComparer = new DoubleTenDecimalPlaceComparer();
+        internal static readonly DoubleTenDecimalPlaceComparer DoubleComparer = new();
 
         /// <summary>
         ///     Gets or sets the (optional)
@@ -86,7 +86,7 @@ public bool Equals(GeoJSONObject left, GeoJSONObject right)
             {
                 return true;
             }
-            if (ReferenceEquals(null, right))
+            if (right is null)
             {
                 return false;
             }
@@ -101,8 +101,8 @@ public bool Equals(GeoJSONObject left, GeoJSONObject right)
                 return false;
             }
 
-            var leftIsNull = ReferenceEquals(null, left.BoundingBoxes);
-            var rightIsNull = ReferenceEquals(null, right.BoundingBoxes);
+            var leftIsNull = left.BoundingBoxes is null;
+            var rightIsNull = right.BoundingBoxes is null;
             var bothAreMissing = leftIsNull && rightIsNull;
 
             if (bothAreMissing || leftIsNull != rightIsNull)
@@ -122,7 +122,7 @@ public bool Equals(GeoJSONObject left, GeoJSONObject right)
             {
                 return true;
             }
-            if (ReferenceEquals(null, right))
+            if (right is null)
             {
                 return false;
             }

src/GeoJSON.Text/Geometry/GeometryCollection.cs

@@ -20,7 +20,7 @@ public class GeometryCollection : GeoJSONObject, IGeometryObject, IEqualityCompa
         /// <summary>
         /// Initializes a new instance of the <see cref="GeometryCollection" /> class.
         /// </summary>
-        public GeometryCollection() : this(new IGeometryObject[0])
+        public GeometryCollection() : this(Array.Empty<IGeometryObject>())
         {
         }
 
@@ -85,7 +85,7 @@ public bool Equals(GeometryCollection left, GeometryCollection right)
             {
                 return true;
             }
-            if (ReferenceEquals(null, right))
+            if (right is null)
             {
                 return false;
             }