diff --git a/.github/workflows/CodeQuality.yml b/.github/workflows/CodeQuality.yml
index 7bb8b746a..05803cf74 100644
--- a/.github/workflows/CodeQuality.yml
+++ b/.github/workflows/CodeQuality.yml
@@ -13,10 +13,16 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          overwrite-settings: false
       - name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
 
       - name: add DevExpress nuget feed
         run: dotnet nuget add source https://nuget.devexpress.com/api -n DXFeed -u DevExpress -p ${{ secrets.DEVEXPRESS_NUGET_KEY }} --store-password-in-clear-text
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index dd3196b6e..1cd161f71 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -29,7 +29,7 @@ jobs:
     - name: Setup .NET Environment
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: add DevExpress nuget feed
       run: dotnet nuget add source https://nuget.devexpress.com/api -n DXFeed -u DevExpress -p ${{ secrets.DEVEXPRESS_NUGET_KEY }} --store-password-in-clear-text
diff --git a/CDP4-SDK.sln b/CDP4-SDK.sln
index e993cf85c..967067e68 100644
--- a/CDP4-SDK.sln
+++ b/CDP4-SDK.sln
@@ -61,7 +61,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4Reporting.Tests", "CDP4
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4MessagePackSerializer", "CDP4MessagePackSerializer\CDP4MessagePackSerializer.csproj", "{231DC960-B227-46CA-B345-E9C4B7CFBC01}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CDP4MessagePackSerializer.Tests", "CDP4MessagePackSerializer.Tests\CDP4MessagePackSerializer.Tests.csproj", "{CBECE184-A79F-4D71-82F6-3DA29FF9E048}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CDP4MessagePackSerializer.Tests", "CDP4MessagePackSerializer.Tests\CDP4MessagePackSerializer.Tests.csproj", "{CBECE184-A79F-4D71-82F6-3DA29FF9E048}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Github Actions", "Github Actions", "{A51D9FCE-BFF3-4428-B538-B6A45B3A5401}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
+		.github\workflows\CodeQuality.yml = .github\workflows\CodeQuality.yml
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/CDP4Common.NetCore.Tests/CDP4Common.NetCore.Tests.csproj b/CDP4Common.NetCore.Tests/CDP4Common.NetCore.Tests.csproj
index c8f65a33b..18776f6fc 100644
--- a/CDP4Common.NetCore.Tests/CDP4Common.NetCore.Tests.csproj
+++ b/CDP4Common.NetCore.Tests/CDP4Common.NetCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Company>RHEA System S.A.</Company>
     <Description>CDP4Common netcore unit tests</Description>
     <Copyright>Copyright © RHEA System S.A.</Copyright>
diff --git a/CDP4Dal.NetCore.Tests/CDP4Dal.NetCore.Tests.csproj b/CDP4Dal.NetCore.Tests/CDP4Dal.NetCore.Tests.csproj
index 3f5fe1ffe..6f4599338 100644
--- a/CDP4Dal.NetCore.Tests/CDP4Dal.NetCore.Tests.csproj
+++ b/CDP4Dal.NetCore.Tests/CDP4Dal.NetCore.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Company>RHEA System S.A.</Company>
         <Description>CDP4Dal netcore unit tests</Description>
         <Copyright>Copyright © RHEA System S.A.</Copyright>
diff --git a/CDP4JsonFileDal.NetCore.Tests/CDP4JsonFileDal.NetCore.Tests.csproj b/CDP4JsonFileDal.NetCore.Tests/CDP4JsonFileDal.NetCore.Tests.csproj
index 433395e4d..c49249a07 100644
--- a/CDP4JsonFileDal.NetCore.Tests/CDP4JsonFileDal.NetCore.Tests.csproj
+++ b/CDP4JsonFileDal.NetCore.Tests/CDP4JsonFileDal.NetCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Company>RHEA System S.A.</Company>
         <Description>CDP4JsonSerializer netcore unit tests</Description>
         <Copyright>Copyright © RHEA System S.A.</Copyright>
diff --git a/CDP4JsonSerializer.NetCore.Tests/CDP4JsonSerializer.NetCore.Tests.csproj b/CDP4JsonSerializer.NetCore.Tests/CDP4JsonSerializer.NetCore.Tests.csproj
index 0440bfa6e..b44048f65 100644
--- a/CDP4JsonSerializer.NetCore.Tests/CDP4JsonSerializer.NetCore.Tests.csproj
+++ b/CDP4JsonSerializer.NetCore.Tests/CDP4JsonSerializer.NetCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Company>RHEA System S.A.</Company>
         <Description>CDP4JsonSerializer netcore unit tests</Description>
         <Copyright>Copyright © RHEA System S.A.</Copyright>
diff --git a/CDP4RequirementsVerification.Tests/CDP4RequirementsVerification.Tests.csproj b/CDP4RequirementsVerification.Tests/CDP4RequirementsVerification.Tests.csproj
index aac317c51..fd0a7556b 100644
--- a/CDP4RequirementsVerification.Tests/CDP4RequirementsVerification.Tests.csproj
+++ b/CDP4RequirementsVerification.Tests/CDP4RequirementsVerification.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Company>RHEA System S.A.</Company>
         <Description>CDP4RequirementsVerification netcore unit tests</Description>
         <Copyright>Copyright © RHEA System S.A.</Copyright>
diff --git a/CDP4Rules.NetCore.Tests/CDP4Rules.NetCore.Tests.csproj b/CDP4Rules.NetCore.Tests/CDP4Rules.NetCore.Tests.csproj
index eab9c6039..d4fbce34f 100644
--- a/CDP4Rules.NetCore.Tests/CDP4Rules.NetCore.Tests.csproj
+++ b/CDP4Rules.NetCore.Tests/CDP4Rules.NetCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Company>RHEA System S.A.</Company>
         <Description>CDP4Rules netcore unit tests</Description>
         <Copyright>Copyright © RHEA System S.A.</Copyright>
diff --git a/CDP4ServicesDal.NetCore.Tests/CDP4ServicesDal.NetCore.Tests.csproj b/CDP4ServicesDal.NetCore.Tests/CDP4ServicesDal.NetCore.Tests.csproj
index 7fe7bad6c..5ff04a979 100644
--- a/CDP4ServicesDal.NetCore.Tests/CDP4ServicesDal.NetCore.Tests.csproj
+++ b/CDP4ServicesDal.NetCore.Tests/CDP4ServicesDal.NetCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Company>RHEA System S.A.</Company>
         <Description>CDP4ServicesDal netcore unit tests</Description>
         <Copyright>Copyright © RHEA System S.A.</Copyright>
diff --git a/CDP4WspDal.NetCore.Tests/CDP4WspDal.NetCore.Tests.csproj b/CDP4WspDal.NetCore.Tests/CDP4WspDal.NetCore.Tests.csproj
index 2718a62b0..ec421425b 100644
--- a/CDP4WspDal.NetCore.Tests/CDP4WspDal.NetCore.Tests.csproj
+++ b/CDP4WspDal.NetCore.Tests/CDP4WspDal.NetCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Company>RHEA System S.A.</Company>
         <Description>CDP4WspDal netcore unit tests</Description>
         <Copyright>Copyright © RHEA System S.A.</Copyright>