diff --git a/HotKeys2.E2ETest/HotKeysOnBrowserTest.cs b/HotKeys2.E2ETest/HotKeysOnBrowserTest.cs
index 776b873..ab1abae 100644
--- a/HotKeys2.E2ETest/HotKeysOnBrowserTest.cs
+++ b/HotKeys2.E2ETest/HotKeysOnBrowserTest.cs
@@ -7,13 +7,16 @@ public class HotKeysOnBrowserTest
     public static IEnumerable<HostingModel> AllHostingModels { get; } = new[] {
             HostingModel.Wasm60,
             HostingModel.Wasm70,
+            HostingModel.Wasm80,
             HostingModel.Server60,
             HostingModel.Server70,
+            HostingModel.Server80,
         };
 
     public static IEnumerable<HostingModel> WasmHostingModels { get; } = new[] {
             HostingModel.Wasm60,
             HostingModel.Wasm70,
+            HostingModel.Wasm80,
         };
 
     [Test]
diff --git a/HotKeys2.E2ETest/Internals/HostingModel.cs b/HotKeys2.E2ETest/Internals/HostingModel.cs
index dcacb80..7b4df54 100644
--- a/HotKeys2.E2ETest/Internals/HostingModel.cs
+++ b/HotKeys2.E2ETest/Internals/HostingModel.cs
@@ -4,6 +4,8 @@ public enum HostingModel
 {
     Wasm60,
     Wasm70,
+    Wasm80,
     Server60,
     Server70,
+    Server80,
 }
diff --git a/HotKeys2.E2ETest/Internals/TestContext.cs b/HotKeys2.E2ETest/Internals/TestContext.cs
index 05ac533..2998047 100644
--- a/HotKeys2.E2ETest/Internals/TestContext.cs
+++ b/HotKeys2.E2ETest/Internals/TestContext.cs
@@ -12,8 +12,10 @@ public class TestContext
     private readonly IReadOnlyDictionary<HostingModel, SampleSite> SampleSites = new Dictionary<HostingModel, SampleSite> {
             { HostingModel.Wasm60, new SampleSite(5012, "Client", "net6.0") },
             { HostingModel.Wasm70, new SampleSite(5013, "Client", "net7.0") },
+            { HostingModel.Wasm80, new SampleSite(5014, "Client", "net8.0") },
             { HostingModel.Server60, new SampleSite(5015, "Server", "net6.0") },
             { HostingModel.Server70, new SampleSite(5016, "Server", "net7.0") },
+            { HostingModel.Server80, new SampleSite(5017, "Server", "net8.0") },
         };
 
     private IPlaywright? _Playwrite;
diff --git a/HotKeys2.E2ETest/Toolbelt.Blazor.HotKeys.E2ETest.csproj b/HotKeys2.E2ETest/Toolbelt.Blazor.HotKeys.E2ETest.csproj
index 8f75767..2e42e13 100644
--- a/HotKeys2.E2ETest/Toolbelt.Blazor.HotKeys.E2ETest.csproj
+++ b/HotKeys2.E2ETest/Toolbelt.Blazor.HotKeys.E2ETest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>
diff --git a/HotKeys2/Toolbelt.Blazor.HotKeys2.csproj b/HotKeys2/Toolbelt.Blazor.HotKeys2.csproj
index 22b574c..647de18 100644
--- a/HotKeys2/Toolbelt.Blazor.HotKeys2.csproj
+++ b/HotKeys2/Toolbelt.Blazor.HotKeys2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <LangVersion>Latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>3.1.0-preview.1</Version>
+    <Version>3.1.0-preview.2</Version>
     <Copyright>Copyright © 2022-2023 J.Sakamoto, Mozilla Public License 2.0</Copyright>
     <Authors>J.Sakamoto</Authors>
     <RepositoryType>git</RepositoryType>
@@ -51,6 +51,11 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0-rc.1.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0-rc.1.*" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.8.4">
       <PrivateAssets>all</PrivateAssets>
diff --git a/SampleSites/Client/SampleSite.Client.csproj b/SampleSites/Client/SampleSite.Client.csproj
index 4bed1be..0faec41 100644
--- a/SampleSites/Client/SampleSite.Client.csproj
+++ b/SampleSites/Client/SampleSite.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <InvariantGlobalization>true</InvariantGlobalization>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PublishSPAforGitHubPages.Build" Version="2.0.1" />
-    <PackageReference Include="BlazorWasmPreRendering.Build" Version="1.0.0-preview.28.0" />
+    <PackageReference Include="PublishSPAforGitHubPages.Build" Version="2.1.0" />
+    <PackageReference Include="BlazorWasmPreRendering.Build" Version="3.1.0-preview.4" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'  ">
@@ -23,6 +23,11 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0'  ">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-rc.1.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0-rc.1.*" PrivateAssets="all" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Components\SampleSite.Components.csproj" />
   </ItemGroup>
diff --git a/SampleSites/Components/SampleSite.Components.csproj b/SampleSites/Components/SampleSite.Components.csproj
index 8fc060f..8887864 100644
--- a/SampleSites/Components/SampleSite.Components.csproj
+++ b/SampleSites/Components/SampleSite.Components.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -15,8 +15,12 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0-rc.1.*" />
+  </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="3.1.0-preview.1" />
+    <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="3.1.0-preview.2" />
     <!--<ProjectReference Include="..\..\HotKeys2\Toolbelt.Blazor.HotKeys2.csproj" />-->
   </ItemGroup>
 
diff --git a/SampleSites/Server/SampleSite.Server.csproj b/SampleSites/Server/SampleSite.Server.csproj
index 01bd095..d8c2d0e 100644
--- a/SampleSites/Server/SampleSite.Server.csproj
+++ b/SampleSites/Server/SampleSite.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>
     <ImplicitUsings>enable</ImplicitUsings>