From 0460fd4410d15c58658796b5daae613957397e16 Mon Sep 17 00:00:00 2001 From: Matthias Gernand Date: Tue, 7 Jun 2022 16:53:43 +0200 Subject: [PATCH] Updated packages. (#11) --- .../Fluxera.Spatial.JsonNet.csproj | 2 +- .../GeometryCollectionConverter.cs | 8 ++++---- src/Fluxera.Spatial.JsonNet/LineStringConverter.cs | 4 ++-- .../MultiLineStringConverter.cs | 4 ++-- src/Fluxera.Spatial.JsonNet/MultiPointConverter.cs | 4 ++-- src/Fluxera.Spatial.JsonNet/MultiPolygonConverter.cs | 4 ++-- src/Fluxera.Spatial.JsonNet/PointConverter.cs | 4 ++-- src/Fluxera.Spatial.JsonNet/PolygonConverter.cs | 4 ++-- .../Fluxera.Spatial.LiteDB.csproj | 2 +- .../Fluxera.Spatial.MongoDB.csproj | 4 ++-- .../Fluxera.Spatial.SystemTextJson.csproj | 2 +- .../GeometryCollectionConverter.cs | 10 +++++----- .../LineStringConverter.cs | 4 ++-- .../MultiLineStringConverter.cs | 4 ++-- .../MultiPointConverter.cs | 4 ++-- .../MultiPolygonConverter.cs | 4 ++-- src/Fluxera.Spatial.SystemTextJson/PointConverter.cs | 4 ++-- src/Fluxera.Spatial.SystemTextJson/PolygonConverter.cs | 4 ++-- src/Fluxera.Spatial/Fluxera.Spatial.csproj | 4 ++-- src/Fluxera.Spatial/Geometry/GeometryCollection.cs | 2 +- src/Fluxera.Spatial/Geometry/LineString.cs | 2 +- src/Fluxera.Spatial/Geometry/MultiLineString.cs | 2 +- src/Fluxera.Spatial/Geometry/MultiPoint.cs | 2 +- src/Fluxera.Spatial/Geometry/MultiPolygon.cs | 2 +- src/Fluxera.Spatial/Geometry/Polygon.cs | 2 +- .../Fluxera.Spatial.JsonNet.UnitTests.csproj | 2 -- .../Geometry/GeometryCollectionTests.cs | 2 +- .../Geometry/LineStringTests.cs | 2 +- .../Geometry/MultiLineStringTests.cs | 2 +- .../Geometry/MultiPointTests.cs | 2 +- .../Geometry/MultiPolygonTests.cs | 2 +- .../Geometry/PointTests.cs | 2 +- .../Geometry/PolygonTests.cs | 2 +- .../Fluxera.Spatial.LiteDB.UnitTests.csproj | 2 -- .../Fluxera.Spatial.MongoDB.UnitTests.csproj | 2 -- .../Fluxera.Spatial.SystemTextJson.UnitTests.csproj | 2 -- .../Fluxera.Spatial.UnitTests.csproj | 2 -- tests/Fluxera.Spatial.UnitTests/TestsBase.cs | 2 +- 38 files changed, 54 insertions(+), 64 deletions(-) diff --git a/src/Fluxera.Spatial.JsonNet/Fluxera.Spatial.JsonNet.csproj b/src/Fluxera.Spatial.JsonNet/Fluxera.Spatial.JsonNet.csproj index f39b351..dac043f 100644 --- a/src/Fluxera.Spatial.JsonNet/Fluxera.Spatial.JsonNet.csproj +++ b/src/Fluxera.Spatial.JsonNet/Fluxera.Spatial.JsonNet.csproj @@ -22,7 +22,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Fluxera.Spatial.JsonNet/GeometryCollectionConverter.cs b/src/Fluxera.Spatial.JsonNet/GeometryCollectionConverter.cs index e0039d3..ca4801b 100644 --- a/src/Fluxera.Spatial.JsonNet/GeometryCollectionConverter.cs +++ b/src/Fluxera.Spatial.JsonNet/GeometryCollectionConverter.cs @@ -45,12 +45,12 @@ public override GeometryCollection ReadJson(JsonReader reader, Type objectType, if(item.ContainsKey("type")) { - string type = item["type"]!.Value()!; + string type = item["type"].Value(); if(type == "GeometryCollection") { if(item.ContainsKey("geometries")) { - JToken geometriesToken = item["geometries"]!; + JToken geometriesToken = item["geometries"]; if(geometriesToken.Type == JTokenType.Array) { JArray geometriesArray = (JArray)geometriesToken; @@ -58,7 +58,7 @@ public override GeometryCollection ReadJson(JsonReader reader, Type objectType, IList geometries = new List(); foreach(JToken token in geometriesArray) { - string geometryTypeName = token["type"]!.Value()!; + string geometryTypeName = token["type"].Value(); Type geometryType = geometryTypeName switch { @@ -71,7 +71,7 @@ public override GeometryCollection ReadJson(JsonReader reader, Type objectType, _ => throw new ArgumentOutOfRangeException() }; - object geometry = serializer.Deserialize(token.CreateReader(), geometryType)!; + object geometry = serializer.Deserialize(token.CreateReader(), geometryType); geometries.Add((IGeometry)geometry); } diff --git a/src/Fluxera.Spatial.JsonNet/LineStringConverter.cs b/src/Fluxera.Spatial.JsonNet/LineStringConverter.cs index 9564a61..ba9329c 100644 --- a/src/Fluxera.Spatial.JsonNet/LineStringConverter.cs +++ b/src/Fluxera.Spatial.JsonNet/LineStringConverter.cs @@ -40,12 +40,12 @@ public override LineString ReadJson(JsonReader reader, Type objectType, LineStri if(item.ContainsKey("type")) { - string type = item["type"]!.Value()!; + string type = item["type"].Value(); if(type == "LineString") { if(item.ContainsKey("coordinates")) { - JToken jToken = item["coordinates"]!; + JToken jToken = item["coordinates"]; if(jToken.Type == JTokenType.Array) { JArray jArray = (JArray)jToken; diff --git a/src/Fluxera.Spatial.JsonNet/MultiLineStringConverter.cs b/src/Fluxera.Spatial.JsonNet/MultiLineStringConverter.cs index e8a4076..9ea76c0 100644 --- a/src/Fluxera.Spatial.JsonNet/MultiLineStringConverter.cs +++ b/src/Fluxera.Spatial.JsonNet/MultiLineStringConverter.cs @@ -47,12 +47,12 @@ public override MultiLineString ReadJson(JsonReader reader, Type objectType, Mul if(item.ContainsKey("type")) { - string type = item["type"]!.Value()!; + string type = item["type"].Value(); if(type == "MultiLineString") { if(item.ContainsKey("coordinates")) { - JToken jToken = item["coordinates"]!; + JToken jToken = item["coordinates"]; if(jToken.Type == JTokenType.Array) { JArray outerArray = (JArray)jToken; diff --git a/src/Fluxera.Spatial.JsonNet/MultiPointConverter.cs b/src/Fluxera.Spatial.JsonNet/MultiPointConverter.cs index 7a4a125..4ff7ce1 100644 --- a/src/Fluxera.Spatial.JsonNet/MultiPointConverter.cs +++ b/src/Fluxera.Spatial.JsonNet/MultiPointConverter.cs @@ -40,12 +40,12 @@ public override MultiPoint ReadJson(JsonReader reader, Type objectType, MultiPoi if(item.ContainsKey("type")) { - string type = item["type"]!.Value()!; + string type = item["type"].Value(); if(type == "MultiPoint") { if(item.ContainsKey("coordinates")) { - JToken coordinatesToken = item["coordinates"]!; + JToken coordinatesToken = item["coordinates"]; if(coordinatesToken.Type == JTokenType.Array) { JArray positionsArray = (JArray)coordinatesToken; diff --git a/src/Fluxera.Spatial.JsonNet/MultiPolygonConverter.cs b/src/Fluxera.Spatial.JsonNet/MultiPolygonConverter.cs index dd10931..d376977 100644 --- a/src/Fluxera.Spatial.JsonNet/MultiPolygonConverter.cs +++ b/src/Fluxera.Spatial.JsonNet/MultiPolygonConverter.cs @@ -54,12 +54,12 @@ public override MultiPolygon ReadJson(JsonReader reader, Type objectType, MultiP if(item.ContainsKey("type")) { - string type = item["type"]!.Value()!; + string type = item["type"].Value(); if(type == "MultiPolygon") { if(item.ContainsKey("coordinates")) { - JToken coordinatesToken = item["coordinates"]!; + JToken coordinatesToken = item["coordinates"]; if(coordinatesToken.Type == JTokenType.Array) { JArray coordinatesArray = (JArray)coordinatesToken; diff --git a/src/Fluxera.Spatial.JsonNet/PointConverter.cs b/src/Fluxera.Spatial.JsonNet/PointConverter.cs index 4e1420e..f446b8e 100644 --- a/src/Fluxera.Spatial.JsonNet/PointConverter.cs +++ b/src/Fluxera.Spatial.JsonNet/PointConverter.cs @@ -32,12 +32,12 @@ public override Point ReadJson(JsonReader reader, Type objectType, Point existin if(item.ContainsKey("type")) { - string type = item["type"]!.Value()!; + string type = item["type"].Value(); if(type == "Point") { if(item.ContainsKey("coordinates")) { - JToken coordinates = item["coordinates"]!; + JToken coordinates = item["coordinates"]; Position position = coordinates.CreateReader().ReadPosition(); return new Point(position); diff --git a/src/Fluxera.Spatial.JsonNet/PolygonConverter.cs b/src/Fluxera.Spatial.JsonNet/PolygonConverter.cs index 9397310..4b51465 100644 --- a/src/Fluxera.Spatial.JsonNet/PolygonConverter.cs +++ b/src/Fluxera.Spatial.JsonNet/PolygonConverter.cs @@ -47,12 +47,12 @@ public override Polygon ReadJson(JsonReader reader, Type objectType, Polygon exi if(item.ContainsKey("type")) { - string type = item["type"]!.Value()!; + string type = item["type"].Value(); if(type == "Polygon") { if(item.ContainsKey("coordinates")) { - JToken jToken = item["coordinates"]!; + JToken jToken = item["coordinates"]; if(jToken.Type == JTokenType.Array) { JArray outerArray = (JArray)jToken; diff --git a/src/Fluxera.Spatial.LiteDB/Fluxera.Spatial.LiteDB.csproj b/src/Fluxera.Spatial.LiteDB/Fluxera.Spatial.LiteDB.csproj index 9c37040..4118c37 100644 --- a/src/Fluxera.Spatial.LiteDB/Fluxera.Spatial.LiteDB.csproj +++ b/src/Fluxera.Spatial.LiteDB/Fluxera.Spatial.LiteDB.csproj @@ -22,7 +22,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Fluxera.Spatial.MongoDB/Fluxera.Spatial.MongoDB.csproj b/src/Fluxera.Spatial.MongoDB/Fluxera.Spatial.MongoDB.csproj index 79a3c85..c7efd59 100644 --- a/src/Fluxera.Spatial.MongoDB/Fluxera.Spatial.MongoDB.csproj +++ b/src/Fluxera.Spatial.MongoDB/Fluxera.Spatial.MongoDB.csproj @@ -22,12 +22,12 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Fluxera.Spatial.SystemTextJson/Fluxera.Spatial.SystemTextJson.csproj b/src/Fluxera.Spatial.SystemTextJson/Fluxera.Spatial.SystemTextJson.csproj index 1edf802..2e1889a 100644 --- a/src/Fluxera.Spatial.SystemTextJson/Fluxera.Spatial.SystemTextJson.csproj +++ b/src/Fluxera.Spatial.SystemTextJson/Fluxera.Spatial.SystemTextJson.csproj @@ -22,7 +22,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Fluxera.Spatial.SystemTextJson/GeometryCollectionConverter.cs b/src/Fluxera.Spatial.SystemTextJson/GeometryCollectionConverter.cs index dac86e2..c0b883f 100644 --- a/src/Fluxera.Spatial.SystemTextJson/GeometryCollectionConverter.cs +++ b/src/Fluxera.Spatial.SystemTextJson/GeometryCollectionConverter.cs @@ -47,19 +47,19 @@ public override GeometryCollection Read(ref Utf8JsonReader reader, Type typeToCo while(reader.Read() && reader.TokenType != JsonTokenType.EndObject) { - string propertyName = reader.GetString()!; + string propertyName = reader.GetString(); reader.Read(); if(propertyName == "type") { - type = reader.GetString()!; + type = reader.GetString(); } else if(propertyName == "geometries") { while(reader.Read() && reader.TokenType != JsonTokenType.EndArray) { - JsonObject jObject = JsonSerializer.Deserialize(ref reader, options)!; - string geometryTypeName = jObject["type"]!.GetValue(); + JsonObject jObject = JsonSerializer.Deserialize(ref reader, options); + string geometryTypeName = jObject["type"].GetValue(); Type geometryType = geometryTypeName switch { @@ -72,7 +72,7 @@ public override GeometryCollection Read(ref Utf8JsonReader reader, Type typeToCo _ => throw new ArgumentOutOfRangeException() }; - object geometry = jObject.Deserialize(geometryType, options)!; + object geometry = jObject.Deserialize(geometryType, options); geometries.Add((IGeometry)geometry); } } diff --git a/src/Fluxera.Spatial.SystemTextJson/LineStringConverter.cs b/src/Fluxera.Spatial.SystemTextJson/LineStringConverter.cs index 1804bc4..fb22d20 100644 --- a/src/Fluxera.Spatial.SystemTextJson/LineStringConverter.cs +++ b/src/Fluxera.Spatial.SystemTextJson/LineStringConverter.cs @@ -41,12 +41,12 @@ public override LineString Read(ref Utf8JsonReader reader, Type typeToConvert, J while(reader.Read() && reader.TokenType != JsonTokenType.EndObject) { - string propertyName = reader.GetString()!; + string propertyName = reader.GetString(); reader.Read(); if(propertyName == "type") { - type = reader.GetString()!; + type = reader.GetString(); } else if(propertyName == "coordinates") { diff --git a/src/Fluxera.Spatial.SystemTextJson/MultiLineStringConverter.cs b/src/Fluxera.Spatial.SystemTextJson/MultiLineStringConverter.cs index 7d97434..d5715c4 100644 --- a/src/Fluxera.Spatial.SystemTextJson/MultiLineStringConverter.cs +++ b/src/Fluxera.Spatial.SystemTextJson/MultiLineStringConverter.cs @@ -48,12 +48,12 @@ public override MultiLineString Read(ref Utf8JsonReader reader, Type typeToConve while(reader.Read() && reader.TokenType != JsonTokenType.EndObject) { - string propertyName = reader.GetString()!; + string propertyName = reader.GetString(); reader.Read(); if(propertyName == "type") { - type = reader.GetString()!; + type = reader.GetString(); } else if(propertyName == "coordinates") { diff --git a/src/Fluxera.Spatial.SystemTextJson/MultiPointConverter.cs b/src/Fluxera.Spatial.SystemTextJson/MultiPointConverter.cs index ac5fa41..f4f0bc7 100644 --- a/src/Fluxera.Spatial.SystemTextJson/MultiPointConverter.cs +++ b/src/Fluxera.Spatial.SystemTextJson/MultiPointConverter.cs @@ -41,12 +41,12 @@ public override MultiPoint Read(ref Utf8JsonReader reader, Type typeToConvert, J while(reader.Read() && reader.TokenType != JsonTokenType.EndObject) { - string propertyName = reader.GetString()!; + string propertyName = reader.GetString(); reader.Read(); if(propertyName == "type") { - type = reader.GetString()!; + type = reader.GetString(); } else if(propertyName == "coordinates") { diff --git a/src/Fluxera.Spatial.SystemTextJson/MultiPolygonConverter.cs b/src/Fluxera.Spatial.SystemTextJson/MultiPolygonConverter.cs index 1cbb0b6..c06675f 100644 --- a/src/Fluxera.Spatial.SystemTextJson/MultiPolygonConverter.cs +++ b/src/Fluxera.Spatial.SystemTextJson/MultiPolygonConverter.cs @@ -55,12 +55,12 @@ public override MultiPolygon Read(ref Utf8JsonReader reader, Type typeToConvert, while(reader.Read() && reader.TokenType != JsonTokenType.EndObject) { - string propertyName = reader.GetString()!; + string propertyName = reader.GetString(); reader.Read(); if(propertyName == "type") { - type = reader.GetString()!; + type = reader.GetString(); } else if(propertyName == "coordinates") { diff --git a/src/Fluxera.Spatial.SystemTextJson/PointConverter.cs b/src/Fluxera.Spatial.SystemTextJson/PointConverter.cs index 1a8234d..2189c43 100644 --- a/src/Fluxera.Spatial.SystemTextJson/PointConverter.cs +++ b/src/Fluxera.Spatial.SystemTextJson/PointConverter.cs @@ -33,12 +33,12 @@ public override Point Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe while(reader.Read() && reader.TokenType != JsonTokenType.EndObject) { - string propertyName = reader.GetString()!; + string propertyName = reader.GetString(); reader.Read(); if(propertyName == "type") { - type = reader.GetString()!; + type = reader.GetString(); } else if(propertyName == "coordinates") { diff --git a/src/Fluxera.Spatial.SystemTextJson/PolygonConverter.cs b/src/Fluxera.Spatial.SystemTextJson/PolygonConverter.cs index 8aa3ee0..36596d3 100644 --- a/src/Fluxera.Spatial.SystemTextJson/PolygonConverter.cs +++ b/src/Fluxera.Spatial.SystemTextJson/PolygonConverter.cs @@ -48,12 +48,12 @@ public override Polygon Read(ref Utf8JsonReader reader, Type typeToConvert, Json while(reader.Read() && reader.TokenType != JsonTokenType.EndObject) { - string propertyName = reader.GetString()!; + string propertyName = reader.GetString(); reader.Read(); if(propertyName == "type") { - type = reader.GetString()!; + type = reader.GetString(); } else if(propertyName == "coordinates") { diff --git a/src/Fluxera.Spatial/Fluxera.Spatial.csproj b/src/Fluxera.Spatial/Fluxera.Spatial.csproj index edbe775..d76d9b6 100644 --- a/src/Fluxera.Spatial/Fluxera.Spatial.csproj +++ b/src/Fluxera.Spatial/Fluxera.Spatial.csproj @@ -22,8 +22,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Fluxera.Spatial/Geometry/GeometryCollection.cs b/src/Fluxera.Spatial/Geometry/GeometryCollection.cs index 06d0b38..4037d6a 100644 --- a/src/Fluxera.Spatial/Geometry/GeometryCollection.cs +++ b/src/Fluxera.Spatial/Geometry/GeometryCollection.cs @@ -66,7 +66,7 @@ public override bool Equals(object obj) /// public override int GetHashCode() { - int hashCode = base.GetHashCode(); + int hashCode = 17; foreach(IGeometry geometryObject in this.Geometries) { diff --git a/src/Fluxera.Spatial/Geometry/LineString.cs b/src/Fluxera.Spatial/Geometry/LineString.cs index a55bf30..3f1ca02 100644 --- a/src/Fluxera.Spatial/Geometry/LineString.cs +++ b/src/Fluxera.Spatial/Geometry/LineString.cs @@ -123,7 +123,7 @@ public override bool Equals(object obj) /// public override int GetHashCode() { - int hashCode = base.GetHashCode(); + int hashCode = 17; foreach(Position position in this.Coordinates) { diff --git a/src/Fluxera.Spatial/Geometry/MultiLineString.cs b/src/Fluxera.Spatial/Geometry/MultiLineString.cs index 38ab798..345da87 100644 --- a/src/Fluxera.Spatial/Geometry/MultiLineString.cs +++ b/src/Fluxera.Spatial/Geometry/MultiLineString.cs @@ -66,7 +66,7 @@ public override bool Equals(object obj) /// public override int GetHashCode() { - int hashCode = base.GetHashCode(); + int hashCode = 17; foreach(LineString lineString in this.Coordinates) { diff --git a/src/Fluxera.Spatial/Geometry/MultiPoint.cs b/src/Fluxera.Spatial/Geometry/MultiPoint.cs index 3ee0d4e..3aa157c 100644 --- a/src/Fluxera.Spatial/Geometry/MultiPoint.cs +++ b/src/Fluxera.Spatial/Geometry/MultiPoint.cs @@ -88,7 +88,7 @@ public override bool Equals(object obj) /// public override int GetHashCode() { - int hashCode = base.GetHashCode(); + int hashCode = 17; foreach(Position position in this.Coordinates) { diff --git a/src/Fluxera.Spatial/Geometry/MultiPolygon.cs b/src/Fluxera.Spatial/Geometry/MultiPolygon.cs index 71301e1..55e84c0 100644 --- a/src/Fluxera.Spatial/Geometry/MultiPolygon.cs +++ b/src/Fluxera.Spatial/Geometry/MultiPolygon.cs @@ -66,7 +66,7 @@ public override bool Equals(object obj) /// public override int GetHashCode() { - int hashCode = base.GetHashCode(); + int hashCode = 17; foreach(Polygon polygon in this.Coordinates) { diff --git a/src/Fluxera.Spatial/Geometry/Polygon.cs b/src/Fluxera.Spatial/Geometry/Polygon.cs index dc46178..326558f 100644 --- a/src/Fluxera.Spatial/Geometry/Polygon.cs +++ b/src/Fluxera.Spatial/Geometry/Polygon.cs @@ -79,7 +79,7 @@ public override bool Equals(object obj) /// public override int GetHashCode() { - int hashCode = base.GetHashCode(); + int hashCode = 17; foreach(LineString lineString in this.Coordinates) { diff --git a/tests/Fluxera.Spatial.JsonNet.UnitTests/Fluxera.Spatial.JsonNet.UnitTests.csproj b/tests/Fluxera.Spatial.JsonNet.UnitTests/Fluxera.Spatial.JsonNet.UnitTests.csproj index 3ceb676..ad60a21 100644 --- a/tests/Fluxera.Spatial.JsonNet.UnitTests/Fluxera.Spatial.JsonNet.UnitTests.csproj +++ b/tests/Fluxera.Spatial.JsonNet.UnitTests/Fluxera.Spatial.JsonNet.UnitTests.csproj @@ -2,8 +2,6 @@ net6.0 - enable - false diff --git a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/GeometryCollectionTests.cs b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/GeometryCollectionTests.cs index 3dc4db3..a766559 100644 --- a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/GeometryCollectionTests.cs +++ b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/GeometryCollectionTests.cs @@ -24,7 +24,7 @@ protected override void OnSetup() /// protected override GeometryCollection Deserialize(string jsonName) { - return JsonConvert.DeserializeObject(this.GetJson(jsonName))!; + return JsonConvert.DeserializeObject(this.GetJson(jsonName)); } /// diff --git a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/LineStringTests.cs b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/LineStringTests.cs index 6a6a118..f0c887b 100644 --- a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/LineStringTests.cs +++ b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/LineStringTests.cs @@ -24,7 +24,7 @@ protected override void OnSetup() /// protected override LineString Deserialize(string jsonName) { - return JsonConvert.DeserializeObject(this.GetJson(jsonName))!; + return JsonConvert.DeserializeObject(this.GetJson(jsonName)); } /// diff --git a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/MultiLineStringTests.cs b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/MultiLineStringTests.cs index fe796eb..09698ab 100644 --- a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/MultiLineStringTests.cs +++ b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/MultiLineStringTests.cs @@ -24,7 +24,7 @@ protected override void OnSetup() /// protected override MultiLineString Deserialize(string jsonName) { - return JsonConvert.DeserializeObject(this.GetJson(jsonName))!; + return JsonConvert.DeserializeObject(this.GetJson(jsonName)); } /// diff --git a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/MultiPointTests.cs b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/MultiPointTests.cs index ff5df7a..74cfae6 100644 --- a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/MultiPointTests.cs +++ b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/MultiPointTests.cs @@ -24,7 +24,7 @@ protected override void OnSetup() /// protected override MultiPoint Deserialize(string jsonName) { - return JsonConvert.DeserializeObject(this.GetJson(jsonName))!; + return JsonConvert.DeserializeObject(this.GetJson(jsonName)); } /// diff --git a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/MultiPolygonTests.cs b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/MultiPolygonTests.cs index 07ab97b..b8eda11 100644 --- a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/MultiPolygonTests.cs +++ b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/MultiPolygonTests.cs @@ -24,7 +24,7 @@ protected override void OnSetup() /// protected override MultiPolygon Deserialize(string jsonName) { - return JsonConvert.DeserializeObject(this.GetJson(jsonName))!; + return JsonConvert.DeserializeObject(this.GetJson(jsonName)); } /// diff --git a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/PointTests.cs b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/PointTests.cs index c6099c7..d865cc7 100644 --- a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/PointTests.cs +++ b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/PointTests.cs @@ -24,7 +24,7 @@ protected override void OnSetup() /// protected override Point Deserialize(string jsonName) { - return JsonConvert.DeserializeObject(this.GetJson(jsonName))!; + return JsonConvert.DeserializeObject(this.GetJson(jsonName)); } /// diff --git a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/PolygonTests.cs b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/PolygonTests.cs index 3aa53fb..bdaadad 100644 --- a/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/PolygonTests.cs +++ b/tests/Fluxera.Spatial.JsonNet.UnitTests/Geometry/PolygonTests.cs @@ -24,7 +24,7 @@ protected override void OnSetup() /// protected override Polygon Deserialize(string jsonName) { - return JsonConvert.DeserializeObject(this.GetJson(jsonName))!; + return JsonConvert.DeserializeObject(this.GetJson(jsonName)); } /// diff --git a/tests/Fluxera.Spatial.LiteDB.UnitTests/Fluxera.Spatial.LiteDB.UnitTests.csproj b/tests/Fluxera.Spatial.LiteDB.UnitTests/Fluxera.Spatial.LiteDB.UnitTests.csproj index 24bb665..df9e7c2 100644 --- a/tests/Fluxera.Spatial.LiteDB.UnitTests/Fluxera.Spatial.LiteDB.UnitTests.csproj +++ b/tests/Fluxera.Spatial.LiteDB.UnitTests/Fluxera.Spatial.LiteDB.UnitTests.csproj @@ -2,8 +2,6 @@ net6.0 - enable - false diff --git a/tests/Fluxera.Spatial.MongoDB.UnitTests/Fluxera.Spatial.MongoDB.UnitTests.csproj b/tests/Fluxera.Spatial.MongoDB.UnitTests/Fluxera.Spatial.MongoDB.UnitTests.csproj index 22f43e7..85e04f6 100644 --- a/tests/Fluxera.Spatial.MongoDB.UnitTests/Fluxera.Spatial.MongoDB.UnitTests.csproj +++ b/tests/Fluxera.Spatial.MongoDB.UnitTests/Fluxera.Spatial.MongoDB.UnitTests.csproj @@ -2,8 +2,6 @@ net6.0 - enable - false diff --git a/tests/Fluxera.Spatial.SystemTextJson.UnitTests/Fluxera.Spatial.SystemTextJson.UnitTests.csproj b/tests/Fluxera.Spatial.SystemTextJson.UnitTests/Fluxera.Spatial.SystemTextJson.UnitTests.csproj index 3411f2d..03deec0 100644 --- a/tests/Fluxera.Spatial.SystemTextJson.UnitTests/Fluxera.Spatial.SystemTextJson.UnitTests.csproj +++ b/tests/Fluxera.Spatial.SystemTextJson.UnitTests/Fluxera.Spatial.SystemTextJson.UnitTests.csproj @@ -2,8 +2,6 @@ net6.0 - enable - false diff --git a/tests/Fluxera.Spatial.UnitTests/Fluxera.Spatial.UnitTests.csproj b/tests/Fluxera.Spatial.UnitTests/Fluxera.Spatial.UnitTests.csproj index 6b425bf..792b86a 100644 --- a/tests/Fluxera.Spatial.UnitTests/Fluxera.Spatial.UnitTests.csproj +++ b/tests/Fluxera.Spatial.UnitTests/Fluxera.Spatial.UnitTests.csproj @@ -2,8 +2,6 @@ net6.0 - enable - false diff --git a/tests/Fluxera.Spatial.UnitTests/TestsBase.cs b/tests/Fluxera.Spatial.UnitTests/TestsBase.cs index 69e613c..be4c6b8 100644 --- a/tests/Fluxera.Spatial.UnitTests/TestsBase.cs +++ b/tests/Fluxera.Spatial.UnitTests/TestsBase.cs @@ -25,7 +25,7 @@ protected string GetJson(string name) string json; - using(Stream resourceStream = Assembly.GetManifestResourceStream(path)!) + using(Stream resourceStream = Assembly.GetManifestResourceStream(path)) { using(StreamReader reader = new StreamReader(resourceStream)) {