From ee25c46ee15f2ed2d3995d5019f13d6e57100ad6 Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Fri, 7 Nov 2025 13:15:29 +0100 Subject: [PATCH 1/5] Update NuGet package versions for dependencies Update NuGet package versions for dependencies Upgraded the following NuGet packages to newer versions: - `SixLabors.ImageSharp` from `3.1.11` to `3.1.12` - `HtmlAgilityPack` from `1.12.3` to `1.12.4` - `Swashbuckle.AspNetCore` from `9.0.5` to `9.0.6` - `MailKit` from `4.14.0` to `4.14.1` - `EFCore.NamingConventions` from `9.0.0` to `10.0.0-rc.2` - `Npgsql.EntityFrameworkCore.PostgreSQL` from `9.0.4` to `10.0.0-rc.2` --- Oqtane.Server/Oqtane.Server.csproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index ac5d48e2..9c164474 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -31,10 +31,10 @@ - - - - + + + + @@ -42,8 +42,8 @@ - - + + From eb8cfa28ed8d8e4a1824cdb825c3047c4f3f4ab2 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Fri, 7 Nov 2025 18:22:27 -0500 Subject: [PATCH 2/5] update nuspec to match csproj --- Oqtane.Package/Oqtane.Server.nuspec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Oqtane.Package/Oqtane.Server.nuspec b/Oqtane.Package/Oqtane.Server.nuspec index a5e4ee69..1ac1861e 100644 --- a/Oqtane.Package/Oqtane.Server.nuspec +++ b/Oqtane.Package/Oqtane.Server.nuspec @@ -24,14 +24,14 @@ - - - - + + + + - - + + From f6c1d65c89e38dbeb8a4c469aacb4cb78f6ee4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ton=C4=87i=20Vatavuk?= Date: Mon, 10 Nov 2025 14:00:02 +0100 Subject: [PATCH 3/5] Refactor includeScript to initialize script as null fixes #5791 --- Oqtane.Server/wwwroot/js/interop.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js index ab29231b..944f9812 100644 --- a/Oqtane.Server/wwwroot/js/interop.js +++ b/Oqtane.Server/wwwroot/js/interop.js @@ -124,7 +124,7 @@ Oqtane.Interop = { } }, includeScript: function (id, src, integrity, crossorigin, type, content, location, dataAttributes) { - var script; + var script = null; if (src !== "") { script = document.querySelector("script[src=\"" + CSS.escape(src) + "\"]"); } @@ -140,7 +140,7 @@ Oqtane.Interop = { } } } - if (script !== null) { + if (script instanceof HTMLScriptElement) { script.remove(); script = null; } From 21fcd653b86629857f34a9bdd9c03269c1a21655 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Tue, 11 Nov 2025 14:10:41 -0500 Subject: [PATCH 4/5] upgrade to final .NET 10 SDK --- .../Client/Oqtane.Application.Client.csproj | 10 +++++----- .../Server/Oqtane.Application.Server.csproj | 6 +++--- Oqtane.Client/Oqtane.Client.csproj | 11 +++++------ Oqtane.Maui/Oqtane.Maui.csproj | 10 +++++----- Oqtane.Package/Oqtane.Client.nuspec | 10 +++++----- Oqtane.Package/Oqtane.Server.nuspec | 16 ++++++++-------- Oqtane.Package/Oqtane.Shared.nuspec | 4 ++-- Oqtane.Server/Oqtane.Server.csproj | 16 ++++++++-------- Oqtane.Shared/Oqtane.Shared.csproj | 4 ++-- 9 files changed, 43 insertions(+), 44 deletions(-) diff --git a/Oqtane.Application/Client/Oqtane.Application.Client.csproj b/Oqtane.Application/Client/Oqtane.Application.Client.csproj index f650051a..621b9100 100644 --- a/Oqtane.Application/Client/Oqtane.Application.Client.csproj +++ b/Oqtane.Application/Client/Oqtane.Application.Client.csproj @@ -12,11 +12,11 @@ - - - - - + + + + + diff --git a/Oqtane.Application/Server/Oqtane.Application.Server.csproj b/Oqtane.Application/Server/Oqtane.Application.Server.csproj index 67e8ecdf..9baec673 100644 --- a/Oqtane.Application/Server/Oqtane.Application.Server.csproj +++ b/Oqtane.Application/Server/Oqtane.Application.Server.csproj @@ -21,9 +21,9 @@ - - - + + + diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj index 8b0ed013..bcc69ef0 100644 --- a/Oqtane.Client/Oqtane.Client.csproj +++ b/Oqtane.Client/Oqtane.Client.csproj @@ -5,15 +5,14 @@ true Default true - false - - - - - + + + + + diff --git a/Oqtane.Maui/Oqtane.Maui.csproj b/Oqtane.Maui/Oqtane.Maui.csproj index 4277d5e7..2d4b3572 100644 --- a/Oqtane.Maui/Oqtane.Maui.csproj +++ b/Oqtane.Maui/Oqtane.Maui.csproj @@ -54,11 +54,11 @@ - - - - - + + + + + diff --git a/Oqtane.Package/Oqtane.Client.nuspec b/Oqtane.Package/Oqtane.Client.nuspec index bf616d8d..6fea68b2 100644 --- a/Oqtane.Package/Oqtane.Client.nuspec +++ b/Oqtane.Package/Oqtane.Client.nuspec @@ -19,11 +19,11 @@ - - - - - + + + + + diff --git a/Oqtane.Package/Oqtane.Server.nuspec b/Oqtane.Package/Oqtane.Server.nuspec index 1ac1861e..ffda94ad 100644 --- a/Oqtane.Package/Oqtane.Server.nuspec +++ b/Oqtane.Package/Oqtane.Server.nuspec @@ -20,21 +20,21 @@ - - - - + + + + - + - - - + + + diff --git a/Oqtane.Package/Oqtane.Shared.nuspec b/Oqtane.Package/Oqtane.Shared.nuspec index 18e746b9..9e68e8ca 100644 --- a/Oqtane.Package/Oqtane.Shared.nuspec +++ b/Oqtane.Package/Oqtane.Shared.nuspec @@ -18,8 +18,8 @@ oqtane - - + + diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index 9c164474..608fc22b 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -27,10 +27,10 @@ - - - - + + + + @@ -39,16 +39,16 @@ - + - - + + - + diff --git a/Oqtane.Shared/Oqtane.Shared.csproj b/Oqtane.Shared/Oqtane.Shared.csproj index f148f952..c1bdff46 100644 --- a/Oqtane.Shared/Oqtane.Shared.csproj +++ b/Oqtane.Shared/Oqtane.Shared.csproj @@ -5,8 +5,8 @@ - - + + From f687c09adcdc90b0deef979fb3e5c0c5cff2f55b Mon Sep 17 00:00:00 2001 From: sbwalker Date: Tue, 11 Nov 2025 14:15:24 -0500 Subject: [PATCH 5/5] upgrade to final .NET 10 SDK --- .../Client/[Owner].Module.[Module].Client.csproj | 10 +++++----- .../Server/[Owner].Module.[Module].Server.csproj | 8 ++++---- .../Client/[Owner].Theme.[Theme].Client.csproj | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj index f12361b2..607195bc 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj @@ -13,11 +13,11 @@ - - - - - + + + + + diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj index 946306bf..4e70b5b0 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj @@ -20,10 +20,10 @@ - - - - + + + + diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj index 20a57609..8333d87e 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj @@ -14,9 +14,9 @@ - - - + + +