Upgraded to .NET 7 (#18)

* Upgraded to .NET 7 * Updated packages. * Fixed nullable warnings.
fluxera · Nov 9, 2022 · 5c1898b · 5c1898b
1 parent a231041
commit 5c1898b
Show file tree

Hide file tree

Showing 19 changed files with 50 additions and 49 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1 +1,2 @@
 mode: Mainline
+next-version: 7.0.0
diff --git 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
@@ -22,11 +22,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="GitVersion.MsBuild" Version="5.10.3">
+		<PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
+		<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	</ItemGroup>
 

diff --git a/src/Fluxera.Spatial.LiteDB/Fluxera.Spatial.LiteDB.csproj b/src/Fluxera.Spatial.LiteDB/Fluxera.Spatial.LiteDB.csproj
@@ -22,11 +22,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="GitVersion.MsBuild" Version="5.10.3">
+		<PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
+		<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
 		<PackageReference Include="LiteDB" Version="5.0.12" />
 	</ItemGroup>
 

diff --git a/src/Fluxera.Spatial.MongoDB/Fluxera.Spatial.MongoDB.csproj b/src/Fluxera.Spatial.MongoDB/Fluxera.Spatial.MongoDB.csproj
@@ -22,12 +22,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="GitVersion.MsBuild" Version="5.10.3">
+		<PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
-		<PackageReference Include="MongoDB.Driver" Version="2.17.1" />
+		<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
+		<PackageReference Include="MongoDB.Driver" Version="2.18.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Fluxera.Spatial.SystemTextJson/Fluxera.Spatial.SystemTextJson.csproj b/src/Fluxera.Spatial.SystemTextJson/Fluxera.Spatial.SystemTextJson.csproj
@@ -22,12 +22,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="GitVersion.MsBuild" Version="5.10.3">
+		<PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
-		<PackageReference Include="System.Text.Json" Version="6.0.6" />
+		<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
+		<PackageReference Include="System.Text.Json" Version="7.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Fluxera.Spatial/Fluxera.Spatial.csproj b/src/Fluxera.Spatial/Fluxera.Spatial.csproj
@@ -22,12 +22,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Fluxera.Guards" Version="6.1.0" />
-		<PackageReference Include="GitVersion.MsBuild" Version="5.10.3">
+		<PackageReference Include="Fluxera.Guards" Version="7.0.0" />
+		<PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
+		<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
 	</ItemGroup>
 
 </Project>
diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git 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)
 		/// <inheritdoc />
 		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
@@ -23,7 +23,7 @@ protected override LineString Deserialize(string jsonName)
 		/// <inheritdoc />
 		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
@@ -23,7 +23,7 @@ protected override MultiLineString Deserialize(string jsonName)
 		/// <inheritdoc />
 		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
@@ -23,7 +23,7 @@ protected override MultiPoint Deserialize(string jsonName)
 		/// <inheritdoc />
 		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
@@ -23,7 +23,7 @@ protected override MultiPolygon Deserialize(string jsonName)
 		/// <inheritdoc />
 		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
@@ -23,7 +23,7 @@ protected override Point Deserialize(string jsonName)
 		/// <inheritdoc />
 		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
@@ -23,7 +23,7 @@ protected override Polygon Deserialize(string jsonName)
 		/// <inheritdoc />
 		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
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/.../Fluxera.Spatial.SystemTextJson.UnitTests/Fluxera.Spatial.SystemTextJson.UnitTests.csproj b/.../Fluxera.Spatial.SystemTextJson.UnitTests/Fluxera.Spatial.SystemTextJson.UnitTests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/tests/Fluxera.Spatial.UnitTests/Fluxera.Spatial.UnitTests.csproj b/tests/Fluxera.Spatial.UnitTests/Fluxera.Spatial.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -30,12 +30,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>