diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f9e105f..ba7e853 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,6 +44,7 @@ jobs:
           dotnet-version: |
             8.0.x
             9.0.x
+            10.0.x
 
       - name: Verify code format
         if: matrix.os == 'ubuntu-latest'
@@ -52,15 +53,11 @@ jobs:
 
       - name: Run unit tests ubuntu
         if: matrix.os == 'ubuntu-latest'
-        env:
-          RuntimeIdentifier: unix
         run: dotnet test -c ${{ env.configuration }}
         working-directory: './src'
 
       - name: Run unit tests macos
         if: matrix.os == 'macos-latest'
-        env:
-          RuntimeIdentifier: unix
         run: dotnet test -c ${{ env.configuration }}
         working-directory: './src'
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 13bf4f3..b750b77 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
new file mode 100644
index 0000000..57fcc72
--- /dev/null
+++ b/src/Directory.Packages.props
@@ -0,0 +1,8 @@
+<Project>
+    <PropertyGroup>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageVersion Include="MSTest" Version="4.0.2" />
+    </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/WCharT.Net.Tests/AssemblyInfo.cs b/src/WCharT.Net.Tests/AssemblyInfo.cs
new file mode 100644
index 0000000..1e8298b
--- /dev/null
+++ b/src/WCharT.Net.Tests/AssemblyInfo.cs
@@ -0,0 +1 @@
+[assembly: Parallelize]
\ No newline at end of file
diff --git a/src/WCharT.Net.Tests/WCharT.Net.Tests.csproj b/src/WCharT.Net.Tests/WCharT.Net.Tests.csproj
index 0da9627..fcc3e27 100644
--- a/src/WCharT.Net.Tests/WCharT.Net.Tests.csproj
+++ b/src/WCharT.Net.Tests/WCharT.Net.Tests.csproj
@@ -2,13 +2,11 @@
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RootNamespace>WCHarT.Tests</RootNamespace>
+    <RootNamespace>WCharT.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.9.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.9.2" />
+    <PackageReference Include="MSTest" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WCharT.Net/WCharT.Net.csproj b/src/WCharT.Net/WCharT.Net.csproj
index 78f879c..4e72dd6 100644
--- a/src/WCharT.Net/WCharT.Net.csproj
+++ b/src/WCharT.Net/WCharT.Net.csproj
@@ -34,11 +34,17 @@
 
     <ItemGroup>
         <None Include="../../readme.md" Pack="true" PackagePath="/" Visible="false"/>
+
         <None Include="obj/Release/net8.0/ref/WCharT.Net.dll" Pack="true" PackagePath="ref/net8.0" Visible="false"/>
         <None Include="bin/Release/net8.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/unix/lib/net8.0" Visible="false"/>
         <None Include="bin/Release/net8.0/win/WCharT.Net.dll" Pack="true" PackagePath="runtimes/win/lib/net8.0" Visible="false"/>
+
         <None Include="obj/Release/net9.0/ref/WCharT.Net.dll" Pack="true" PackagePath="ref/net9.0" Visible="false"/>
         <None Include="bin/Release/net9.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/unix/lib/net9.0" Visible="false"/>
         <None Include="bin/Release/net9.0/win/WCharT.Net.dll" Pack="true" PackagePath="runtimes/win/lib/net9.0" Visible="false"/>
+
+        <None Include="obj/Release/net10.0/ref/WCharT.Net.dll" Pack="true" PackagePath="ref/net10.0" Visible="false"/>
+        <None Include="bin/Release/net10.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/unix/lib/net10.0" Visible="false"/>
+        <None Include="bin/Release/net10.0/win/WCharT.Net.dll" Pack="true" PackagePath="runtimes/win/lib/net10.0" Visible="false"/>
     </ItemGroup>
 </Project>
diff --git a/src/WCharT.sln b/src/WCharT.sln
deleted file mode 100644
index c50feba..0000000
--- a/src/WCharT.sln
+++ /dev/null
@@ -1,38 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DF100067-E33C-4832-83F5-354B71555EC7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{A84D4649-3834-4DDC-A7D2-5DD527907861}"
-	ProjectSection(SolutionItems) = preProject
-		..\.gitignore = ..\.gitignore
-		Directory.Build.props = Directory.Build.props
-		..\readme.md = ..\readme.md
-		..\.github\dependabot.yml = ..\.github\dependabot.yml
-		..\.github\workflows\ci.yml = ..\.github\workflows\ci.yml
-		build.fsx = build.fsx
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WCharT.Net", "WCharT.Net\WCharT.Net.csproj", "{CC2D672F-0FDC-4190-9DCC-980278D043BB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WCharT.Net.Tests", "WCharT.Net.Tests\WCharT.Net.Tests.csproj", "{F417D234-BB7A-48C4-8DA9-6594943BC052}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CC2D672F-0FDC-4190-9DCC-980278D043BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC2D672F-0FDC-4190-9DCC-980278D043BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC2D672F-0FDC-4190-9DCC-980278D043BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC2D672F-0FDC-4190-9DCC-980278D043BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F417D234-BB7A-48C4-8DA9-6594943BC052}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F417D234-BB7A-48C4-8DA9-6594943BC052}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F417D234-BB7A-48C4-8DA9-6594943BC052}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F417D234-BB7A-48C4-8DA9-6594943BC052}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{CC2D672F-0FDC-4190-9DCC-980278D043BB} = {DF100067-E33C-4832-83F5-354B71555EC7}
-		{F417D234-BB7A-48C4-8DA9-6594943BC052} = {DF100067-E33C-4832-83F5-354B71555EC7}
-	EndGlobalSection
-EndGlobal
diff --git a/src/WCharT.slnx b/src/WCharT.slnx
new file mode 100644
index 0000000..bdc238c
--- /dev/null
+++ b/src/WCharT.slnx
@@ -0,0 +1,15 @@
+<Solution>
+  <Folder Name="/SolutionItems/">
+    <File Path="../.github/dependabot.yml" />
+    <File Path="../.github/workflows/ci.yml" />
+    <File Path="../.gitignore" />
+    <File Path="../readme.md" />
+    <File Path="build.fsx" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="WCharT.Net.Tests/WCharT.Net.Tests.csproj" />
+    <Project Path="WCharT.Net/WCharT.Net.csproj" />
+  </Folder>
+</Solution>