diff --git a/.gitattributes b/.gitattributes
index a2e67a8b..af6a1654 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,3 +22,4 @@ core.eol crlf
 *.fsproj merge=union 
 *.dbproj merge=union 
 *.sln merge=union
+*.slnx merge=union
diff --git a/MediatR.sln b/MediatR.sln
deleted file mode 100644
index 5d4f47d9..00000000
--- a/MediatR.sln
+++ /dev/null
@@ -1,138 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6267E2ED-942C-497D-BFC9-B3CE0AFC276F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{962C5ACA-AB2B-4E9B-9EBB-7E7EE28CDBB1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR", "src\MediatR\MediatR.csproj", "{12DA3F16-060B-467A-993F-2DF25EE6E6A8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Tests", "test\MediatR.Tests\MediatR.Tests.csproj", "{4FB0CFC4-90E3-467F-9704-6FBF637F9B4B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1E133765-6B4E-46C2-8C6C-7238E8EABA79}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		Build.ps1 = Build.ps1
-		BuildContracts.ps1 = BuildContracts.ps1
-		.github\workflows\ci.yml = .github\workflows\ci.yml
-		Directory.Build.props = Directory.Build.props
-		Push.ps1 = Push.ps1
-		README.md = README.md
-		.github\workflows\release.yml = .github\workflows\release.yml
-		MediatR.snk = MediatR.snk
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Benchmarks", "test\MediatR.Benchmarks\MediatR.Benchmarks.csproj", "{1FA62162-F8F1-4CAD-B08E-8DCA603395AD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Contracts", "src\MediatR.Contracts\MediatR.Contracts.csproj", "{87F5A238-44B5-4769-82E5-E68B712D6E6D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{E372BF0B-90E8-4DC1-A332-F023095A3C2A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples", "samples\MediatR.Examples\MediatR.Examples.csproj", "{FB683115-7F96-4529-A412-65A59CC991E4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.AspNetCore", "samples\MediatR.Examples.AspNetCore\MediatR.Examples.AspNetCore.csproj", "{7B6838F9-3CAC-45E8-A796-CA34B05B008F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.Autofac", "samples\MediatR.Examples.Autofac\MediatR.Examples.Autofac.csproj", "{E7EF3E3E-BD58-482E-B293-26CA42C30D3E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.DryIoc", "samples\MediatR.Examples.DryIoc\MediatR.Examples.DryIoc.csproj", "{085B6925-A438-4DBD-82C4-B3006A798C24}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.Lamar", "samples\MediatR.Examples.Lamar\MediatR.Examples.Lamar.csproj", "{A3E2B050-B636-46C4-8563-CEE18EB6B146}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.LightInject", "samples\MediatR.Examples.LightInject\MediatR.Examples.LightInject.csproj", "{738B6CF9-C5B0-424C-A63F-EE601DD2A266}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.PublishStrategies", "samples\MediatR.Examples.PublishStrategies\MediatR.Examples.PublishStrategies.csproj", "{004D029A-43E7-47B0-BA74-D0A9F7FC7713}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.SimpleInjector", "samples\MediatR.Examples.SimpleInjector\MediatR.Examples.SimpleInjector.csproj", "{7CEB57F2-B6DC-4A18-A040-D12555C3D32F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.Stashbox", "samples\MediatR.Examples.Stashbox\MediatR.Examples.Stashbox.csproj", "{F9148E20-5856-484C-8410-B515C6C56214}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediatR.DependencyInjectionTests", "test\MediatR.DependencyInjectionTests\MediatR.DependencyInjectionTests.csproj", "{C761C0E2-0655-40FB-98E9-1504D03DD930}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{12DA3F16-060B-467A-993F-2DF25EE6E6A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12DA3F16-060B-467A-993F-2DF25EE6E6A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12DA3F16-060B-467A-993F-2DF25EE6E6A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12DA3F16-060B-467A-993F-2DF25EE6E6A8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FB0CFC4-90E3-467F-9704-6FBF637F9B4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FB0CFC4-90E3-467F-9704-6FBF637F9B4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FB0CFC4-90E3-467F-9704-6FBF637F9B4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FB0CFC4-90E3-467F-9704-6FBF637F9B4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1FA62162-F8F1-4CAD-B08E-8DCA603395AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FA62162-F8F1-4CAD-B08E-8DCA603395AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FA62162-F8F1-4CAD-B08E-8DCA603395AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1FA62162-F8F1-4CAD-B08E-8DCA603395AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87F5A238-44B5-4769-82E5-E68B712D6E6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87F5A238-44B5-4769-82E5-E68B712D6E6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87F5A238-44B5-4769-82E5-E68B712D6E6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87F5A238-44B5-4769-82E5-E68B712D6E6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FB683115-7F96-4529-A412-65A59CC991E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB683115-7F96-4529-A412-65A59CC991E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB683115-7F96-4529-A412-65A59CC991E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB683115-7F96-4529-A412-65A59CC991E4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B6838F9-3CAC-45E8-A796-CA34B05B008F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B6838F9-3CAC-45E8-A796-CA34B05B008F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B6838F9-3CAC-45E8-A796-CA34B05B008F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B6838F9-3CAC-45E8-A796-CA34B05B008F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E7EF3E3E-BD58-482E-B293-26CA42C30D3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7EF3E3E-BD58-482E-B293-26CA42C30D3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7EF3E3E-BD58-482E-B293-26CA42C30D3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E7EF3E3E-BD58-482E-B293-26CA42C30D3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{085B6925-A438-4DBD-82C4-B3006A798C24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{085B6925-A438-4DBD-82C4-B3006A798C24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{085B6925-A438-4DBD-82C4-B3006A798C24}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{085B6925-A438-4DBD-82C4-B3006A798C24}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3E2B050-B636-46C4-8563-CEE18EB6B146}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3E2B050-B636-46C4-8563-CEE18EB6B146}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3E2B050-B636-46C4-8563-CEE18EB6B146}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3E2B050-B636-46C4-8563-CEE18EB6B146}.Release|Any CPU.Build.0 = Release|Any CPU
-		{738B6CF9-C5B0-424C-A63F-EE601DD2A266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{738B6CF9-C5B0-424C-A63F-EE601DD2A266}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{738B6CF9-C5B0-424C-A63F-EE601DD2A266}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{738B6CF9-C5B0-424C-A63F-EE601DD2A266}.Release|Any CPU.Build.0 = Release|Any CPU
-		{004D029A-43E7-47B0-BA74-D0A9F7FC7713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{004D029A-43E7-47B0-BA74-D0A9F7FC7713}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{004D029A-43E7-47B0-BA74-D0A9F7FC7713}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{004D029A-43E7-47B0-BA74-D0A9F7FC7713}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CEB57F2-B6DC-4A18-A040-D12555C3D32F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CEB57F2-B6DC-4A18-A040-D12555C3D32F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7CEB57F2-B6DC-4A18-A040-D12555C3D32F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7CEB57F2-B6DC-4A18-A040-D12555C3D32F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9148E20-5856-484C-8410-B515C6C56214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9148E20-5856-484C-8410-B515C6C56214}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9148E20-5856-484C-8410-B515C6C56214}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9148E20-5856-484C-8410-B515C6C56214}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C761C0E2-0655-40FB-98E9-1504D03DD930}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C761C0E2-0655-40FB-98E9-1504D03DD930}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C761C0E2-0655-40FB-98E9-1504D03DD930}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C761C0E2-0655-40FB-98E9-1504D03DD930}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{12DA3F16-060B-467A-993F-2DF25EE6E6A8} = {6267E2ED-942C-497D-BFC9-B3CE0AFC276F}
-		{4FB0CFC4-90E3-467F-9704-6FBF637F9B4B} = {962C5ACA-AB2B-4E9B-9EBB-7E7EE28CDBB1}
-		{1FA62162-F8F1-4CAD-B08E-8DCA603395AD} = {962C5ACA-AB2B-4E9B-9EBB-7E7EE28CDBB1}
-		{87F5A238-44B5-4769-82E5-E68B712D6E6D} = {6267E2ED-942C-497D-BFC9-B3CE0AFC276F}
-		{FB683115-7F96-4529-A412-65A59CC991E4} = {E372BF0B-90E8-4DC1-A332-F023095A3C2A}
-		{7B6838F9-3CAC-45E8-A796-CA34B05B008F} = {E372BF0B-90E8-4DC1-A332-F023095A3C2A}
-		{E7EF3E3E-BD58-482E-B293-26CA42C30D3E} = {E372BF0B-90E8-4DC1-A332-F023095A3C2A}
-		{085B6925-A438-4DBD-82C4-B3006A798C24} = {E372BF0B-90E8-4DC1-A332-F023095A3C2A}
-		{A3E2B050-B636-46C4-8563-CEE18EB6B146} = {E372BF0B-90E8-4DC1-A332-F023095A3C2A}
-		{738B6CF9-C5B0-424C-A63F-EE601DD2A266} = {E372BF0B-90E8-4DC1-A332-F023095A3C2A}
-		{004D029A-43E7-47B0-BA74-D0A9F7FC7713} = {E372BF0B-90E8-4DC1-A332-F023095A3C2A}
-		{7CEB57F2-B6DC-4A18-A040-D12555C3D32F} = {E372BF0B-90E8-4DC1-A332-F023095A3C2A}
-		{F9148E20-5856-484C-8410-B515C6C56214} = {E372BF0B-90E8-4DC1-A332-F023095A3C2A}
-		{C761C0E2-0655-40FB-98E9-1504D03DD930} = {962C5ACA-AB2B-4E9B-9EBB-7E7EE28CDBB1}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D58286E3-878B-4ACB-8E76-F61E708D4339}
-	EndGlobalSection
-EndGlobal
diff --git a/MediatR.slnx b/MediatR.slnx
new file mode 100644
index 00000000..f76a3ce1
--- /dev/null
+++ b/MediatR.slnx
@@ -0,0 +1,33 @@
+<Solution>
+  <Folder Name="/samples/">
+    <Project Path="samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj" />
+    <Project Path="samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj" />
+    <Project Path="samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj" />
+    <Project Path="samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj" />
+    <Project Path="samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj" />
+    <Project Path="samples/MediatR.Examples.PublishStrategies/MediatR.Examples.PublishStrategies.csproj" />
+    <Project Path="samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj" />
+    <Project Path="samples/MediatR.Examples.Stashbox/MediatR.Examples.Stashbox.csproj" />
+    <Project Path="samples/MediatR.Examples/MediatR.Examples.csproj" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path=".github/workflows/ci.yml" />
+    <File Path=".github/workflows/release.yml" />
+    <File Path="Build.ps1" />
+    <File Path="BuildContracts.ps1" />
+    <File Path="Directory.Build.props" />
+    <File Path="MediatR.snk" />
+    <File Path="Push.ps1" />
+    <File Path="README.md" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/MediatR.Contracts/MediatR.Contracts.csproj" />
+    <Project Path="src/MediatR/MediatR.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="test/MediatR.Benchmarks/MediatR.Benchmarks.csproj" />
+    <Project Path="test/MediatR.DependencyInjectionTests/MediatR.DependencyInjectionTests.csproj" />
+    <Project Path="test/MediatR.Tests/MediatR.Tests.csproj" />
+  </Folder>
+</Solution>
diff --git a/test/MediatR.Benchmarks/MediatR.Benchmarks.csproj b/test/MediatR.Benchmarks/MediatR.Benchmarks.csproj
index 1d88a19c..8ab50376 100644
--- a/test/MediatR.Benchmarks/MediatR.Benchmarks.csproj
+++ b/test/MediatR.Benchmarks/MediatR.Benchmarks.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
     <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.10" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\MediatR\MediatR.csproj" />
diff --git a/test/MediatR.DependencyInjectionTests/MediatR.DependencyInjectionTests.csproj b/test/MediatR.DependencyInjectionTests/MediatR.DependencyInjectionTests.csproj
index 5fbd5b57..ba5b99bf 100644
--- a/test/MediatR.DependencyInjectionTests/MediatR.DependencyInjectionTests.csproj
+++ b/test/MediatR.DependencyInjectionTests/MediatR.DependencyInjectionTests.csproj
@@ -15,7 +15,6 @@
 
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.0"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
         <PackageReference Include="Shouldly" Version="4.2.1"/>
         <PackageReference Include="xunit" Version="2.5.3"/>