diff --git a/.editorconfig b/.editorconfig
index 175c36f7..fa80a797 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -44,6 +44,7 @@ generated_code = true
 # XML project files
 [*.{slnx,csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,nativeproj,locproj}]
 indent_size = 2
+max_line_length = 160
 
 # Xml build files
 [*.builds]
diff --git a/Directory.Build.props b/Directory.Build.props
index 6642decd..8e1f7cb4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -14,8 +14,9 @@
     <None Include="..\_snapshots\**\*.*" Link="_sharedSnapshots\%(RecursiveDir)%(Filename)%(Extension)" Visible="" />
   </ItemGroup>
   <PropertyGroup>
-    <NetEvolve_ProjectTargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</NetEvolve_ProjectTargetFrameworks>
-    <NetEvolve_TestTargetFrameworks>net8.0;net9.0;net10.0</NetEvolve_TestTargetFrameworks>
+    <NetEvolve_LTSTargetFrameworks>net8.0;net9.0;net10.0</NetEvolve_LTSTargetFrameworks>
+    <NetEvolve_ProjectTargetFrameworks>netstandard2.0;$(NetEvolve_LTSTargetFrameworks)</NetEvolve_ProjectTargetFrameworks>
+    <NetEvolve_TestTargetFrameworks>$(NetEvolve_LTSTargetFrameworks)</NetEvolve_TestTargetFrameworks>
     <NoWarn Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NoWarn);CA1062;</NoWarn>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 69217d75..63703548 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -14,8 +14,8 @@
     <GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.17.0.131074" />
   </ItemGroup>
   <ItemGroup>
+    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
     <PackageVersion Include="Microsoft.TestPlatform.TestHost" Version="18.0.1" />
     <PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
