diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index a9c8a35..13d769f 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -22,6 +22,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 8.0.x
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
@@ -31,9 +35,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 6.0.x
-    - name: Setup .NET 5
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.x
+
     - name: Test
       run: dotnet run -p build/build.csproj -- ci
diff --git a/.github/workflows/publish_codegen.yml b/.github/workflows/publish_codegen.yml
index 7c0a331..c8150af 100644
--- a/.github/workflows/publish_codegen.yml
+++ b/.github/workflows/publish_codegen.yml
@@ -9,6 +9,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+      
+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 8.0.x
+        
     - name: Setup .NET 7
       uses: actions/setup-dotnet@v1
       with:
diff --git a/Directory.Build.props b/Directory.Build.props
index a903649..a194e70 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <VersionPrefix>3.2.0</VersionPrefix>
+    <VersionPrefix>3.4.0</VersionPrefix>
     <LangVersion>10.0</LangVersion>
     <Authors>Jeremy D. Miller;Babu Annamalai;Oskar Dudycz;Joona-Pekka Kokko</Authors>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <DebugType>portable</DebugType>
 
-    <PackageIconUrl>https://github.com/JasperFx/JasperFx.CodeGeneration/blob/main/jasper-icon.png?raw=true</PackageIconUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/JasperFx/JasperFx.Core/main/jasperfx-logo.jpg?raw=true</PackageIconUrl>
     <PackageProjectUrl>https:/github.com/jasperfx/JasperFx.CodeGeneration</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <NoWarn>1570;1571;1572;1573;1574;1587;1591;1701;1702;1711;1735;0618</NoWarn>
diff --git a/JasperFx.CodeGeneration.sln b/JasperFx.CodeGeneration.sln
index 2c27180..32fbdb0 100644
--- a/JasperFx.CodeGeneration.sln
+++ b/JasperFx.CodeGeneration.sln
@@ -15,6 +15,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JasperFx.CodeGeneration.Com
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JasperFx.RuntimeCompiler", "src\JasperFx.RuntimeCompiler\JasperFx.RuntimeCompiler.csproj", "{07661BB4-1737-4EDC-AB50-FA52FACCB639}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{CBFCFC85-0B37-498E-992F-33D72AFFF54A}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
+		.github\workflows\publish_codegen.yml = .github\workflows\publish_codegen.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/src/JasperFx.CodeGeneration.Commands/JasperFx.CodeGeneration.Commands.csproj b/src/JasperFx.CodeGeneration.Commands/JasperFx.CodeGeneration.Commands.csproj
index 2fed58d..873e839 100644
--- a/src/JasperFx.CodeGeneration.Commands/JasperFx.CodeGeneration.Commands.csproj
+++ b/src/JasperFx.CodeGeneration.Commands/JasperFx.CodeGeneration.Commands.csproj
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Oakton" Version="6.0.0" />
+        <PackageReference Include="Oakton" Version="6.1.0" />
     </ItemGroup>
 
 
diff --git a/src/JasperFx.CodeGeneration/JasperFx.CodeGeneration.csproj b/src/JasperFx.CodeGeneration/JasperFx.CodeGeneration.csproj
index 7e7211e..4fadb49 100644
--- a/src/JasperFx.CodeGeneration/JasperFx.CodeGeneration.csproj
+++ b/src/JasperFx.CodeGeneration/JasperFx.CodeGeneration.csproj
@@ -6,7 +6,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FastExpressionCompiler" Version="3.3.4" />
-        <PackageReference Include="JasperFx.Core" Version="1.3.0" />
+        <PackageReference Include="FastExpressionCompiler" Version="4.0.0" />
+        <PackageReference Include="JasperFx.Core" Version="1.5.0" />
     </ItemGroup>
 </Project>
+