diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index b088a9c..a75c374 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "0.26.2",
+      "version": "0.26.3",
       "commands": [
         "dotnet-csharpier"
       ]
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 370613c..a3c173a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
     - name: Set up .NET
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 9ae5391..00a7e93 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -11,7 +11,7 @@ jobs:
     - name: Set up .NET
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
diff --git a/Directory.Build.props b/Directory.Build.props
index c3aa17c..81bd430 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,7 +7,7 @@
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 
-    <Target Name="DotnetToolRestore" BeforeTargets="CoreBuild">
+    <Target Name="DotnetToolRestore" BeforeTargets="Restore">
         <Exec Command="dotnet tool restore" />
     </Target>
 </Project>
\ No newline at end of file
diff --git a/benchmark/Dunet.Benchmark/Dunet.Benchmark.csproj b/benchmark/Dunet.Benchmark/Dunet.Benchmark.csproj
index bf598b9..d7f5f7d 100644
--- a/benchmark/Dunet.Benchmark/Dunet.Benchmark.csproj
+++ b/benchmark/Dunet.Benchmark/Dunet.Benchmark.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/integration/Dunet.Integration.csproj b/integration/Dunet.Integration.csproj
index 35197ff..fb0cce2 100644
--- a/integration/Dunet.Integration.csproj
+++ b/integration/Dunet.Integration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
diff --git a/samples/AreaCalculator/AreaCalculator.csproj b/samples/AreaCalculator/AreaCalculator.csproj
index 72284e2..3e22a68 100644
--- a/samples/AreaCalculator/AreaCalculator.csproj
+++ b/samples/AreaCalculator/AreaCalculator.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/samples/ExpressionCalculator/ExpressionCalculator.csproj b/samples/ExpressionCalculator/ExpressionCalculator.csproj
index 72284e2..3e22a68 100644
--- a/samples/ExpressionCalculator/ExpressionCalculator.csproj
+++ b/samples/ExpressionCalculator/ExpressionCalculator.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/samples/ExpressionCalculatorWithState/ExpressionCalculatorWithState.csproj b/samples/ExpressionCalculatorWithState/ExpressionCalculatorWithState.csproj
index 40c65be..ccd6e88 100644
--- a/samples/ExpressionCalculatorWithState/ExpressionCalculatorWithState.csproj
+++ b/samples/ExpressionCalculatorWithState/ExpressionCalculatorWithState.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/samples/OptionMonad/OptionMonad.csproj b/samples/OptionMonad/OptionMonad.csproj
index 72284e2..3e22a68 100644
--- a/samples/OptionMonad/OptionMonad.csproj
+++ b/samples/OptionMonad/OptionMonad.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/samples/PokemonClient/PokemonClient.csproj b/samples/PokemonClient/PokemonClient.csproj
index 72284e2..3e22a68 100644
--- a/samples/PokemonClient/PokemonClient.csproj
+++ b/samples/PokemonClient/PokemonClient.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/samples/Serialization/Serialization.csproj b/samples/Serialization/Serialization.csproj
index 365e1b5..b9279ca 100644
--- a/samples/Serialization/Serialization.csproj
+++ b/samples/Serialization/Serialization.csproj
@@ -2,14 +2,14 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Dunet" Version="1.10.0" />
-        <PackageReference Include="System.Text.Json" Version="7.0.3" />
+        <PackageReference Include="System.Text.Json" Version="8.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Dunet.csproj b/src/Dunet.csproj
index cabdec9..dfd2cae 100644
--- a/src/Dunet.csproj
+++ b/src/Dunet.csproj
@@ -3,7 +3,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <LangVersion>11.0</LangVersion>
+        <LangVersion>12.0</LangVersion>
         <IsPublishable>True</IsPublishable>
         <IncludeBuildOutput>false</IncludeBuildOutput>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
diff --git a/test/Dunet.Test.csproj b/test/Dunet.Test.csproj
index 9b42149..f75b254 100644
--- a/test/Dunet.Test.csproj
+++ b/test/Dunet.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>