diff --git a/.gitignore b/.gitignore
index ea37bce..04a9704 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,12 @@
 ToDataTable/.vs/
 ToDataTable/ToDataTable.Benchmarks/bin/
 ToDataTable/ToDataTable.Benchmarks/obj/
+ToDataTable/ToDataTable.Benchmarks/BenchmarkDotNet.Artifacts
 ToDataTable/ToDataTable.TestDataGenerator/bin/
 ToDataTable/ToDataTable.TestDataGenerator/obj/
 ToDataTable/ToDataTable.Tests/bin/
 ToDataTable/ToDataTable.Tests/obj/
 ToDataTable/ToDataTable/bin/
 ToDataTable/ToDataTable/obj/
+.idea/
+
diff --git a/ToDataTable/ToDataTable.Benchmarks/ToDataTable.Benchmarks.csproj b/ToDataTable/ToDataTable.Benchmarks/ToDataTable.Benchmarks.csproj
index 10b28a7..793165e 100644
--- a/ToDataTable/ToDataTable.Benchmarks/ToDataTable.Benchmarks.csproj
+++ b/ToDataTable/ToDataTable.Benchmarks/ToDataTable.Benchmarks.csproj
@@ -1,19 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
+      <PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
       <PackageReference Include="FastMember" Version="1.5.0" />
-      <PackageReference Include="HyperDescriptor" Version="1.0.5" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\ToDataTable.TestDataGenerator\ToDataTable.TestDataGenerator.csproj" />
-      <ProjectReference Include="..\ToDataTable\ToDataTable.csproj" />
+      <ProjectReference Include="..\ToDataTable.TestDataGenerator\ToDataTable.TestDataGenerator.csproj" AdditionalProperties="Configuration=Release" />
+      <ProjectReference Include="..\ToDataTable\ToDataTable.csproj" AdditionalProperties="Configuration=Release" />
     </ItemGroup>
 
 </Project>
diff --git a/ToDataTable/ToDataTable.TestDataGenerator/ToDataTable.TestDataGenerator.csproj b/ToDataTable/ToDataTable.TestDataGenerator/ToDataTable.TestDataGenerator.csproj
index 9f82679..e1ad3f5 100644
--- a/ToDataTable/ToDataTable.TestDataGenerator/ToDataTable.TestDataGenerator.csproj
+++ b/ToDataTable/ToDataTable.TestDataGenerator/ToDataTable.TestDataGenerator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/ToDataTable/ToDataTable.Tests/ToDataTable.Tests.csproj b/ToDataTable/ToDataTable.Tests/ToDataTable.Tests.csproj
index b0903f3..a509aac 100644
--- a/ToDataTable/ToDataTable.Tests/ToDataTable.Tests.csproj
+++ b/ToDataTable/ToDataTable.Tests/ToDataTable.Tests.csproj
@@ -1,23 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FastMember" Version="1.5.0" />
-        <PackageReference Include="FluentAssertions" Version="5.9.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-        <PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+      <ProjectReference Include="..\ToDataTable.TestDataGenerator\ToDataTable.TestDataGenerator.csproj" />
+      <ProjectReference Include="..\ToDataTable\ToDataTable.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\ToDataTable.TestDataGenerator\ToDataTable.TestDataGenerator.csproj" />
-      <ProjectReference Include="..\ToDataTable\ToDataTable.csproj" />
+      <PackageReference Include="FastMember" Version="1.5.0" />
+      <PackageReference Include="FluentAssertions" Version="8.9.0" />
+      <PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.1" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
+      <PackageReference Include="xunit" Version="2.9.3" />
+      <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        <PrivateAssets>all</PrivateAssets>
+      </PackageReference>
     </ItemGroup>
 
 </Project>
