diff --git a/ClientNoSqlDB.Samples.Maui/ClientNoSqlDB.Samples.Maui.csproj b/ClientNoSqlDB.Samples.Maui/ClientNoSqlDB.Samples.Maui.csproj
index 202f08c..297a9d9 100644
--- a/ClientNoSqlDB.Samples.Maui/ClientNoSqlDB.Samples.Maui.csproj
+++ b/ClientNoSqlDB.Samples.Maui/ClientNoSqlDB.Samples.Maui.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net10.0-ios;;net10.0-android36.0</TargetFrameworks>
+		<TargetFrameworks>net10.0-ios;net10.0-android</TargetFrameworks>
 		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.22621.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
@@ -58,9 +58,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Caliburn.Micro.Maui" Version="5.0.183-beta" />
-		<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.11" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.1" />
+		<PackageReference Include="Caliburn.Micro.Maui" Version="5.0.231-beta" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.50" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.5" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/ClientNoSqlDB.Samples.NetCore/ClientNoSqlDB.Samples.NetCore.csproj b/ClientNoSqlDB.Samples.NetCore/ClientNoSqlDB.Samples.NetCore.csproj
index c067ba2..9078fd1 100644
--- a/ClientNoSqlDB.Samples.NetCore/ClientNoSqlDB.Samples.NetCore.csproj
+++ b/ClientNoSqlDB.Samples.NetCore/ClientNoSqlDB.Samples.NetCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/ClientNoSqlDB.Tests/ClientNoSqlDB.Tests.csproj b/ClientNoSqlDB.Tests/ClientNoSqlDB.Tests.csproj
index c4f5528..fa9907d 100644
--- a/ClientNoSqlDB.Tests/ClientNoSqlDB.Tests.csproj
+++ b/ClientNoSqlDB.Tests/ClientNoSqlDB.Tests.csproj
@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+	<PropertyGroup>
+		<TargetFramework>net10.0</TargetFramework>
 
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
+		<IsPackable>false</IsPackable>
+	</PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
@@ -18,12 +16,16 @@
     <PackageReference Include="xunit.v3" Version="3.2.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ClientNoSqlDB\ClientNoSqlDB.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
-  </ItemGroup>
 
+	<ItemGroup>
+		<ProjectReference Include="..\ClientNoSqlDB\ClientNoSqlDB.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
+	</ItemGroup>
 </Project>
+
+
+
+
+
diff --git a/ClientNoSqlDB.Tests/DbTests.cs b/ClientNoSqlDB.Tests/DbTests.cs
index a73a970..0f09a07 100644
--- a/ClientNoSqlDB.Tests/DbTests.cs
+++ b/ClientNoSqlDB.Tests/DbTests.cs
@@ -1,11 +1,13 @@
-using ClientNoSqlDB;
+using ClientNoSqlDB;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Linq.Expressions;
 using Xunit;
 
 namespace ClientNoSql.Tests
 {
-
     public class AsynchronousAttribute : Attribute { }
 
     public class WorkItemTest
@@ -46,9 +48,6 @@ public void TestPKTypes()
             TestPKKey(i => i.KeyGuid, (o, v) => o.KeyGuid = v, Guid.NewGuid());
             TestPKKey(i => i.KeyGuidN, (o, v) => o.KeyGuidN = v, Guid.NewGuid());
             TestPKKey(i => i.KeyGuidN, (o, v) => o.KeyGuidN = v, null);
-
-
-
         }
 
         private void TestPKKey<T>(Expression<Func<MyDataKeys, T>> pkGetter, Action<MyDataKeys, T> pkSetter, T key)
@@ -68,7 +67,6 @@ private void TestPKKey<T>(Expression<Func<MyDataKeys, T>> pkGetter, Action<MyDat
             db.Purge();
         }
 
-
         private void PurgeDb()
         {
             using (var i = Prepare())
@@ -85,21 +83,18 @@ private void CleanUp()
             db.Dispose();
         }
 
-
         private void OpenDb()
         {
             db = new DbInstance("My Database");
             db.Initialize();
         }
 
-
         private void OpenDbComplexPath()
         {
             db = new DbInstance(@"My Database\My Schema");
             db.Initialize();
         }
 
-
         [Fact]
         public void DoubleOpenDbComplexPath()
         {
@@ -125,7 +120,6 @@ public void MapDbWrong()
 
             db.Initialize();
 
-
             Assert.Throws<InvalidOperationException>(() => db.Map<MyData>().Automap(i => i.Id));
         }
 
@@ -226,7 +220,6 @@ static void IdSequenceEqual(IEnumerable<MyData> a, IEnumerable<MyData> b)
             Assert.True(a.OrderBy(i => i.Id).Select(i => i.Id).SequenceEqual(b.OrderBy(i => i.Id).Select(i => i.Id)));
         }
 
-
         private void LoadData()
         {
             var localTable = db.Table<MyData>();
@@ -246,7 +239,6 @@ public void SaveData()
                 var obj = table.LoadByKey(key);
 
                 Assert.Equal(newObj.Name, obj.Name);
-
             });
         }
 
@@ -285,20 +277,17 @@ public void LoadDataBulk()
             });
         }
 
-
         private void Compact()
         {
             table.Compact();
         }
 
-
         private void CheckInfo()
         {
             _ = table.GetInfo();
             _ = db.GetInfo();
         }
 
-
         [Fact]
         public void RoundTripNulls()
         {
@@ -660,7 +649,6 @@ public void TestDeleteByKeyObj()
             table.Save(obj);
 
             Assert.True(table.DeleteByKey((object)obj.Id));
-
         }
 
         public void Dispose()
diff --git a/ClientNoSqlDB.Tests/DbTests2.cs b/ClientNoSqlDB.Tests/DbTests2.cs
index f110536..d36fff0 100644
--- a/ClientNoSqlDB.Tests/DbTests2.cs
+++ b/ClientNoSqlDB.Tests/DbTests2.cs
@@ -1,5 +1,6 @@
 using ClientNoSqlDB;
 using ClientNoSqlDB.Serialization;
+using System;
 using Xunit;
 
 namespace ClientNoSql.Tests
diff --git a/ClientNoSqlDB.Tests/DbTests3.cs b/ClientNoSqlDB.Tests/DbTests3.cs
index da2301c..390e3b3 100644
--- a/ClientNoSqlDB.Tests/DbTests3.cs
+++ b/ClientNoSqlDB.Tests/DbTests3.cs
@@ -1,5 +1,6 @@
 using ClientNoSqlDB;
 using ClientNoSqlDB.Serialization;
+using System;
 using Xunit;
 
 namespace ClientNoSql.Tests
diff --git a/ClientNoSqlDB/ClientNoSqlDB.csproj b/ClientNoSqlDB/ClientNoSqlDB.csproj
index 0cbbeef..2ae8fa1 100644
--- a/ClientNoSqlDB/ClientNoSqlDB.csproj
+++ b/ClientNoSqlDB/ClientNoSqlDB.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
 		<PackOnBuild>false</PackOnBuild>
 		<PackageId>ClientNoSqlDB</PackageId>
 		<PackageVersion>3.0</PackageVersion>