diff --git a/AzureSignalR.sln b/AzureSignalR.sln
index 7c50a4d97..8d752e0da 100644
--- a/AzureSignalR.sln
+++ b/AzureSignalR.sln
@@ -17,8 +17,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36024D6C-A549-4269-B11B-4BFC5F08BD11}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		build\dependencies.props = build\dependencies.props
 		build\dependencies.private.props = build\dependencies.private.props
+		build\dependencies.props = build\dependencies.props
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		NuGet.config = NuGet.config
@@ -69,7 +69,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorAppSample", "samples\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ChatSample", "ChatSample", "{C965ED06-6A17-4329-B3C6-811830F4F4ED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChatSample.NetCore31", "samples\ChatSample\ChatSample.NetCore31\ChatSample.NetCore31.csproj", "{63BB9836-126B-4E65-92B9-019438185E41}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChatSample", "samples\ChatSample\ChatSample\ChatSample.csproj", "{63BB9836-126B-4E65-92B9-019438185E41}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.SignalR.IntegrationTests", "test\Microsoft.Azure.SignalR.IntegrationTests\Microsoft.Azure.SignalR.IntegrationTests.csproj", "{3E11208B-B038-4840-8180-69DC6B5EAD22}"
 EndProject
diff --git a/samples/ChatSample/ChatSample.NetCore31/ChatSample.NetCore31.csproj b/samples/ChatSample/ChatSample/ChatSample.csproj
similarity index 80%
rename from samples/ChatSample/ChatSample.NetCore31/ChatSample.NetCore31.csproj
rename to samples/ChatSample/ChatSample/ChatSample.csproj
index 1114a562d..c632432b4 100644
--- a/samples/ChatSample/ChatSample.NetCore31/ChatSample.NetCore31.csproj
+++ b/samples/ChatSample/ChatSample/ChatSample.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>chatsample</UserSecretsId>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="$(MicrosoftAspNetCoreSignalRProtocolsMessagePackPackageVersion)" />
-    <PackageReference Include="MessagePack" Version="$(MessagePackPackage3_1Version)" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Microsoft.Azure.SignalR.Common\Microsoft.Azure.SignalR.Common.csproj" />
diff --git a/samples/ChatSample/ChatSample.NetCore31/Dockerfile b/samples/ChatSample/ChatSample/Dockerfile
similarity index 84%
rename from samples/ChatSample/ChatSample.NetCore31/Dockerfile
rename to samples/ChatSample/ChatSample/Dockerfile
index ac6c90983..fa820383d 100644
--- a/samples/ChatSample/ChatSample.NetCore31/Dockerfile
+++ b/samples/ChatSample/ChatSample/Dockerfile
@@ -2,7 +2,7 @@
 # Build stage
 ##################################################
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.0
+FROM mcr.microsoft.com/dotnet/core/sdk:8.0
 
 COPY ./ /home/signalr-src
 
@@ -14,7 +14,7 @@ RUN dotnet build && \
 # Final stage
 ##################################################
 
-FROM mcr.microsoft.com/dotnet/core/runtime:3.0
+FROM mcr.microsoft.com/dotnet/core/runtime:8.0
 
 COPY --from=0 /home/build/ /home/SignalR
 
diff --git a/samples/ChatSample/ChatSample.NetCore31/Hub/BenchHub.cs b/samples/ChatSample/ChatSample/Hub/BenchHub.cs
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/Hub/BenchHub.cs
rename to samples/ChatSample/ChatSample/Hub/BenchHub.cs
diff --git a/samples/ChatSample/ChatSample.NetCore31/Hub/Chat.cs b/samples/ChatSample/ChatSample/Hub/Chat.cs
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/Hub/Chat.cs
rename to samples/ChatSample/ChatSample/Hub/Chat.cs
diff --git a/samples/ChatSample/ChatSample.NetCore31/Program.cs b/samples/ChatSample/ChatSample/Program.cs
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/Program.cs
rename to samples/ChatSample/ChatSample/Program.cs
diff --git a/samples/ChatSample/ChatSample.NetCore31/Properties/launchSettings.json b/samples/ChatSample/ChatSample/Properties/launchSettings.json
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/Properties/launchSettings.json
rename to samples/ChatSample/ChatSample/Properties/launchSettings.json
diff --git a/samples/ChatSample/ChatSample.NetCore31/Startup.cs b/samples/ChatSample/ChatSample/Startup.cs
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/Startup.cs
rename to samples/ChatSample/ChatSample/Startup.cs
diff --git a/samples/ChatSample/ChatSample.NetCore31/appsettings.Development.json b/samples/ChatSample/ChatSample/appsettings.Development.json
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/appsettings.Development.json
rename to samples/ChatSample/ChatSample/appsettings.Development.json
diff --git a/samples/ChatSample/ChatSample.NetCore31/appsettings.json b/samples/ChatSample/ChatSample/appsettings.json
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/appsettings.json
rename to samples/ChatSample/ChatSample/appsettings.json
diff --git a/samples/ChatSample/ChatSample.NetCore31/wwwroot/css/bootstrap.css b/samples/ChatSample/ChatSample/wwwroot/css/bootstrap.css
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/wwwroot/css/bootstrap.css
rename to samples/ChatSample/ChatSample/wwwroot/css/bootstrap.css
diff --git a/samples/ChatSample/ChatSample.NetCore31/wwwroot/css/site.css b/samples/ChatSample/ChatSample/wwwroot/css/site.css
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/wwwroot/css/site.css
rename to samples/ChatSample/ChatSample/wwwroot/css/site.css
diff --git a/samples/ChatSample/ChatSample.NetCore31/wwwroot/favicon.ico b/samples/ChatSample/ChatSample/wwwroot/favicon.ico
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/wwwroot/favicon.ico
rename to samples/ChatSample/ChatSample/wwwroot/favicon.ico
diff --git a/samples/ChatSample/ChatSample.NetCore31/wwwroot/index.html b/samples/ChatSample/ChatSample/wwwroot/index.html
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/wwwroot/index.html
rename to samples/ChatSample/ChatSample/wwwroot/index.html
diff --git a/samples/ChatSample/ChatSample.NetCore31/wwwroot/scripts/bootstrap.js b/samples/ChatSample/ChatSample/wwwroot/scripts/bootstrap.js
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/wwwroot/scripts/bootstrap.js
rename to samples/ChatSample/ChatSample/wwwroot/scripts/bootstrap.js
diff --git a/samples/ChatSample/ChatSample.NetCore31/wwwroot/scripts/jquery-1.10.2.js b/samples/ChatSample/ChatSample/wwwroot/scripts/jquery-1.10.2.js
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/wwwroot/scripts/jquery-1.10.2.js
rename to samples/ChatSample/ChatSample/wwwroot/scripts/jquery-1.10.2.js
diff --git a/samples/ChatSample/ChatSample.NetCore31/wwwroot/scripts/msgpack5.js b/samples/ChatSample/ChatSample/wwwroot/scripts/msgpack5.js
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/wwwroot/scripts/msgpack5.js
rename to samples/ChatSample/ChatSample/wwwroot/scripts/msgpack5.js
diff --git a/samples/ChatSample/ChatSample.NetCore31/wwwroot/scripts/signalr-protocol-msgpack.js b/samples/ChatSample/ChatSample/wwwroot/scripts/signalr-protocol-msgpack.js
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/wwwroot/scripts/signalr-protocol-msgpack.js
rename to samples/ChatSample/ChatSample/wwwroot/scripts/signalr-protocol-msgpack.js
diff --git a/samples/ChatSample/ChatSample.NetCore31/wwwroot/scripts/signalr.js b/samples/ChatSample/ChatSample/wwwroot/scripts/signalr.js
similarity index 100%
rename from samples/ChatSample/ChatSample.NetCore31/wwwroot/scripts/signalr.js
rename to samples/ChatSample/ChatSample/wwwroot/scripts/signalr.js