diff --git a/CSharp/DP.Domain/DP.Domain.csproj b/CSharp/DP.Domain/DP.Domain.csproj
index 9f5c4f4..7b97f26 100644
--- a/CSharp/DP.Domain/DP.Domain.csproj
+++ b/CSharp/DP.Domain/DP.Domain.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
+    <NoWarn>$(NoWarn);SYSLIB0011</NoWarn>
   </PropertyGroup>
 
 </Project>
diff --git a/CSharp/DP.UnitTest/DP.UnitTest.csproj b/CSharp/DP.UnitTest/DP.UnitTest.csproj
index 7660851..faa2867 100644
--- a/CSharp/DP.UnitTest/DP.UnitTest.csproj
+++ b/CSharp/DP.UnitTest/DP.UnitTest.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
+    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="System.Diagnostics.TextWriterTraceListener" Version="4.3.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <!-- <PackageReference Include="xunit.abstractions" Version="2.0.1" /> -->
-    <!-- <PackageReference Include="xunit.core" Version="2.3.0" /> -->
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/CSharp/DP.UnitTest/Utility/XunitTraceListener.cs b/CSharp/DP.UnitTest/Utility/XunitTraceListener.cs
index 251dba3..4c5e8de 100644
--- a/CSharp/DP.UnitTest/Utility/XunitTraceListener.cs
+++ b/CSharp/DP.UnitTest/Utility/XunitTraceListener.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Diagnostics;
 using Xunit.Abstractions;
 
@@ -15,11 +16,25 @@ public XunitTraceListener(ITestOutputHelper output)
         }
         public override void Write(string message)
         {
-            this._output.WriteLine(message);
+            try
+            {
+                this._output.WriteLine(message);
+            }
+            catch (InvalidOperationException)
+            {
+                // Ignore if there is no active test
+            }
         }
         public override void WriteLine(string message)
-        { 
-            this._output.WriteLine(message);
+        {
+            try
+            {
+                this._output.WriteLine(message);
+            }
+            catch (InvalidOperationException)
+            {
+                // Ignore if there is no active test
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/CSharp/DP.Website/DP.Website.csproj b/CSharp/DP.Website/DP.Website.csproj
index be6f02a..d1e4d6e 100644
--- a/CSharp/DP.Website/DP.Website.csproj
+++ b/CSharp/DP.Website/DP.Website.csproj
@@ -1,15 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.1" />
-  </ItemGroup>
-
 </Project>
diff --git a/CSharp/DP.Website/Startup.cs b/CSharp/DP.Website/Startup.cs
index 743f2a2..6f6d655 100644
--- a/CSharp/DP.Website/Startup.cs
+++ b/CSharp/DP.Website/Startup.cs
@@ -6,14 +6,17 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace DP.Website
 {
     public class Startup
     {
-        public Startup(IConfiguration configuration)
+        private readonly IWebHostEnvironment _env;
+
+        public Startup(IWebHostEnvironment env)
         {
-            Configuration = configuration;
+            _env = env;
         }
 
         public IConfiguration Configuration { get; }
@@ -21,13 +24,16 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc();
+            services.AddControllersWithViews(options =>
+            {
+                options.EnableEndpointRouting = false;
+            });
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app)
         {
-            if (env.IsDevelopment())
+            if (_env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
             }
diff --git a/CSharp/DP.Website/Views/Home/Builder.cshtml b/CSharp/DP.Website/Views/Home/Builder.cshtml
index 2901303..a997428 100644
--- a/CSharp/DP.Website/Views/Home/Builder.cshtml
+++ b/CSharp/DP.Website/Views/Home/Builder.cshtml
@@ -6,7 +6,7 @@
     {
         for (int i = 0; i < Model.Parents.Count(); i++)
         {
-            @Html.Partial("_ParentPartial", Model.Parents.ToList()[i])
+            <partial name="_ParentPartial" model="Model.Parents.ToList()[i]" />
         }
     }
 </div>
@@ -17,7 +17,7 @@
     {
         for (int i = 0; i < Model.Children.Count(); i++)
         {
-            @Html.Partial("_ChildPartial", Model.Children.ToList()[i])
+            <partial name="_ChildPartial" model="Model.Children.ToList()[i]" />
         }
     }
 </div>
@@ -27,7 +27,7 @@
     {
         for (int i = 0; i < Model.Pets.Count(); i++)
         {
-            @Html.Partial("_PetPartial", Model.Pets.ToList()[i])
+            <partial name="_PetPartial" model="Model.Pets.ToList()[i]" />
         }
     }
 </div>
\ No newline at end of file
diff --git a/CSharp/DP.Website/Views/Home/State.cshtml b/CSharp/DP.Website/Views/Home/State.cshtml
index 2901303..a997428 100644
--- a/CSharp/DP.Website/Views/Home/State.cshtml
+++ b/CSharp/DP.Website/Views/Home/State.cshtml
@@ -6,7 +6,7 @@
     {
         for (int i = 0; i < Model.Parents.Count(); i++)
         {
-            @Html.Partial("_ParentPartial", Model.Parents.ToList()[i])
+            <partial name="_ParentPartial" model="Model.Parents.ToList()[i]" />
         }
     }
 </div>
@@ -17,7 +17,7 @@
     {
         for (int i = 0; i < Model.Children.Count(); i++)
         {
-            @Html.Partial("_ChildPartial", Model.Children.ToList()[i])
+            <partial name="_ChildPartial" model="Model.Children.ToList()[i]" />
         }
     }
 </div>
@@ -27,7 +27,7 @@
     {
         for (int i = 0; i < Model.Pets.Count(); i++)
         {
-            @Html.Partial("_PetPartial", Model.Pets.ToList()[i])
+            <partial name="_PetPartial" model="Model.Pets.ToList()[i]" />
         }
     }
 </div>
\ No newline at end of file