diff --git a/ToDataTable/ToDataTable.sln b/ToDataTable/ToDataTable.sln
deleted file mode 100644
index 9bddac3..0000000
--- a/ToDataTable/ToDataTable.sln
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToDataTable.Tests", "ToDataTable.Tests\ToDataTable.Tests.csproj", "{1E9E257C-5A34-40BB-BE64-47404D2D8941}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToDataTable", "ToDataTable\ToDataTable.csproj", "{1A5E78EC-16B0-40BF-9848-D1B17F33B501}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToDataTable.Benchmarks", "ToDataTable.Benchmarks\ToDataTable.Benchmarks.csproj", "{3BFF1647-D02F-40D6-A8F3-6F1C7E635CC5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToDataTable.TestDataGenerator", "ToDataTable.TestDataGenerator\ToDataTable.TestDataGenerator.csproj", "{D48109BD-CCF6-41D5-BF65-9E32C4041928}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1E9E257C-5A34-40BB-BE64-47404D2D8941}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1E9E257C-5A34-40BB-BE64-47404D2D8941}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1E9E257C-5A34-40BB-BE64-47404D2D8941}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1E9E257C-5A34-40BB-BE64-47404D2D8941}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1A5E78EC-16B0-40BF-9848-D1B17F33B501}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A5E78EC-16B0-40BF-9848-D1B17F33B501}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A5E78EC-16B0-40BF-9848-D1B17F33B501}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A5E78EC-16B0-40BF-9848-D1B17F33B501}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BFF1647-D02F-40D6-A8F3-6F1C7E635CC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BFF1647-D02F-40D6-A8F3-6F1C7E635CC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BFF1647-D02F-40D6-A8F3-6F1C7E635CC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BFF1647-D02F-40D6-A8F3-6F1C7E635CC5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D48109BD-CCF6-41D5-BF65-9E32C4041928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D48109BD-CCF6-41D5-BF65-9E32C4041928}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D48109BD-CCF6-41D5-BF65-9E32C4041928}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D48109BD-CCF6-41D5-BF65-9E32C4041928}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
diff --git a/ToDataTable/ToDataTable.slnx b/ToDataTable/ToDataTable.slnx
new file mode 100644
index 0000000..5800228
--- /dev/null
+++ b/ToDataTable/ToDataTable.slnx
@@ -0,0 +1,6 @@
+<Solution>
+  <Project Path="ToDataTable.Benchmarks/ToDataTable.Benchmarks.csproj" />
+  <Project Path="ToDataTable.TestDataGenerator/ToDataTable.TestDataGenerator.csproj" />
+  <Project Path="ToDataTable.Tests/ToDataTable.Tests.csproj" />
+  <Project Path="ToDataTable/ToDataTable.csproj" />
+</Solution>
diff --git a/ToDataTable/ToDataTable/ToDataTable.csproj b/ToDataTable/ToDataTable/ToDataTable.csproj
index 3b1a845..cfb8081 100644
--- a/ToDataTable/ToDataTable/ToDataTable.csproj
+++ b/ToDataTable/ToDataTable/ToDataTable.csproj
@@ -1,37 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
-
+        <TargetFramework>netstandard2.0</TargetFramework>
         <IsPackable>true</IsPackable>
-
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-
         <Authors>Chris Hodges</Authors>
-
         <Description>ToDataTable is a pair of .Net Core extension methods that allow you to create a .Net DataTable (or a SQL Server Table-Valued Parameter) from a collection of objects.</Description>
-
         <PackageLicenseUrl></PackageLicenseUrl>
-
         <PackageProjectUrl>https://github.com/ChrisHodges/ToDataTable</PackageProjectUrl>
-
         <RepositoryUrl>https://github.com/ChrisHodges/ToDataTable</RepositoryUrl>
-
         <ApplicationIcon />
-
         <OutputType>Library</OutputType>
-
         <StartupObject />
-
-        <AssemblyVersion>0.1.2.0</AssemblyVersion>
-
-        <FileVersion>0.1.2.0</FileVersion>
-
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+        <FileVersion>1.0.0.0</FileVersion>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
-
-        <Version>0.1.0</Version>
-
-        <PackageVersion>0.1.2</PackageVersion>
+        <Version>1.0.0</Version>
+        <PackageVersion>1.0.0</PackageVersion>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -39,7 +24,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
+        <PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/ToDataTable/ToDataTable/ToDataTableExtensionMethods.cs b/ToDataTable/ToDataTable/ToDataTableExtensionMethods.cs
index 63b6abe..0599a70 100644
--- a/ToDataTable/ToDataTable/ToDataTableExtensionMethods.cs
+++ b/ToDataTable/ToDataTable/ToDataTableExtensionMethods.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace ToDataTable
 {