From 8d101cb7c7351444f9abe286db54ff26e157a21d Mon Sep 17 00:00:00 2001 From: Frank Wagner Date: Sun, 9 Nov 2025 10:26:43 +0100 Subject: [PATCH 1/3] Upgrade simleinjector to 5.5.0 --- src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj b/src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj index d7c6723..1b4b567 100644 --- a/src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj +++ b/src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj @@ -13,9 +13,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + From 24029aeb6ac046bc235550c4d7b629459cd91eb3 Mon Sep 17 00:00:00 2001 From: Frank Wagner Date: Sun, 9 Nov 2025 10:28:52 +0100 Subject: [PATCH 2/3] gitversion update --- azure-pipelines.yml | 8 ++++++-- src/Hosuto.Abstractions/Hosuto.Abstractions.csproj | 2 +- .../Hosuto.Hosting.AspNetCore.csproj | 2 +- src/Hosuto.Hosting/Hosuto.Hosting.csproj | 2 +- src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj | 2 +- .../Hosuto.Testing.AspNetCore.csproj | 2 +- src/Hosuto/Hosuto.csproj | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) 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/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 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Hosuto.Hosting.AspNetCore/Hosuto.Hosting.AspNetCore.csproj b/src/Hosuto.Hosting.AspNetCore/Hosuto.Hosting.AspNetCore.csproj index 6d96807..d1e5c17 100644 --- a/src/Hosuto.Hosting.AspNetCore/Hosuto.Hosting.AspNetCore.csproj +++ b/src/Hosuto.Hosting.AspNetCore/Hosuto.Hosting.AspNetCore.csproj @@ -32,7 +32,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj b/src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj index 1b4b567..b2d6685 100644 --- a/src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj +++ b/src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj @@ -9,7 +9,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Hosuto.Testing.AspNetCore/Hosuto.Testing.AspNetCore.csproj b/src/Hosuto.Testing.AspNetCore/Hosuto.Testing.AspNetCore.csproj index 6053d03..f62a830 100644 --- a/src/Hosuto.Testing.AspNetCore/Hosuto.Testing.AspNetCore.csproj +++ b/src/Hosuto.Testing.AspNetCore/Hosuto.Testing.AspNetCore.csproj @@ -41,7 +41,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 683794c26aea5b7c57b6fe35356f578cfc4ffbd9 Mon Sep 17 00:00:00 2001 From: Frank Wagner Date: Sun, 9 Nov 2025 10:45:16 +0100 Subject: [PATCH 3/3] fixed build errors due to outdated net versions --- Hosuto.sln | 8 ++++---- samples/{dotnet50 => dotnet}/App/App.csproj | 2 +- samples/{dotnet50 => dotnet}/App/Program.cs | 0 .../Properties/PublishProfiles/FolderProfile.pubxml | 2 +- .../App/Properties/launchSettings.json | 0 .../RazorLibrary/RazorLibrary.csproj | 2 +- .../RazorLibrary/wwwroot/css/site.css | 0 .../SampleWebModule/Controllers/HomeController.cs | 0 .../SampleWebModule/Models/ErrorViewModel.cs | 0 .../SampleWebModule/Properties/launchSettings.json | 0 .../SampleWebModule/SampleModule.cs | 0 .../SampleWebModule/SampleWebModule.csproj | 2 +- .../SampleWebModule/Views/Home/Index.cshtml | 0 .../SampleWebModule/Views/Home/Privacy.cshtml | 0 .../SampleWebModule/Views/Shared/Error.cshtml | 0 .../SampleWebModule/Views/Shared/_Layout.cshtml | 0 .../Views/Shared/_ValidationScriptsPartial.cshtml | 0 .../SampleWebModule/Views/_ViewImports.cshtml | 0 .../SampleWebModule/Views/_ViewStart.cshtml | 0 .../SampleWebModule/wwwroot/favicon.ico | Bin .../SampleWebModule/wwwroot/js/site.js | 0 .../SampleWebModule/wwwroot/lib/bootstrap/LICENSE | 0 .../lib/bootstrap/dist/css/bootstrap-grid.css | 0 .../lib/bootstrap/dist/css/bootstrap-grid.css.map | 0 .../lib/bootstrap/dist/css/bootstrap-grid.min.css | 0 .../bootstrap/dist/css/bootstrap-grid.min.css.map | 0 .../lib/bootstrap/dist/css/bootstrap-reboot.css | 0 .../lib/bootstrap/dist/css/bootstrap-reboot.css.map | 0 .../lib/bootstrap/dist/css/bootstrap-reboot.min.css | 0 .../bootstrap/dist/css/bootstrap-reboot.min.css.map | 0 .../wwwroot/lib/bootstrap/dist/css/bootstrap.css | 0 .../lib/bootstrap/dist/css/bootstrap.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.min.css | 0 .../lib/bootstrap/dist/css/bootstrap.min.css.map | 0 .../lib/bootstrap/dist/js/bootstrap.bundle.js | 0 .../lib/bootstrap/dist/js/bootstrap.bundle.js.map | 0 .../lib/bootstrap/dist/js/bootstrap.bundle.min.js | 0 .../bootstrap/dist/js/bootstrap.bundle.min.js.map | 0 .../wwwroot/lib/bootstrap/dist/js/bootstrap.js | 0 .../wwwroot/lib/bootstrap/dist/js/bootstrap.js.map | 0 .../wwwroot/lib/bootstrap/dist/js/bootstrap.min.js | 0 .../lib/bootstrap/dist/js/bootstrap.min.js.map | 0 .../lib/jquery-validation-unobtrusive/LICENSE.txt | 0 .../jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../wwwroot/lib/jquery-validation/LICENSE.md | 0 .../jquery-validation/dist/additional-methods.js | 0 .../dist/additional-methods.min.js | 0 .../lib/jquery-validation/dist/jquery.validate.js | 0 .../jquery-validation/dist/jquery.validate.min.js | 0 .../SampleWebModule/wwwroot/lib/jquery/LICENSE.txt | 0 .../wwwroot/lib/jquery/dist/jquery.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.map | 0 .../Hosuto.Hosting.AspNetCore.csproj | 4 ++-- .../Modules/Hosting/ModulesHostBuilderExtensions.cs | 2 +- .../Hosuto.Testing.AspNetCore.csproj | 8 ++++---- .../Hosuto.Hosting.AspNetCore.Tests.csproj | 2 +- .../Hosuto.Hosting.Tests.csproj | 2 +- .../Hosuto.SimpleInjector.Tests.csproj | 2 +- 60 files changed, 18 insertions(+), 18 deletions(-) rename samples/{dotnet50 => dotnet}/App/App.csproj (97%) rename samples/{dotnet50 => dotnet}/App/Program.cs (100%) rename samples/{dotnet50 => dotnet}/App/Properties/PublishProfiles/FolderProfile.pubxml (91%) rename samples/{dotnet50 => dotnet}/App/Properties/launchSettings.json (100%) rename samples/{dotnet50 => dotnet}/RazorLibrary/RazorLibrary.csproj (85%) rename samples/{dotnet50 => dotnet}/RazorLibrary/wwwroot/css/site.css (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/Controllers/HomeController.cs (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/Models/ErrorViewModel.cs (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/Properties/launchSettings.json (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/SampleModule.cs (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/SampleWebModule.csproj (94%) rename samples/{dotnet50 => dotnet}/SampleWebModule/Views/Home/Index.cshtml (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/Views/Home/Privacy.cshtml (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/Views/Shared/Error.cshtml (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/Views/Shared/_Layout.cshtml (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/Views/Shared/_ValidationScriptsPartial.cshtml (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/Views/_ViewImports.cshtml (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/Views/_ViewStart.cshtml (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/favicon.ico (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/js/site.js (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/LICENSE (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.css (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.js (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/jquery-validation/LICENSE.md (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/jquery-validation/dist/additional-methods.js (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/jquery-validation/dist/additional-methods.min.js (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/jquery-validation/dist/jquery.validate.js (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/jquery/LICENSE.txt (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/jquery/dist/jquery.js (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/jquery/dist/jquery.min.js (100%) rename samples/{dotnet50 => dotnet}/SampleWebModule/wwwroot/lib/jquery/dist/jquery.min.map (100%) 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/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 @@ Exe - net5.0 + net8.0 Dbosoft.Hosuto.Samples.App Dbosoft.Hosuto.Sample false 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. Release Any CPU FileSystem - bin\Release\net5.0\publish\ + bin\Release\net8.0\publish\ FileSystem \ 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 @@ - net5.0 + net8.0 true false 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 @@  - net5.0 + net8.0 true Dbosoft.Hosuto.Sample Dbosoft.Hosuto.Samples.WebModule 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.Hosting.AspNetCore/Hosuto.Hosting.AspNetCore.csproj b/src/Hosuto.Hosting.AspNetCore/Hosuto.Hosting.AspNetCore.csproj index d1e5c17..9ae7746 100644 --- a/src/Hosuto.Hosting.AspNetCore/Hosuto.Hosting.AspNetCore.csproj +++ b/src/Hosuto.Hosting.AspNetCore/Hosuto.Hosting.AspNetCore.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netcoreapp3.0;net5.0 + netstandard2.0;netcoreapp3.0;net6.0 Dbosoft.Hosuto.Hosting.AspNetCore Dbosoft.Hosuto false @@ -9,7 +9,7 @@ - + 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 configure) { diff --git a/src/Hosuto.Testing.AspNetCore/Hosuto.Testing.AspNetCore.csproj b/src/Hosuto.Testing.AspNetCore/Hosuto.Testing.AspNetCore.csproj index f62a830..6693b65 100644 --- a/src/Hosuto.Testing.AspNetCore/Hosuto.Testing.AspNetCore.csproj +++ b/src/Hosuto.Testing.AspNetCore/Hosuto.Testing.AspNetCore.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0;netstandard2.0;net5.0;net6.0 + netcoreapp3.0;netstandard2.0;net6.0;net8.0 Dbosoft.Hosuto.Testing.AspNetCore Dbosoft.Hosuto false @@ -15,10 +15,10 @@ - + - - + + 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 @@  - net6.0;net7.0;net8.0 + net6.0;net8.0;net9.0 false false 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 @@  - net6.0;net7.0;net8.0 + net6.0;net8.0;net9.0 false false 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 @@  - net6.0;net7.0;net8.0 + net6.0;net8.0;net9.0 false false