Convert to System.Text.Json

.gitignore

@@ -268,3 +268,4 @@ paket-files/
 # JetBrains Rider
 .idea/
 *.sln.iml
+.DS_Store

src/GeoJSON.Net.Tests/CoordinateReferenceSystem/DefaultCrsTests.cs

@@ -1,8 +1,8 @@
 using GeoJSON.Net.CoordinateReferenceSystem;
 using GeoJSON.Net.Feature;
 using GeoJSON.Net.Geometry;
-using Newtonsoft.Json;
 using NUnit.Framework;
+using System.Text.Json;
 
 namespace GeoJSON.Net.Tests.CoordinateReferenceSystem
 {
@@ -14,7 +14,7 @@ public void Can_Serialize_Does_Not_Output_Crs_Property()
         {
             var collection = new FeatureCollection();
 
-            var json = JsonConvert.SerializeObject(collection);
+            var json = JsonSerializer.Serialize(collection, DefaultSerializerOptions);
 
             Assert.IsTrue(!json.Contains("\"crs\""));
         }
@@ -24,7 +24,7 @@ public void Can_Deserialize_When_Json_Does_Not_Contain_Crs_Property()
         {
             var json = "{\"coordinates\":[90.65464646,53.2455662,200.4567],\"type\":\"Point\"}";
 
-            var point = JsonConvert.DeserializeObject<Point>(json);
+            var point = JsonSerializer.Deserialize<Point>(json, DefaultSerializerOptions);
 
             Assert.IsNull(point.CRS);
         }
@@ -34,7 +34,7 @@ public void Can_Deserialize_CRS_issue_89()
         {
             var json = "{\"coordinates\": [ 90.65464646, 53.2455662, 200.4567 ], \"type\": \"Point\", \"crs\": { \"type\": \"name\", \"properties\": { \"name\": \"urn:ogc:def:crs:OGC:1.3:CRS84\" }}}";
 
-            var point = JsonConvert.DeserializeObject<Point>(json);
+            var point = JsonSerializer.Deserialize<Point>(json, DefaultSerializerOptions);
 
             Assert.IsNotNull(point.CRS);
             Assert.AreEqual(CRSType.Name, point.CRS.Type);
@@ -44,10 +44,10 @@ public void Can_Deserialize_CRS_issue_89()
         public void Can_Serialize_CRS_issue_89()
         {
             var expected =
-                "{\"type\":\"Point\",\"coordinates\":[34.56,12.34],\"crs\":{\"properties\":{\"name\":\"TEST NAME\"},\"type\":\"name\"}}";
+                "{\"type\":\"Point\",\"coordinates\":[34.56,12.34],\"crs\":{\"type\":\"name\",\"properties\":{\"name\":\"TEST NAME\"}}}";
             var point = new Point(new Position(12.34, 34.56)) { CRS = new NamedCRS("TEST NAME") };
 
-            var json = JsonConvert.SerializeObject(point);
+            var json = JsonSerializer.Serialize(point, DefaultSerializerOptions);
 
             Assert.IsNotNull(json);
             Assert.AreEqual(expected, json);
@@ -57,13 +57,13 @@ public void Can_Serialize_CRS_issue_89()
         public void Can_Serialize_DefaultCRS_issue_89()
         {
             var expected =
-                "{\"type\":\"Point\",\"coordinates\":[34.56,12.34],\"crs\":{\"properties\":{\"name\":\"urn:ogc:def:crs:OGC::CRS84\"},\"type\":\"name\"}}";
+                "{\"type\":\"Point\",\"coordinates\":[34.56,12.34],\"crs\":{\"type\":\"name\",\"properties\":{\"name\":\"urn:ogc:def:crs:OGC::CRS84\"}}}";
             var point = new Point(new Position(12.34, 34.56)) { CRS = new NamedCRS("urn:ogc:def:crs:OGC::CRS84") };
 
-            var json = JsonConvert.SerializeObject(point);
+            var json = JsonSerializer.Serialize(point, DefaultSerializerOptions);
 
             Assert.IsNotNull(json);
             Assert.AreEqual(expected, json);
         }
     }
-}
+}

src/GeoJSON.Net.Tests/CoordinateReferenceSystem/LinkedCRSTests.cs

@@ -1,8 +1,8 @@
 using System;
 using GeoJSON.Net.CoordinateReferenceSystem;
 using GeoJSON.Net.Geometry;
-using Newtonsoft.Json;
 using NUnit.Framework;
