diff --git a/samples/Samples.Domain/Samples.Domain.csproj b/samples/Samples.Domain/Samples.Domain.csproj
index b680c7c..b6ede3c 100644
--- a/samples/Samples.Domain/Samples.Domain.csproj
+++ b/samples/Samples.Domain/Samples.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/Samples.Events/Samples.Events.csproj b/samples/Samples.Events/Samples.Events.csproj
index f8d6173..b55c1c5 100644
--- a/samples/Samples.Events/Samples.Events.csproj
+++ b/samples/Samples.Events/Samples.Events.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JKang.EventSourcing.Abstractions" Version="1.0.1" />
+    <PackageReference Include="JKang.EventSourcing.Abstractions" Version="1.2.0-*" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Samples.Persistence/Samples.Persistence.csproj b/samples/Samples.Persistence/Samples.Persistence.csproj
index 7f6a628..90e5939 100644
--- a/samples/Samples.Persistence/Samples.Persistence.csproj
+++ b/samples/Samples.Persistence/Samples.Persistence.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JKang.EventSourcing.Abstractions" Version="1.0.1" />
+    <PackageReference Include="JKang.EventSourcing.Abstractions" Version="1.2.0-*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Samples.WebApp/Program.cs b/samples/Samples.WebApp/Program.cs
index a88adb0..bcfcdf7 100644
--- a/samples/Samples.WebApp/Program.cs
+++ b/samples/Samples.WebApp/Program.cs
@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 
 namespace Samples.WebApp
 {
@@ -14,11 +7,12 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            CreateWebHostBuilder(args).Build().Run();
+            var builder = WebApplication.CreateBuilder(args);
+            var startup = new Startup(builder.Configuration);
+            startup.ConfigureServices(builder.Services);
+            var app = builder.Build();
+            startup.Configure(app, app.Environment);
+            app.Run();
         }
-
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>();
     }
 }
diff --git a/samples/Samples.WebApp/Samples.WebApp.csproj b/samples/Samples.WebApp/Samples.WebApp.csproj
index ece8988..69dda06 100644
--- a/samples/Samples.WebApp/Samples.WebApp.csproj
+++ b/samples/Samples.WebApp/Samples.WebApp.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JKang.EventSourcing" Version="1.0.1" />
-    <PackageReference Include="JKang.EventSourcing.Persistence.EfCore" Version="1.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.1" />
+    <PackageReference Include="JKang.EventSourcing" Version="1.2.0-*" />
+    <PackageReference Include="JKang.EventSourcing.Persistence.EfCore" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Samples.WebApp/Startup.cs b/samples/Samples.WebApp/Startup.cs
index 1ebc9d6..5d61728 100644
--- a/samples/Samples.WebApp/Startup.cs
+++ b/samples/Samples.WebApp/Startup.cs
@@ -1,9 +1,10 @@
 using JKang.EventSourcing.Persistence;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Samples.Domain;
 using Samples.Persistence;
 using Samples.WebApp.Data;
@@ -23,15 +24,7 @@ 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.Configure<CookiePolicyOptions>(options =>
-            {
-                // This lambda determines whether user consent for non-essential cookies is needed for a given request.
-                options.CheckConsentNeeded = context => true;
-                options.MinimumSameSitePolicy = SameSiteMode.None;
-            });
-
-
-            services.AddMvc();
+            services.AddRazorPages();
 
             services
                 .AddScoped<IGiftCardRepository, GiftCardRepository>()
@@ -54,12 +47,16 @@ public void ConfigureServices(IServiceCollection services)
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(
             IApplicationBuilder app,
-            IEventStoreInitializer<GiftCard, Guid> eventStoreInitializer)
+            IWebHostEnvironment env)
         {
+            var eventStoreInitializer = app.ApplicationServices.GetRequiredService<IEventStoreInitializer<GiftCard, Guid>>();
             eventStoreInitializer.EnsureCreatedAsync().Wait();
 
-            app.UseExceptionHandler("/Error");
-            app.UseHsts();
+            if (!env.IsDevelopment())
+            {
+                app.UseExceptionHandler("/Error");
+                app.UseHsts();
+            }
 
             app.UseHttpsRedirection();