diff --git a/Hosuto.sln b/Hosuto.sln
index 5af4019..7373561 100644
--- a/Hosuto.sln
+++ b/Hosuto.sln
@@ -41,13 +41,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hosuto.SimpleInjector.Tests", "test\Hosuto.SimpleInjector.Tests\Hosuto.SimpleInjector.Tests.csproj", "{B16EA0A4-8EBE-4EAC-ACE9-538572951747}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet50", "dotnet50", "{F03A55C6-AB61-4A07-8E06-A742A1E9F625}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{F03A55C6-AB61-4A07-8E06-A742A1E9F625}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebModule", "samples\dotnet50\SampleWebModule\SampleWebModule.csproj", "{1C6AD780-6DC3-4AF1-AB4E-51ABC1FC3A75}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebModule", "samples\dotnet\SampleWebModule\SampleWebModule.csproj", "{1C6AD780-6DC3-4AF1-AB4E-51ABC1FC3A75}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "samples\dotnet50\App\App.csproj", "{1BFA0E1B-556C-49DA-81F0-1067FAD97458}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "samples\dotnet\App\App.csproj", "{1BFA0E1B-556C-49DA-81F0-1067FAD97458}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorLibrary", "samples\dotnet50\RazorLibrary\RazorLibrary.csproj", "{71E30ED2-53D6-4A9D-B541-4255D88E97AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorLibrary", "samples\dotnet\RazorLibrary\RazorLibrary.csproj", "{71E30ED2-53D6-4A9D-B541-4255D88E97AD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 72dba78..85367bb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -15,9 +15,13 @@ variables:
   buildConfiguration: 'Release'
 
 steps:
-- task: UseGitVersion@5
+- task: gitversion/setup@3.1.11
+  displayName: Install GitVersion
   inputs:
-    versionSpec: '5.x'
+    versionSpec: '5.11.x'
+      
+- task: gitversion/execute@3.1.11
+  displayName: Execute GitVersion
 
 - task: DotNetCoreCLI@2
   inputs:
diff --git a/samples/dotnet50/App/App.csproj b/samples/dotnet/App/App.csproj
similarity index 97%
rename from samples/dotnet50/App/App.csproj
rename to samples/dotnet/App/App.csproj
index bef6a59..a12355b 100644
--- a/samples/dotnet50/App/App.csproj
+++ b/samples/dotnet/App/App.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>Dbosoft.Hosuto.Samples.App</AssemblyName>
     <RootNamespace>Dbosoft.Hosuto.Sample</RootNamespace>
     <IsPackable>false</IsPackable>
diff --git a/samples/dotnet50/App/Program.cs b/samples/dotnet/App/Program.cs
similarity index 100%
rename from samples/dotnet50/App/Program.cs
rename to samples/dotnet/App/Program.cs
diff --git a/samples/dotnet50/App/Properties/PublishProfiles/FolderProfile.pubxml b/samples/dotnet/App/Properties/PublishProfiles/FolderProfile.pubxml
similarity index 91%
rename from samples/dotnet50/App/Properties/PublishProfiles/FolderProfile.pubxml
rename to samples/dotnet/App/Properties/PublishProfiles/FolderProfile.pubxml
index 040b013..594faa8 100644
--- a/samples/dotnet50/App/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/samples/dotnet/App/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>bin\Release\net5.0\publish\</PublishUrl>
+    <PublishUrl>bin\Release\net8.0\publish\</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/dotnet50/App/Properties/launchSettings.json b/samples/dotnet/App/Properties/launchSettings.json
similarity index 100%
rename from samples/dotnet50/App/Properties/launchSettings.json
rename to samples/dotnet/App/Properties/launchSettings.json
diff --git a/samples/dotnet50/RazorLibrary/RazorLibrary.csproj b/samples/dotnet/RazorLibrary/RazorLibrary.csproj
similarity index 85%
rename from samples/dotnet50/RazorLibrary/RazorLibrary.csproj
rename to samples/dotnet/RazorLibrary/RazorLibrary.csproj
index ce833e5..7f0c66b 100644
--- a/samples/dotnet50/RazorLibrary/RazorLibrary.csproj
+++ b/samples/dotnet/RazorLibrary/RazorLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/samples/dotnet50/RazorLibrary/wwwroot/css/site.css b/samples/dotnet/RazorLibrary/wwwroot/css/site.css
similarity index 100%
rename from samples/dotnet50/RazorLibrary/wwwroot/css/site.css
rename to samples/dotnet/RazorLibrary/wwwroot/css/site.css
diff --git a/samples/dotnet50/SampleWebModule/Controllers/HomeController.cs b/samples/dotnet/SampleWebModule/Controllers/HomeController.cs
similarity index 100%
rename from samples/dotnet50/SampleWebModule/Controllers/HomeController.cs
rename to samples/dotnet/SampleWebModule/Controllers/HomeController.cs
diff --git a/samples/dotnet50/SampleWebModule/Models/ErrorViewModel.cs b/samples/dotnet/SampleWebModule/Models/ErrorViewModel.cs
similarity index 100%
rename from samples/dotnet50/SampleWebModule/Models/ErrorViewModel.cs
rename to samples/dotnet/SampleWebModule/Models/ErrorViewModel.cs
diff --git a/samples/dotnet50/SampleWebModule/Properties/launchSettings.json b/samples/dotnet/SampleWebModule/Properties/launchSettings.json
similarity index 100%
rename from samples/dotnet50/SampleWebModule/Properties/launchSettings.json
rename to samples/dotnet/SampleWebModule/Properties/launchSettings.json
diff --git a/samples/dotnet50/SampleWebModule/SampleModule.cs b/samples/dotnet/SampleWebModule/SampleModule.cs
similarity index 100%
rename from samples/dotnet50/SampleWebModule/SampleModule.cs
rename to samples/dotnet/SampleWebModule/SampleModule.cs
diff --git a/samples/dotnet50/SampleWebModule/SampleWebModule.csproj b/samples/dotnet/SampleWebModule/SampleWebModule.csproj
similarity index 94%
rename from samples/dotnet50/SampleWebModule/SampleWebModule.csproj
rename to samples/dotnet/SampleWebModule/SampleWebModule.csproj
index 8acd497..60d9241 100644
--- a/samples/dotnet50/SampleWebModule/SampleWebModule.csproj
+++ b/samples/dotnet/SampleWebModule/SampleWebModule.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <RootNamespace>Dbosoft.Hosuto.Sample</RootNamespace>
     <AssemblyName>Dbosoft.Hosuto.Samples.WebModule</AssemblyName>
diff --git a/samples/dotnet50/SampleWebModule/Views/Home/Index.cshtml b/samples/dotnet/SampleWebModule/Views/Home/Index.cshtml
similarity index 100%
rename from samples/dotnet50/SampleWebModule/Views/Home/Index.cshtml
rename to samples/dotnet/SampleWebModule/Views/Home/Index.cshtml
diff --git a/samples/dotnet50/SampleWebModule/Views/Home/Privacy.cshtml b/samples/dotnet/SampleWebModule/Views/Home/Privacy.cshtml
similarity index 100%
rename from samples/dotnet50/SampleWebModule/Views/Home/Privacy.cshtml
rename to samples/dotnet/SampleWebModule/Views/Home/Privacy.cshtml
diff --git a/samples/dotnet50/SampleWebModule/Views/Shared/Error.cshtml b/samples/dotnet/SampleWebModule/Views/Shared/Error.cshtml
similarity index 100%
rename from samples/dotnet50/SampleWebModule/Views/Shared/Error.cshtml
rename to samples/dotnet/SampleWebModule/Views/Shared/Error.cshtml
diff --git a/samples/dotnet50/SampleWebModule/Views/Shared/_Layout.cshtml b/samples/dotnet/SampleWebModule/Views/Shared/_Layout.cshtml
similarity index 100%
rename from samples/dotnet50/SampleWebModule/Views/Shared/_Layout.cshtml
rename to samples/dotnet/SampleWebModule/Views/Shared/_Layout.cshtml
diff --git a/samples/dotnet50/SampleWebModule/Views/Shared/_ValidationScriptsPartial.cshtml b/samples/dotnet/SampleWebModule/Views/Shared/_ValidationScriptsPartial.cshtml
similarity index 100%
rename from samples/dotnet50/SampleWebModule/Views/Shared/_ValidationScriptsPartial.cshtml
rename to samples/dotnet/SampleWebModule/Views/Shared/_ValidationScriptsPartial.cshtml
diff --git a/samples/dotnet50/SampleWebModule/Views/_ViewImports.cshtml b/samples/dotnet/SampleWebModule/Views/_ViewImports.cshtml
similarity index 100%
rename from samples/dotnet50/SampleWebModule/Views/_ViewImports.cshtml
rename to samples/dotnet/SampleWebModule/Views/_ViewImports.cshtml
diff --git a/samples/dotnet50/SampleWebModule/Views/_ViewStart.cshtml b/samples/dotnet/SampleWebModule/Views/_ViewStart.cshtml
similarity index 100%
rename from samples/dotnet50/SampleWebModule/Views/_ViewStart.cshtml
rename to samples/dotnet/SampleWebModule/Views/_ViewStart.cshtml
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/favicon.ico b/samples/dotnet/SampleWebModule/wwwroot/favicon.ico
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/favicon.ico
rename to samples/dotnet/SampleWebModule/wwwroot/favicon.ico
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/js/site.js b/samples/dotnet/SampleWebModule/wwwroot/js/site.js
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/js/site.js
rename to samples/dotnet/SampleWebModule/wwwroot/js/site.js
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/LICENSE b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/LICENSE
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/LICENSE
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/LICENSE
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.css
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.css
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.js
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
rename to samples/dotnet/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt b/samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
rename to samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
rename to samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
rename to samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation/LICENSE.md b/samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation/LICENSE.md
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation/LICENSE.md
rename to samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation/dist/additional-methods.js b/samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation/dist/additional-methods.js
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation/dist/additional-methods.js
rename to samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation/dist/additional-methods.js
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
rename to samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation/dist/jquery.validate.js
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation/dist/jquery.validate.js
rename to samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation/dist/jquery.validate.js
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
rename to samples/dotnet/SampleWebModule/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/jquery/LICENSE.txt b/samples/dotnet/SampleWebModule/wwwroot/lib/jquery/LICENSE.txt
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/jquery/LICENSE.txt
rename to samples/dotnet/SampleWebModule/wwwroot/lib/jquery/LICENSE.txt
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/jquery/dist/jquery.js b/samples/dotnet/SampleWebModule/wwwroot/lib/jquery/dist/jquery.js
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/jquery/dist/jquery.js
rename to samples/dotnet/SampleWebModule/wwwroot/lib/jquery/dist/jquery.js
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/jquery/dist/jquery.min.js b/samples/dotnet/SampleWebModule/wwwroot/lib/jquery/dist/jquery.min.js
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/jquery/dist/jquery.min.js
rename to samples/dotnet/SampleWebModule/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/samples/dotnet50/SampleWebModule/wwwroot/lib/jquery/dist/jquery.min.map b/samples/dotnet/SampleWebModule/wwwroot/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from samples/dotnet50/SampleWebModule/wwwroot/lib/jquery/dist/jquery.min.map
rename to samples/dotnet/SampleWebModule/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/src/Hosuto.Abstractions/Hosuto.Abstractions.csproj b/src/Hosuto.Abstractions/Hosuto.Abstractions.csproj
index 57482fc..fd376c7 100644
--- a/src/Hosuto.Abstractions/Hosuto.Abstractions.csproj
+++ b/src/Hosuto.Abstractions/Hosuto.Abstractions.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.6.9">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Hosuto.Hosting.AspNetCore/Hosuto.Hosting.AspNetCore.csproj b/src/Hosuto.Hosting.AspNetCore/Hosuto.Hosting.AspNetCore.csproj
index 6d96807..9ae7746 100644
--- a/src/Hosuto.Hosting.AspNetCore/Hosuto.Hosting.AspNetCore.csproj
+++ b/src/Hosuto.Hosting.AspNetCore/Hosuto.Hosting.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.0;net6.0</TargetFrameworks>
     <AssemblyName>Dbosoft.Hosuto.Hosting.AspNetCore</AssemblyName>
     <RootNamespace>Dbosoft.Hosuto</RootNamespace>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
@@ -9,7 +9,7 @@
 
   <Import Project="..\..\build\pack.props" />
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
@@ -32,7 +32,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.6.9">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Hosuto.Hosting.AspNetCore/Modules/Hosting/ModulesHostBuilderExtensions.cs b/src/Hosuto.Hosting.AspNetCore/Modules/Hosting/ModulesHostBuilderExtensions.cs
index 152a291..c52657f 100644
--- a/src/Hosuto.Hosting.AspNetCore/Modules/Hosting/ModulesHostBuilderExtensions.cs
+++ b/src/Hosuto.Hosting.AspNetCore/Modules/Hosting/ModulesHostBuilderExtensions.cs
@@ -6,7 +6,7 @@ namespace Dbosoft.Hosuto.Modules.Hosting
 {
     public static class ModulesHostBuilderExtensions
     {
-#if NETCOREAPP || NET50
+#if NETCOREAPP
 
         public static IModulesHostBuilder ConfigureWebHostDefaults(this IModulesHostBuilder builder, Action<Microsoft.AspNetCore.Hosting.IWebHostBuilder> configure)
         {
diff --git a/src/Hosuto.Hosting/Hosuto.Hosting.csproj b/src/Hosuto.Hosting/Hosuto.Hosting.csproj
index 4e01a5a..38e16aa 100644
--- a/src/Hosuto.Hosting/Hosuto.Hosting.csproj
+++ b/src/Hosuto.Hosting/Hosuto.Hosting.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.6.9">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj b/src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj
index d7c6723..b2d6685 100644
--- a/src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj
+++ b/src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj
@@ -9,13 +9,13 @@
   <Import Project="..\..\build\pack.props" />
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.6.9">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SimpleInjector" Version="4.6" />
-    <PackageReference Include="SimpleInjector.Integration.GenericHost" Version="4.6" />
-    <PackageReference Include="SimpleInjector.Integration.ServiceCollection" Version="4.6" />
+    <PackageReference Include="SimpleInjector" Version="5.5.0" />
+    <PackageReference Include="SimpleInjector.Integration.GenericHost" Version="5.5.0" />
+    <PackageReference Include="SimpleInjector.Integration.ServiceCollection" Version="5.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Hosuto.Testing.AspNetCore/Hosuto.Testing.AspNetCore.csproj b/src/Hosuto.Testing.AspNetCore/Hosuto.Testing.AspNetCore.csproj
index 6053d03..6693b65 100644
--- a/src/Hosuto.Testing.AspNetCore/Hosuto.Testing.AspNetCore.csproj
+++ b/src/Hosuto.Testing.AspNetCore/Hosuto.Testing.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;netstandard2.0;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netstandard2.0;net6.0;net8.0</TargetFrameworks>
     <AssemblyName>Dbosoft.Hosuto.Testing.AspNetCore</AssemblyName>
     <RootNamespace>Dbosoft.Hosuto</RootNamespace>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
@@ -15,10 +15,10 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
@@ -41,7 +41,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.6.9">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Hosuto/Hosuto.csproj b/src/Hosuto/Hosuto.csproj
index aeb1355..eb4c613 100644
--- a/src/Hosuto/Hosuto.csproj
+++ b/src/Hosuto/Hosuto.csproj
@@ -9,7 +9,7 @@
   <Import Project="..\..\build\pack.props" />
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.6.9">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/test/Hosuto.Hosting.AspNetCore.Tests/Hosuto.Hosting.AspNetCore.Tests.csproj b/test/Hosuto.Hosting.AspNetCore.Tests/Hosuto.Hosting.AspNetCore.Tests.csproj
index b66be8a..1e4ce62 100644
--- a/test/Hosuto.Hosting.AspNetCore.Tests/Hosuto.Hosting.AspNetCore.Tests.csproj
+++ b/test/Hosuto.Hosting.AspNetCore.Tests/Hosuto.Hosting.AspNetCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
 
diff --git a/test/Hosuto.Hosting.Tests/Hosuto.Hosting.Tests.csproj b/test/Hosuto.Hosting.Tests/Hosuto.Hosting.Tests.csproj
index 694b97f..b4afcc9 100644
--- a/test/Hosuto.Hosting.Tests/Hosuto.Hosting.Tests.csproj
+++ b/test/Hosuto.Hosting.Tests/Hosuto.Hosting.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/test/Hosuto.SimpleInjector.Tests/Hosuto.SimpleInjector.Tests.csproj b/test/Hosuto.SimpleInjector.Tests/Hosuto.SimpleInjector.Tests.csproj
index 8f75cad..6222ff5 100644
--- a/test/Hosuto.SimpleInjector.Tests/Hosuto.SimpleInjector.Tests.csproj
+++ b/test/Hosuto.SimpleInjector.Tests/Hosuto.SimpleInjector.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>