From 5c1898be8f181ede5559063a0d08ebd530c4e830 Mon Sep 17 00:00:00 2001 From: Matthias Gernand Date: Wed, 9 Nov 2022 10:31:59 +0100 Subject: [PATCH] Upgraded to .NET 7 (#18) * Upgraded to .NET 7 * Updated packages. * Fixed nullable warnings. --- GitVersion.yml | 1 + azure-pipelines.yml | 2 +- .../Fluxera.Spatial.JsonNet.csproj | 4 ++-- .../Fluxera.Spatial.LiteDB.csproj | 4 ++-- .../Fluxera.Spatial.MongoDB.csproj | 6 +++--- .../Fluxera.Spatial.SystemTextJson.csproj | 6 +++--- src/Fluxera.Spatial/Fluxera.Spatial.csproj | 6 +++--- .../Fluxera.Spatial.JsonNet.UnitTests.csproj | 12 ++++++------ .../Fluxera.Spatial.LiteDB.UnitTests.csproj | 12 ++++++------ .../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.MongoDB.UnitTests.csproj | 8 ++++---- .../Fluxera.Spatial.SystemTextJson.UnitTests.csproj | 12 ++++++------ .../Fluxera.Spatial.UnitTests.csproj | 12 ++++++------ 19 files changed, 50 insertions(+), 49 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 0093d88..fc459e3 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1 +1,2 @@ mode: Mainline +next-version: 7.0.0 \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5e99bad..81fa9ce 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ trigger: variables: BuildConfiguration: Release - DotNetCoreVersion: 6.0.x + DotNetCoreVersion: 7.0.x stages: - stage: BuildAndTest diff --git a/src/Fluxera.Spatial.JsonNet/Fluxera.Spatial.JsonNet.csproj b/src/Fluxera.Spatial.JsonNet/Fluxera.Spatial.JsonNet.csproj index dac043f..ca65ca6 100644 --- a/src/Fluxera.Spatial.JsonNet/Fluxera.Spatial.JsonNet.csproj +++ b/src/Fluxera.Spatial.JsonNet/Fluxera.Spatial.JsonNet.csproj @@ -22,11 +22,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Fluxera.Spatial.LiteDB/Fluxera.Spatial.LiteDB.csproj b/src/Fluxera.Spatial.LiteDB/Fluxera.Spatial.LiteDB.csproj index 2522435..8f07b22 100644 --- a/src/Fluxera.Spatial.LiteDB/Fluxera.Spatial.LiteDB.csproj +++ b/src/Fluxera.Spatial.LiteDB/Fluxera.Spatial.LiteDB.csproj @@ -22,11 +22,11 @@ - + 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 268849f..d0c5ed5 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 04008e7..5f36bb2 100644 --- a/src/Fluxera.Spatial.SystemTextJson/Fluxera.Spatial.SystemTextJson.csproj +++ b/src/Fluxera.Spatial.SystemTextJson/Fluxera.Spatial.SystemTextJson.csproj @@ -22,12 +22,12 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/Fluxera.Spatial/Fluxera.Spatial.csproj b/src/Fluxera.Spatial/Fluxera.Spatial.csproj index d76d9b6..f7e1de5 100644 --- a/src/Fluxera.Spatial/Fluxera.Spatial.csproj +++ b/src/Fluxera.Spatial/Fluxera.Spatial.csproj @@ -22,12 +22,12 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + 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 f8440a3..3fa74df 100644 --- a/tests/Fluxera.Spatial.JsonNet.UnitTests/Fluxera.Spatial.JsonNet.UnitTests.csproj +++ b/tests/Fluxera.Spatial.JsonNet.UnitTests/Fluxera.Spatial.JsonNet.UnitTests.csproj @@ -1,17 +1,17 @@ - net6.0 + net7.0 false - - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 7f18ac6..7f82817 100644 --- a/tests/Fluxera.Spatial.LiteDB.UnitTests/Fluxera.Spatial.LiteDB.UnitTests.csproj +++ b/tests/Fluxera.Spatial.LiteDB.UnitTests/Fluxera.Spatial.LiteDB.UnitTests.csproj @@ -1,17 +1,17 @@ - net6.0 + net7.0 false - - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/GeometryCollectionTests.cs b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/GeometryCollectionTests.cs index f0fe731..2fef302 100644 --- a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/GeometryCollectionTests.cs +++ b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/GeometryCollectionTests.cs @@ -23,7 +23,7 @@ protected override GeometryCollection Deserialize(string jsonName) /// protected override string Serialize(GeometryCollection obj) { - BsonDocument? doc = BsonMapper.Global.ToDocument(obj); + BsonDocument doc = BsonMapper.Global.ToDocument(obj); return JsonSerializer.Serialize(doc); } } diff --git a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/LineStringTests.cs b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/LineStringTests.cs index fe7bbd2..28c6c93 100644 --- a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/LineStringTests.cs +++ b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/LineStringTests.cs @@ -23,7 +23,7 @@ protected override LineString Deserialize(string jsonName) /// protected override string Serialize(LineString obj) { - BsonDocument? doc = BsonMapper.Global.ToDocument(obj); + BsonDocument doc = BsonMapper.Global.ToDocument(obj); return JsonSerializer.Serialize(doc); } } diff --git a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/MultiLineStringTests.cs b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/MultiLineStringTests.cs index 427d4d9..2cd791f 100644 --- a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/MultiLineStringTests.cs +++ b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/MultiLineStringTests.cs @@ -23,7 +23,7 @@ protected override MultiLineString Deserialize(string jsonName) /// protected override string Serialize(MultiLineString obj) { - BsonDocument? doc = BsonMapper.Global.ToDocument(obj); + BsonDocument doc = BsonMapper.Global.ToDocument(obj); return JsonSerializer.Serialize(doc); } } diff --git a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/MultiPointTests.cs b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/MultiPointTests.cs index b46050a..6a9c2d6 100644 --- a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/MultiPointTests.cs +++ b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/MultiPointTests.cs @@ -23,7 +23,7 @@ protected override MultiPoint Deserialize(string jsonName) /// protected override string Serialize(MultiPoint obj) { - BsonDocument? doc = BsonMapper.Global.ToDocument(obj); + BsonDocument doc = BsonMapper.Global.ToDocument(obj); return JsonSerializer.Serialize(doc); } } diff --git a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/MultiPolygonTests.cs b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/MultiPolygonTests.cs index bc56512..8507807 100644 --- a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/MultiPolygonTests.cs +++ b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/MultiPolygonTests.cs @@ -23,7 +23,7 @@ protected override MultiPolygon Deserialize(string jsonName) /// protected override string Serialize(MultiPolygon obj) { - BsonDocument? doc = BsonMapper.Global.ToDocument(obj); + BsonDocument doc = BsonMapper.Global.ToDocument(obj); return JsonSerializer.Serialize(doc); } } diff --git a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/PointTests.cs b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/PointTests.cs index 6194ee0..fae4a31 100644 --- a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/PointTests.cs +++ b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/PointTests.cs @@ -23,7 +23,7 @@ protected override Point Deserialize(string jsonName) /// protected override string Serialize(Point obj) { - BsonDocument? doc = BsonMapper.Global.ToDocument(obj); + BsonDocument doc = BsonMapper.Global.ToDocument(obj); return JsonSerializer.Serialize(doc); } } diff --git a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/PolygonTests.cs b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/PolygonTests.cs index b71834a..e0f71ed 100644 --- a/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/PolygonTests.cs +++ b/tests/Fluxera.Spatial.LiteDB.UnitTests/Geometry/PolygonTests.cs @@ -23,7 +23,7 @@ protected override Polygon Deserialize(string jsonName) /// protected override string Serialize(Polygon obj) { - BsonDocument? doc = BsonMapper.Global.ToDocument(obj); + BsonDocument doc = BsonMapper.Global.ToDocument(obj); return JsonSerializer.Serialize(doc); } } 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 5923dd9..6ff0b12 100644 --- a/tests/Fluxera.Spatial.MongoDB.UnitTests/Fluxera.Spatial.MongoDB.UnitTests.csproj +++ b/tests/Fluxera.Spatial.MongoDB.UnitTests/Fluxera.Spatial.MongoDB.UnitTests.csproj @@ -1,15 +1,15 @@ - net6.0 + net7.0 false - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 d11d56b..b163be8 100644 --- a/tests/Fluxera.Spatial.SystemTextJson.UnitTests/Fluxera.Spatial.SystemTextJson.UnitTests.csproj +++ b/tests/Fluxera.Spatial.SystemTextJson.UnitTests/Fluxera.Spatial.SystemTextJson.UnitTests.csproj @@ -1,17 +1,17 @@ - net6.0 + net7.0 false - - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Fluxera.Spatial.UnitTests/Fluxera.Spatial.UnitTests.csproj b/tests/Fluxera.Spatial.UnitTests/Fluxera.Spatial.UnitTests.csproj index 08668d6..e2a2f46 100644 --- a/tests/Fluxera.Spatial.UnitTests/Fluxera.Spatial.UnitTests.csproj +++ b/tests/Fluxera.Spatial.UnitTests/Fluxera.Spatial.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 false @@ -30,12 +30,12 @@ - - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive