diff --git a/doc/build.ps1 b/doc/build.ps1
index 71daf633..1bb5fec8 100644
--- a/doc/build.ps1
+++ b/doc/build.ps1
@@ -2,7 +2,7 @@
 pushd $PSScriptRoot
 
 function Run-DotNet {
-    ..\0install.ps1 run --batch --version 6.0.. https://apps.0install.net/dotnet/sdk.xml @args
+    ..\0install.ps1 run --batch --version 8.0.. https://apps.0install.net/dotnet/sdk.xml @args
     if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
 }
 
diff --git a/doc/build.sh b/doc/build.sh
index eeb0c8f3..87e5485a 100755
--- a/doc/build.sh
+++ b/doc/build.sh
@@ -6,7 +6,7 @@ cd `dirname $0`
 if command -v dotnet > /dev/null 2> /dev/null; then
     dotnet="dotnet"
 else
-    dotnet="../0install.sh run --version 6.0.. https://apps.0install.net/dotnet/sdk.xml"
+    dotnet="../0install.sh run --version 8.0.. https://apps.0install.net/dotnet/sdk.xml"
 fi
 
 # Build docs
diff --git a/doc/docfx.json b/doc/docfx.json
index 2fe0fc63..3c18c0d6 100644
--- a/doc/docfx.json
+++ b/doc/docfx.json
@@ -9,7 +9,7 @@
         }
       ],
       "properties": {
-        "TargetFramework": "net6.0"
+        "TargetFramework": "net8.0"
       },
       "namespaceLayout": "nested",
       "dest": "api"
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index fb5ed2a5..50d0d782 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <!-- Build configuration -->
-    <LangVersion>preview</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
     <Nullable>annotations</Nullable>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <OutputType>Library</OutputType>
diff --git a/src/TypedRest.OAuth/TypedRest.OAuth.csproj b/src/TypedRest.OAuth/TypedRest.OAuth.csproj
index 0d77680f..06e891ae 100644
--- a/src/TypedRest.OAuth/TypedRest.OAuth.csproj
+++ b/src/TypedRest.OAuth/TypedRest.OAuth.csproj
@@ -15,13 +15,14 @@
   <!-- Dependencies -->
   <ItemGroup>
     <PackageReference Include="IdentityModel" Version="6.2.0" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' Or '$(TargetFramework)'=='netstandard2.1'">
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.32" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+  <ItemGroup Condition="$(TargetFramework)=='net6.0'">
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
   </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework)!='net6.0'">
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/TypedRest.SystemTextJson/TypedRest.SystemTextJson.csproj b/src/TypedRest.SystemTextJson/TypedRest.SystemTextJson.csproj
index 5ee626df..221c6b20 100644
--- a/src/TypedRest.SystemTextJson/TypedRest.SystemTextJson.csproj
+++ b/src/TypedRest.SystemTextJson/TypedRest.SystemTextJson.csproj
@@ -16,8 +16,11 @@
   <ItemGroup>
     <ProjectReference Include="..\TypedRest\TypedRest.csproj" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="$(TargetFramework)=='net6.0'">
     <PackageReference Include="System.Text.Json" Version="6.0.9" />
   </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework)!='net6.0'">