+using System.Text.Json;
 
 namespace GeoJSON.Net.Tests.CoordinateReferenceSystem
 {
@@ -41,16 +41,16 @@ public void Has_Type_Property()
         public void Can_Serialize()
         {
             var collection = new Point(new Position(1, 2, 3)) { CRS = new LinkedCRS(Href) };
-            var actualJson = JsonConvert.SerializeObject(collection);
+            var actualJson = JsonSerializer.Serialize(collection, DefaultSerializerOptions);
 
-            JsonAssert.Contains("{\"properties\":{\"href\":\"http://localhost\"},\"type\":\"link\"}", actualJson);
+            JsonAssert.Contains("{\"type\":\"link\",\"properties\":{\"href\":\"http://localhost\"}}", actualJson);
         }
 
         [Test]
         public void Can_Deserialize_CRS_issue_101()
         {
-            const string pointJson = "{\"type\":\"Point\",\"coordinates\":[2.0,1.0,3.0],\"crs\":{\"properties\":{\"href\":\"http://localhost\"},\"type\":\"link\"}}";
-            var pointWithCRS = JsonConvert.DeserializeObject<Point>(pointJson);
+            const string pointJson = "{\"type\":\"Point\",\"coordinates\":[2.0,1.0,3.0],\"crs\":{\"type\":\"link\",\"properties\":{\"href\":\"http://localhost\"}}}";
+            var pointWithCRS = JsonSerializer.Deserialize<Point>(pointJson, DefaultSerializerOptions);
             var linkCRS = pointWithCRS.CRS as LinkedCRS;
 
             Assert.IsNotNull(linkCRS);
@@ -73,14 +73,11 @@ public void Ctor_Throws_ArgumentNullExpection_When_Href_Uri_Is_Null()
         [Test]
         public void Ctor_Throws_ArgumentExpection_When_Href_Is_Not_Dereferencable_Uri()
         {
-#if NETCOREAPP1_1
-            System.Globalization.CultureInfo.CurrentUICulture = new System.Globalization.CultureInfo("en-US");
-#else
             System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("en-US");
-#endif
 
             var argumentExpection = Assert.Throws<ArgumentException>(() => { var crs = new LinkedCRS("http://not-a-valid-<>-url"); });
-            Assert.AreEqual($"must be a dereferenceable URI{Environment.NewLine}Parameter name: href", argumentExpection.Message);
+
+            Assert.AreEqual($"must be a dereferenceable URI (Parameter 'href')", argumentExpection.Message);
         }
 
         [Test]
@@ -127,4 +124,4 @@ public void Equals_GetHashCode_Contract()
             Assert.AreNotEqual(left.GetHashCode(), right.GetHashCode());
         }
     }
-}
+}

src/GeoJSON.Net.Tests/CoordinateReferenceSystem/NamedCrsTests.cs

@@ -1,8 +1,8 @@
 using System;
 using GeoJSON.Net.CoordinateReferenceSystem;
 using GeoJSON.Net.Feature;
-using Newtonsoft.Json;
 using NUnit.Framework;
+using System.Text.Json;
 
 namespace GeoJSON.Net.Tests.CoordinateReferenceSystem
 {
@@ -32,9 +32,9 @@ public void Has_Name_Property_With_Name()
         public void Can_Serialize()
         {
             var collection = new FeatureCollection() { CRS = new NamedCRS("EPSG:31370") };
-            var actualJson = JsonConvert.SerializeObject(collection);
+            var actualJson = JsonSerializer.Serialize(collection, DefaultSerializerOptions);
 
-            JsonAssert.Contains("{\"properties\":{\"name\":\"EPSG:31370\"},\"type\":\"name\"}", actualJson);
+            JsonAssert.Contains("\"type\":\"name\",\"properties\":{\"name\":\"EPSG:31370\"}", actualJson);
         }
 
         [Test]
@@ -84,4 +84,4 @@ public void Equals_GetHashCode_Contract()
             Assert.AreNotEqual(left.GetHashCode(), right.GetHashCode());
         }
     }
-}
+}

src/GeoJSON.Net.Tests/CoordinateReferenceSystem/UnspecifiedCRSTests.cs

@@ -1,6 +1,6 @@
 using GeoJSON.Net.CoordinateReferenceSystem;
 using GeoJSON.Net.Feature;
-using Newtonsoft.Json;
+using System.Text.Json;
 using NUnit.Framework;
 
 namespace GeoJSON.Net.Tests.CoordinateReferenceSystem
@@ -21,16 +21,16 @@ public void Can_Serialize_To_Null()
         {
             var collection = new FeatureCollection { CRS = new UnspecifiedCRS() };
             var expectedJson = "{\"type\":\"FeatureCollection\",\"crs\":null,\"features\":[] }";
-            var actualJson = JsonConvert.SerializeObject(collection);
-            
+            var actualJson = JsonSerializer.Serialize(collection, DefaultSerializerOptions);
+
             JsonAssert.AreEqual(expectedJson, actualJson);
         }
 
         [Test]
         public void Can_Deserialize_From_Null()
         {
             var json = "{\"type\":\"FeatureCollection\",\"crs\":null,\"features\":[] }";
-            var featureCollection = JsonConvert.DeserializeObject<FeatureCollection>(json);
+            var featureCollection = JsonSerializer.Deserialize<FeatureCollection>(json, DefaultSerializerOptions);
 
             Assert.IsInstanceOf<UnspecifiedCRS>(featureCollection.CRS);
         }