diff --git a/src/NetEvolve.Extensions.MSTest/NetEvolve.Extensions.MSTest.csproj b/src/NetEvolve.Extensions.MSTest/NetEvolve.Extensions.MSTest.csproj
index f61bd550..10b1d226 100644
--- a/src/NetEvolve.Extensions.MSTest/NetEvolve.Extensions.MSTest.csproj
+++ b/src/NetEvolve.Extensions.MSTest/NetEvolve.Extensions.MSTest.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>$(NetEvolve_ProjectTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
     <PackageTags>$(PackageTags);mstest</PackageTags>
diff --git a/src/NetEvolve.Extensions.NUnit/NetEvolve.Extensions.NUnit.csproj b/src/NetEvolve.Extensions.NUnit/NetEvolve.Extensions.NUnit.csproj
index d976e1e5..89fc7de6 100644
--- a/src/NetEvolve.Extensions.NUnit/NetEvolve.Extensions.NUnit.csproj
+++ b/src/NetEvolve.Extensions.NUnit/NetEvolve.Extensions.NUnit.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>$(NetEvolve_LTSTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
     <PackageTags>$(PackageTags);nunit</PackageTags>
diff --git a/src/NetEvolve.Extensions.TUnit/NetEvolve.Extensions.TUnit.csproj b/src/NetEvolve.Extensions.TUnit/NetEvolve.Extensions.TUnit.csproj
index 6d35a9e1..305ce474 100644
--- a/src/NetEvolve.Extensions.TUnit/NetEvolve.Extensions.TUnit.csproj
+++ b/src/NetEvolve.Extensions.TUnit/NetEvolve.Extensions.TUnit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>$(NetEvolve_ProjectTargetFrameworks)</TargetFrameworks>
     <PackageTags>$(PackageTags);tunit</PackageTags>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <EnableTUnitPolyfills>false</EnableTUnitPolyfills>
diff --git a/src/NetEvolve.Extensions.XUnit.V3/NetEvolve.Extensions.XUnit.V3.csproj b/src/NetEvolve.Extensions.XUnit.V3/NetEvolve.Extensions.XUnit.V3.csproj
index e105a46a..a7f87787 100644
--- a/src/NetEvolve.Extensions.XUnit.V3/NetEvolve.Extensions.XUnit.V3.csproj
+++ b/src/NetEvolve.Extensions.XUnit.V3/NetEvolve.Extensions.XUnit.V3.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>$(NetEvolve_ProjectTargetFrameworks)</TargetFrameworks>
     <NoWarn>$(NoWarn);NU5104</NoWarn>
     <NoWarn Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NoWarn);nullable</NoWarn>
   </PropertyGroup>
diff --git a/tests/NetEvolve.Extensions.MSTest.Tests.PublicApi/NetEvolve.Extensions.MSTest.Tests.PublicApi.csproj b/tests/NetEvolve.Extensions.MSTest.Tests.PublicApi/NetEvolve.Extensions.MSTest.Tests.PublicApi.csproj
index b7405436..2cefeafa 100644
--- a/tests/NetEvolve.Extensions.MSTest.Tests.PublicApi/NetEvolve.Extensions.MSTest.Tests.PublicApi.csproj
+++ b/tests/NetEvolve.Extensions.MSTest.Tests.PublicApi/NetEvolve.Extensions.MSTest.Tests.PublicApi.csproj
@@ -9,7 +9,6 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
     <PackageReference Include="Microsoft.TestPlatform.TestHost" />
     <PackageReference Include="MSTest.TestAdapter" />
diff --git a/tests/NetEvolve.Extensions.MSTest.Tests.Unit/NetEvolve.Extensions.MSTest.Tests.Unit.csproj b/tests/NetEvolve.Extensions.MSTest.Tests.Unit/NetEvolve.Extensions.MSTest.Tests.Unit.csproj
index 6a9e4bc7..e41bfefd 100644
--- a/tests/NetEvolve.Extensions.MSTest.Tests.Unit/NetEvolve.Extensions.MSTest.Tests.Unit.csproj
+++ b/tests/NetEvolve.Extensions.MSTest.Tests.Unit/NetEvolve.Extensions.MSTest.Tests.Unit.csproj
@@ -8,7 +8,6 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
     <PackageReference Include="Microsoft.TestPlatform.TestHost" />
     <PackageReference Include="MSTest.TestAdapter" />
diff --git a/tests/NetEvolve.Extensions.NUnit.Tests.PublicApi/NetEvolve.Extensions.NUnit.Tests.PublicApi.csproj b/tests/NetEvolve.Extensions.NUnit.Tests.PublicApi/NetEvolve.Extensions.NUnit.Tests.PublicApi.csproj
index 05d20d17..0e91619f 100644
--- a/tests/NetEvolve.Extensions.NUnit.Tests.PublicApi/NetEvolve.Extensions.NUnit.Tests.PublicApi.csproj
+++ b/tests/NetEvolve.Extensions.NUnit.Tests.PublicApi/NetEvolve.Extensions.NUnit.Tests.PublicApi.csproj
@@ -7,7 +7,7 @@
     <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" />
     <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />
diff --git a/tests/NetEvolve.Extensions.NUnit.Tests.Unit/NetEvolve.Extensions.NUnit.Tests.Unit.csproj b/tests/NetEvolve.Extensions.NUnit.Tests.Unit/NetEvolve.Extensions.NUnit.Tests.Unit.csproj
index d63214cb..510131da 100644
--- a/tests/NetEvolve.Extensions.NUnit.Tests.Unit/NetEvolve.Extensions.NUnit.Tests.Unit.csproj
+++ b/tests/NetEvolve.Extensions.NUnit.Tests.Unit/NetEvolve.Extensions.NUnit.Tests.Unit.csproj
@@ -6,7 +6,7 @@
     <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" />
     <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />
diff --git a/tests/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi.csproj b/tests/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi.csproj
index 503e4916..71c34044 100644
--- a/tests/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi.csproj
+++ b/tests/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi.csproj
@@ -5,7 +5,6 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" VersionOverride="18.0.6" />
     <PackageReference Include="PublicApiGenerator" />
     <PackageReference Include="Verify.XunitV3" />
diff --git a/tests/NetEvolve.Extensions.XUnit.V3.Tests.Unit/NetEvolve.Extensions.XUnit.V3.Tests.Unit.csproj b/tests/NetEvolve.Extensions.XUnit.V3.Tests.Unit/NetEvolve.Extensions.XUnit.V3.Tests.Unit.csproj
index 66d60f29..7f32cc6f 100644
--- a/tests/NetEvolve.Extensions.XUnit.V3.Tests.Unit/NetEvolve.Extensions.XUnit.V3.Tests.Unit.csproj
+++ b/tests/NetEvolve.Extensions.XUnit.V3.Tests.Unit/NetEvolve.Extensions.XUnit.V3.Tests.Unit.csproj
@@ -4,7 +4,6 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" VersionOverride="18.0.6" />
     <PackageReference Include="Verify.XunitV3" />
     <PackageReference Include="xunit.runner.visualstudio">