+    <PackageReference Include="System.Text.Json" Version="8.0.0" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/TypedRest/TaskExtensions.cs b/src/TypedRest/TaskExtensions.cs
index 85321764..9c4a94b7 100644
--- a/src/TypedRest/TaskExtensions.cs
+++ b/src/TypedRest/TaskExtensions.cs
@@ -8,14 +8,14 @@ namespace TypedRest;
 public static class TaskExtensions
 {
     /// <summary>
-    /// Convenience wrapper for <see cref="Task.ConfigureAwait"/><c>(false)</c>.
+    /// Convenience wrapper for <see cref="Task.ConfigureAwait(bool)"/><c>(false)</c>.
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static ConfiguredTaskAwaitable NoContext(this Task task)
         => task.ConfigureAwait(continueOnCapturedContext: false);
 
     /// <summary>
-    /// Convenience wrapper for <see cref="Task{T}.ConfigureAwait"/><c>(false)</c>.
+    /// Convenience wrapper for <see cref="Task{TResult}.ConfigureAwait(bool)"/><c>(false)</c>.
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static ConfiguredTaskAwaitable<TResult> NoContext<TResult>(this Task<TResult> task)
diff --git a/src/TypedRest/TypedRest.csproj b/src/TypedRest/TypedRest.csproj
index 98b2e357..d82988c2 100644
--- a/src/TypedRest/TypedRest.csproj
+++ b/src/TypedRest/TypedRest.csproj
@@ -19,10 +19,17 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Resta.UriTemplates" Version="1.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
+  </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework)=='net6.0'">
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="6.0.25" />
   </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework)!='net6.0'">
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="8.0.0" />
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
index cbeb5494..128fe650 100644
--- a/src/UnitTests/UnitTests.csproj
+++ b/src/UnitTests/UnitTests.csproj
@@ -3,12 +3,12 @@
   <!-- Project properties -->
   <PropertyGroup>
     <RootNamespace>TypedRest</RootNamespace>
-    <TargetFrameworks>net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0</TargetFrameworks>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <IsPackable>False</IsPackable>
     <DeterministicSourcePaths>False</DeterministicSourcePaths>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework)=='net6.0'">
+  <PropertyGroup Condition="$(TargetFramework)=='net8.0'">
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
@@ -26,7 +26,7 @@
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit" Version="2.6.4" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
diff --git a/src/build.ps1 b/src/build.ps1
index e93b8759..5cd0a1f7 100644
--- a/src/build.ps1
+++ b/src/build.ps1
@@ -3,7 +3,7 @@ $ErrorActionPreference = "Stop"
 pushd $PSScriptRoot
 
 function Run-DotNet {
-    ..\0install.ps1 run --batch --version 6.0.. https://apps.0install.net/dotnet/sdk.xml @args
+    ..\0install.ps1 run --batch --version 8.0.. https://apps.0install.net/dotnet/sdk.xml @args
     if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
 }
 
diff --git a/src/build.sh b/src/build.sh
index a8d2de63..442b4dcc 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -6,7 +6,7 @@ cd `dirname $0`
 if command -v dotnet > /dev/null 2> /dev/null; then
     dotnet="dotnet"
 else
-    dotnet="../0install.sh run --version 6.0.. https://apps.0install.net/dotnet/sdk.xml"
+    dotnet="../0install.sh run --version 8.0.. https://apps.0install.net/dotnet/sdk.xml"
 fi
 
 # Build
diff --git a/src/test.ps1 b/src/test.ps1
index f0ed3118..be2a9c95 100644
--- a/src/test.ps1
+++ b/src/test.ps1
@@ -2,7 +2,7 @@ $ErrorActionPreference = "Stop"
 pushd $PSScriptRoot
 
 function Run-DotNet {
-    ..\0install.ps1 run --batch --version 6.0..!6.1 https://apps.0install.net/dotnet/sdk.xml @args
+    ..\0install.ps1 run --batch --version 8.0..!8.1 https://apps.0install.net/dotnet/sdk.xml @args
     if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
 }
 
diff --git a/src/test.sh b/src/test.sh
index 310ff9a9..6b41281f 100755
--- a/src/test.sh
+++ b/src/test.sh
@@ -6,8 +6,8 @@ cd `dirname $0`
 if command -v dotnet > /dev/null 2> /dev/null; then
     dotnet="dotnet"
 else
-    dotnet="../0install.sh run --version 6.0..!6.1 https://apps.0install.net/dotnet/sdk.xml"
+    dotnet="../0install.sh run --version 8.0..!8.1 https://apps.0install.net/dotnet/sdk.xml"
 fi
 
 # Unit tests (without .NET Framework)
-$dotnet test --no-build --logger trx --configuration Release --framework net6.0 UnitTests/UnitTests.csproj
+$dotnet test --no-build --logger trx --configuration Release --framework net8.0 UnitTests/UnitTests.csproj