From 036bbb418e1fdbdda4bba80e9b41e72d1eeea00d Mon Sep 17 00:00:00 2001 From: sbwalker Date: Thu, 21 Aug 2025 09:56:03 -0400 Subject: [PATCH 1/8] template updates --- .../Build/Oqtane.Application.Build.csproj | 11 ++--------- .../Client/Oqtane.Application.Client.csproj | 5 ++--- .../Server/Oqtane.Application.Server.csproj | 9 ++------- .../Shared/Oqtane.Application.Shared.csproj | 2 +- 4 files changed, 7 insertions(+), 20 deletions(-) diff --git a/Oqtane.Application/Build/Oqtane.Application.Build.csproj b/Oqtane.Application/Build/Oqtane.Application.Build.csproj index a432daef..af1c3888 100644 --- a/Oqtane.Application/Build/Oqtane.Application.Build.csproj +++ b/Oqtane.Application/Build/Oqtane.Application.Build.csproj @@ -6,13 +6,6 @@ false - - - True - - - - @@ -20,8 +13,8 @@ - - + + \ No newline at end of file diff --git a/Oqtane.Application/Client/Oqtane.Application.Client.csproj b/Oqtane.Application/Client/Oqtane.Application.Client.csproj index 24c49e8a..ae37ebd5 100644 --- a/Oqtane.Application/Client/Oqtane.Application.Client.csproj +++ b/Oqtane.Application/Client/Oqtane.Application.Client.csproj @@ -4,7 +4,6 @@ net9.0 1.0.0 Oqtane.Application.Client.Oqtane - true @@ -20,8 +19,8 @@ - - + + diff --git a/Oqtane.Application/Server/Oqtane.Application.Server.csproj b/Oqtane.Application/Server/Oqtane.Application.Server.csproj index 07e2a168..44826c6b 100644 --- a/Oqtane.Application/Server/Oqtane.Application.Server.csproj +++ b/Oqtane.Application/Server/Oqtane.Application.Server.csproj @@ -5,7 +5,6 @@ true 1.0.0 Oqtane.Application.Server.Oqtane - true @@ -26,11 +25,7 @@ - - - - - - + + diff --git a/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj b/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj index 68aef478..641056f4 100644 --- a/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj +++ b/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj @@ -11,7 +11,7 @@ - + From 0f38df053fe8bf64c58287c4f6755d71f4a69969 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Thu, 21 Aug 2025 09:57:29 -0400 Subject: [PATCH 2/8] fix #5519 - Site hard delete exception --- Oqtane.Server/Repository/SiteRepository.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index 530c536c..f791aeac 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -109,6 +109,11 @@ namespace Oqtane.Repository public void DeleteSite(int siteId) { + foreach (var role in _roleRepository.GetRoles(siteId, false)) + { + _roleRepository.DeleteRole(role.RoleId); + } + using var db = _factory.CreateDbContext(); var site = db.Site.Find(siteId); db.Site.Remove(site); From cca0f2219e45a3b1f55cb1d2d52da2341b922e0d Mon Sep 17 00:00:00 2001 From: sbwalker Date: Thu, 21 Aug 2025 09:59:15 -0400 Subject: [PATCH 3/8] fix #5520 - site soft delete should only be visible to Host users --- Oqtane.Client/Modules/Admin/Site/Index.razor | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index 7e1385ff..d76f56a5 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -54,15 +54,18 @@ -
- -
- + @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) + { +
+ +
+ +
-
+ }
From 52799c7cb05cc0ac8a94506a063db6104669806e Mon Sep 17 00:00:00 2001 From: sbwalker Date: Fri, 22 Aug 2025 08:41:52 -0400 Subject: [PATCH 4/8] declare dependencies in nuspec files and optimize application template --- .../AppHost/Oqtane.Application.AppHost.csproj | 47 ++----------------- .../Build/Oqtane.Application.Build.csproj | 20 -------- Oqtane.Application/Build/debug.cmd | 1 - Oqtane.Application/Build/debug.sh | 1 - .../Client/Oqtane.Application.Client.csproj | 12 +---- Oqtane.Application/Oqtane.Application.sln | 6 --- .../Server/Oqtane.Application.Server.csproj | 23 ++++----- .../Shared/Oqtane.Application.Shared.csproj | 6 +-- Oqtane.Package/Oqtane.Client.nuspec | 11 ++++- Oqtane.Package/Oqtane.Server.nuspec | 32 ++++++++++++- Oqtane.Package/Oqtane.Shared.nuspec | 12 ++++- Oqtane.Package/release.cmd | 2 +- 12 files changed, 69 insertions(+), 104 deletions(-) delete mode 100644 Oqtane.Application/Build/Oqtane.Application.Build.csproj delete mode 100644 Oqtane.Application/Build/debug.cmd delete mode 100644 Oqtane.Application/Build/debug.sh diff --git a/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj b/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj index 9490f607..9a9cb9fa 100644 --- a/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj +++ b/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj @@ -2,50 +2,11 @@ net9.0 - 6.1.5 + 1.0.0 Oqtane.Application.AppHost - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/Oqtane.Application/Build/Oqtane.Application.Build.csproj b/Oqtane.Application/Build/Oqtane.Application.Build.csproj deleted file mode 100644 index af1c3888..00000000 --- a/Oqtane.Application/Build/Oqtane.Application.Build.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - net9.0 - false - false - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Oqtane.Application/Build/debug.cmd b/Oqtane.Application/Build/debug.cmd deleted file mode 100644 index 697dd3ae..00000000 --- a/Oqtane.Application/Build/debug.cmd +++ /dev/null @@ -1 +0,0 @@ -XCOPY "..\Server\wwwroot\*" "..\AppHost\wwwroot\" /Y /S /I \ No newline at end of file diff --git a/Oqtane.Application/Build/debug.sh b/Oqtane.Application/Build/debug.sh deleted file mode 100644 index bf088d67..00000000 --- a/Oqtane.Application/Build/debug.sh +++ /dev/null @@ -1 +0,0 @@ -cp -rf "../Server/wwwroot/"* "../AppHost/wwwroot/" \ No newline at end of file diff --git a/Oqtane.Application/Client/Oqtane.Application.Client.csproj b/Oqtane.Application/Client/Oqtane.Application.Client.csproj index ae37ebd5..865765fc 100644 --- a/Oqtane.Application/Client/Oqtane.Application.Client.csproj +++ b/Oqtane.Application/Client/Oqtane.Application.Client.csproj @@ -6,21 +6,13 @@ Oqtane.Application.Client.Oqtane - - - - - - - - - - + + diff --git a/Oqtane.Application/Oqtane.Application.sln b/Oqtane.Application/Oqtane.Application.sln index c5b05c71..a1054772 100644 --- a/Oqtane.Application/Oqtane.Application.sln +++ b/Oqtane.Application/Oqtane.Application.sln @@ -10,8 +10,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Server", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Shared", "Shared\Oqtane.Application.Shared.csproj", "{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Build", "Build\Oqtane.Application.Build.csproj", "{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -34,10 +32,6 @@ Global {18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU {18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU {18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.Build.0 = Release|Any CPU - {C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Oqtane.Application/Server/Oqtane.Application.Server.csproj b/Oqtane.Application/Server/Oqtane.Application.Server.csproj index 44826c6b..69ea8563 100644 --- a/Oqtane.Application/Server/Oqtane.Application.Server.csproj +++ b/Oqtane.Application/Server/Oqtane.Application.Server.csproj @@ -7,25 +7,20 @@ Oqtane.Application.Server.Oqtane - - - - - - - - - - - - - - + + + + + + + + + diff --git a/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj b/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj index 641056f4..865461b1 100644 --- a/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj +++ b/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj @@ -7,11 +7,7 @@ - - - - - + diff --git a/Oqtane.Package/Oqtane.Client.nuspec b/Oqtane.Package/Oqtane.Client.nuspec index 18ea653b..3adc1e20 100644 --- a/Oqtane.Package/Oqtane.Client.nuspec +++ b/Oqtane.Package/Oqtane.Client.nuspec @@ -2,7 +2,7 @@ Oqtane.Client - 6.1.5 + 6.1.6 Shaun Walker .NET Foundation Oqtane Framework @@ -16,6 +16,15 @@ readme.md icon.png oqtane + + + + + + + + + diff --git a/Oqtane.Package/Oqtane.Server.nuspec b/Oqtane.Package/Oqtane.Server.nuspec index d7e88718..96074428 100644 --- a/Oqtane.Package/Oqtane.Server.nuspec +++ b/Oqtane.Package/Oqtane.Server.nuspec @@ -2,7 +2,7 @@ Oqtane.Server - 6.1.5 + 6.1.6 Shaun Walker .NET Foundation Oqtane Framework @@ -16,6 +16,36 @@ readme.md icon.png oqtane + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Oqtane.Package/Oqtane.Shared.nuspec b/Oqtane.Package/Oqtane.Shared.nuspec index f8e1f177..320f80f8 100644 --- a/Oqtane.Package/Oqtane.Shared.nuspec +++ b/Oqtane.Package/Oqtane.Shared.nuspec @@ -2,7 +2,7 @@ Oqtane.Shared - 6.1.5 + 6.1.6 Shaun Walker .NET Foundation Oqtane Framework @@ -16,6 +16,16 @@ readme.md icon.png oqtane + + + + + + + + + + diff --git a/Oqtane.Package/release.cmd b/Oqtane.Package/release.cmd index 641cd4c4..8b914c90 100644 --- a/Oqtane.Package/release.cmd +++ b/Oqtane.Package/release.cmd @@ -1,12 +1,12 @@ del "*.nupkg" del "*.zip" +rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish" dotnet clean -c Release ..\Oqtane.sln dotnet build -c Release ..\Oqtane.sln nuget.exe pack Oqtane.Client.nuspec nuget.exe pack Oqtane.Server.nuspec nuget.exe pack Oqtane.Shared.nuspec nuget.exe pack Oqtane.Framework.nuspec -rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish" dotnet publish ..\Oqtane.Server\Oqtane.Server.csproj /p:Configuration=Release rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish\Content" rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish\wwwroot\Content" From 247baa375d9882ad0daf11174fac4a14986e1915 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Fri, 22 Aug 2025 08:55:20 -0400 Subject: [PATCH 5/8] increment template version --- Oqtane.Application/Oqtane.Application.Template.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Application/Oqtane.Application.Template.nuspec b/Oqtane.Application/Oqtane.Application.Template.nuspec index 35a1c956..964286a2 100644 --- a/Oqtane.Application/Oqtane.Application.Template.nuspec +++ b/Oqtane.Application/Oqtane.Application.Template.nuspec @@ -2,7 +2,7 @@ Oqtane.Application.Template - 6.1.5 + 6.1.6 Oqtane Application Solution For Blazor Shaun Walker false From 4e33aeef890f288e20687f8e303575d179f0f4b7 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Fri, 22 Aug 2025 09:17:24 -0400 Subject: [PATCH 6/8] more template optimizations --- Oqtane.Application/Client/Oqtane.Application.Client.csproj | 1 - Oqtane.Application/Server/Oqtane.Application.Server.csproj | 1 - 2 files changed, 2 deletions(-) diff --git a/Oqtane.Application/Client/Oqtane.Application.Client.csproj b/Oqtane.Application/Client/Oqtane.Application.Client.csproj index 865765fc..6d83fd5c 100644 --- a/Oqtane.Application/Client/Oqtane.Application.Client.csproj +++ b/Oqtane.Application/Client/Oqtane.Application.Client.csproj @@ -12,7 +12,6 @@ - diff --git a/Oqtane.Application/Server/Oqtane.Application.Server.csproj b/Oqtane.Application/Server/Oqtane.Application.Server.csproj index 69ea8563..7e9ad243 100644 --- a/Oqtane.Application/Server/Oqtane.Application.Server.csproj +++ b/Oqtane.Application/Server/Oqtane.Application.Server.csproj @@ -14,7 +14,6 @@ - From 7f1fed2fb15b32f08cabdd56d5112545e802f0fe Mon Sep 17 00:00:00 2001 From: sbwalker Date: Fri, 22 Aug 2025 10:06:10 -0400 Subject: [PATCH 7/8] make kestrel the default web server for the app template --- .../AppHost/Properties/launchSettings.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Oqtane.Application/AppHost/Properties/launchSettings.json b/Oqtane.Application/AppHost/Properties/launchSettings.json index c0b641d5..11cab4d9 100644 --- a/Oqtane.Application/AppHost/Properties/launchSettings.json +++ b/Oqtane.Application/AppHost/Properties/launchSettings.json @@ -8,15 +8,7 @@ } }, "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "Oqtane.AppHost": { + "Oqtane.Application": { "commandName": "Project", "launchBrowser": true, "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", @@ -24,6 +16,14 @@ "ASPNETCORE_ENVIRONMENT": "Development" }, "applicationUrl": "http://localhost:44358/" + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } } } } From 6a0c47f7b1211a13896d6bd27e86b4fede8ac1d8 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Fri, 22 Aug 2025 14:21:49 -0400 Subject: [PATCH 8/8] remove unecessary content exclusion --- Oqtane.Client/Oqtane.Client.csproj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj index 6c4b6c37..c1bdea3f 100644 --- a/Oqtane.Client/Oqtane.Client.csproj +++ b/Oqtane.Client/Oqtane.Client.csproj @@ -32,12 +32,6 @@ - - - true - - - false false