@@ -55,4 +55,4 @@ public void Equals_GetHashCode_Contract()
             Assert.AreEqual(left.GetHashCode(), right.GetHashCode());
         }
     }
-}
+}

src/GeoJSON.Net.Tests/Feature/FeatureCollectionTests.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using GeoJSON.Net.Feature;
 using GeoJSON.Net.Geometry;
-using Newtonsoft.Json;
+using System.Text.Json;
 using NUnit.Framework;
 
 namespace GeoJSON.Net.Tests.Feature
@@ -23,12 +23,12 @@ public void Ctor_Throws_ArgumentNullException_When_Features_Is_Null()
         [Test]
         public void Can_Deserialize()
         {
-            string json = GetExpectedJson();
+            var json = GetExpectedJson();
 
-            var featureCollection = JsonConvert.DeserializeObject<FeatureCollection>(json);
+            var featureCollection = JsonSerializer.Deserialize<FeatureCollection>(json, DefaultSerializerOptions);
 
             Assert.IsNotNull(featureCollection.Features);
-            Assert.AreEqual(featureCollection.Features.Count, 3);
+            Assert.AreEqual(3, featureCollection.Features.Count);
             Assert.AreEqual(featureCollection.Features.Count(x => x.Geometry.Type == GeoJSONObjectType.Point), 1);
             Assert.AreEqual(featureCollection.Features.Count(x => x.Geometry.Type == GeoJSONObjectType.MultiPolygon), 1);
             Assert.AreEqual(featureCollection.Features.Count(x => x.Geometry.Type == GeoJSONObjectType.Polygon), 1);
@@ -56,13 +56,13 @@ public void FeatureCollectionSerialization()
                 model.Features.Add(feature);
             }
 
-            var actualJson = JsonConvert.SerializeObject(model);
+            var actualJson = JsonSerializer.Serialize<FeatureCollection>(model);
 
             Assert.IsNotNull(actualJson);
 
             Assert.IsFalse(string.IsNullOrEmpty(actualJson));
         }
-        
+
         [Test]
         public void FeatureCollection_Equals_GetHashCode_Contract()
         {
@@ -76,12 +76,12 @@ public void FeatureCollection_Equals_GetHashCode_Contract()
         public void Serialized_And_Deserialized_FeatureCollection_Equals_And_Share_HashCode()
         {
             var leftFc = GetFeatureCollection();
-            var leftJson = JsonConvert.SerializeObject(leftFc);
-            var left = JsonConvert.DeserializeObject<FeatureCollection>(leftJson);
+            var leftJson = JsonSerializer.Serialize<FeatureCollection>(leftFc);
+            var left = JsonSerializer.Deserialize<FeatureCollection>(leftJson);
 
             var rightFc = GetFeatureCollection();
-            var rightJson = JsonConvert.SerializeObject(rightFc);
-            var right = JsonConvert.DeserializeObject<FeatureCollection>(rightJson);
+            var rightJson = JsonSerializer.Serialize<FeatureCollection>(rightFc);
+            var right = JsonSerializer.Deserialize<FeatureCollection>(rightJson);
 
             Assert_Are_Equal(left, right);
         }
@@ -124,12 +124,10 @@ public void FeatureCollection_Test_IndexOf()
                 Assert.AreEqual(expectedId, actualId);
                 Assert.AreEqual(expectedIndex, actualIndex);
 
-                Assert.Inconclusive("not supported. the Feature.Id is optional. " + 
+                Assert.Inconclusive("not supported. the Feature.Id is optional. " +
                     " create a new class that inherits from" +
                     " Feature and then override Equals and GetHashCode");
-
             }
-
         }
 
 
@@ -171,4 +169,4 @@ private void Assert_Are_Equal(FeatureCollection left, FeatureCollection right)
             Assert.AreEqual(left.GetHashCode(), right.GetHashCode());
         }
     }
-}
+}

src/GeoJSON.Net.Tests/Feature/FeatureCollectionTests_Can_Deserialize.json

@@ -4,7 +4,7 @@
         "type": "Feature",
         "geometry": {
             "type": "Point",
-            "coordinates": [102.0, 0.5]
+            "coordinates": [102, 0.5]
         },
         "properties": {
             "prop0": "value0"
@@ -58,11 +58,11 @@
             "type": "Polygon",
             "coordinates": [
                 [
-                    [100.0, 0.0],
-                    [101.0, 0.0],
-                    [101.0, 1.0],
-                    [100.0, 1.0],
-                    [100.0, 0.0]
+                    [100, 0],
+                    [101, 0],
+                    [101, 1],
+                    [100, 1],
+                    [100, 0]
                 ]
             ]
         },
@@ -73,4 +73,4 @@
             }
         }
     }]
-}
+}