diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj index d75a10e8..d77cb89e 100644 --- a/Oqtane.Client/Oqtane.Client.csproj +++ b/Oqtane.Client/Oqtane.Client.csproj @@ -1,11 +1,11 @@ - net6.0 + net7.0 Exe 3.0 Debug;Release - 3.4.3 + 4.0.0 Oqtane Shaun Walker .NET Foundation @@ -13,7 +13,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 https://github.com/oqtane/oqtane.framework Git Oqtane @@ -22,13 +22,13 @@ - - - + + + + + + - - - diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj index 772cecd9..516a19b1 100644 --- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj +++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj @@ -1,8 +1,8 @@ - net6.0 - 3.4.3 + net7.0 + 4.0.0 Oqtane Shaun Walker .NET Foundation @@ -10,7 +10,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 https://github.com/oqtane/oqtane.framework Git true @@ -29,7 +29,7 @@ - + diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec index e30388a5..93c7397f 100644 --- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec +++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec @@ -2,7 +2,7 @@ Oqtane.Database.MySQL - 3.4.3 + 4.0.0 Shaun Walker .NET Foundation Oqtane MySQL Provider @@ -12,15 +12,15 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 icon.png oqtane - - - - + + + + \ No newline at end of file diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj index 6d6b8f19..766bb3ca 100644 --- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj +++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj @@ -1,8 +1,8 @@ - net6.0 - 3.4.3 + net7.0 + 4.0.0 Oqtane Shaun Walker .NET Foundation @@ -10,7 +10,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 https://github.com/oqtane/oqtane.framework Git true @@ -29,9 +29,9 @@ - - - + + + diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec index 23691ae5..dabb9c07 100644 --- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec +++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec @@ -2,7 +2,7 @@ Oqtane.Database.PostgreSQL - 3.4.3 + 4.0.0 Shaun Walker .NET Foundation Oqtane PostgreSQL Provider @@ -12,16 +12,16 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 icon.png oqtane - - - - - + + + + + \ No newline at end of file diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj index ecd413cd..a5f1eff0 100644 --- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj +++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj @@ -1,8 +1,8 @@ - net6.0 - 3.4.3 + net7.0 + 4.0.0 Oqtane Shaun Walker .NET Foundation @@ -10,7 +10,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 https://github.com/oqtane/oqtane.framework Git true @@ -29,7 +29,7 @@ - + diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec index e61b079e..7a021d25 100644 --- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec +++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec @@ -2,7 +2,7 @@ Oqtane.Database.SqlServer - 3.4.3 + 4.0.0 Shaun Walker .NET Foundation Oqtane SQL Server Provider @@ -12,14 +12,14 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 icon.png oqtane - - - + + + \ No newline at end of file diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj index f3f2594e..a14adef3 100644 --- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj +++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj @@ -1,8 +1,8 @@ - net6.0 - 3.4.3 + net7.0 + 4.0.0 Oqtane Shaun Walker .NET Foundation @@ -10,7 +10,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 https://github.com/oqtane/oqtane.framework Git true @@ -29,7 +29,7 @@ - + diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec index d748a047..9a36be5b 100644 --- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec +++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec @@ -2,7 +2,7 @@ Oqtane.Database.Sqlite - 3.4.3 + 4.0.0 Shaun Walker .NET Foundation Oqtane SQLite Provider @@ -12,14 +12,14 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 icon.png oqtane - - - + + + \ No newline at end of file diff --git a/Oqtane.Maui/Oqtane.Maui.csproj b/Oqtane.Maui/Oqtane.Maui.csproj index f47ea09a..3dae7c68 100644 --- a/Oqtane.Maui/Oqtane.Maui.csproj +++ b/Oqtane.Maui/Oqtane.Maui.csproj @@ -1,12 +1,12 @@ - $(TargetFrameworks);net6.0-windows10.0.19041.0 + $(TargetFrameworks);net7.0-windows10.0.19041.0 - - + + Exe - 3.4.3 + 4.0.0 Oqtane Shaun Walker .NET Foundation @@ -14,7 +14,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 https://github.com/oqtane/oqtane.framework Git Oqtane.Maui @@ -31,7 +31,7 @@ 0E29FC31-1B83-48ED-B6E0-9F3C67B775D4 - 3.4.3 + 4.0.0 1 14.2 @@ -65,12 +65,12 @@ - - + + - - - + + + diff --git a/Oqtane.Package/Oqtane.Client.nuspec b/Oqtane.Package/Oqtane.Client.nuspec index 99de9771..b2b4def4 100644 --- a/Oqtane.Package/Oqtane.Client.nuspec +++ b/Oqtane.Package/Oqtane.Client.nuspec @@ -2,7 +2,7 @@ Oqtane.Client - 3.4.3 + 4.0.0 Shaun Walker .NET Foundation Oqtane Framework @@ -12,13 +12,13 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 icon.png oqtane - - + + \ No newline at end of file diff --git a/Oqtane.Package/Oqtane.Framework.nuspec b/Oqtane.Package/Oqtane.Framework.nuspec index b2bbe94b..662219e6 100644 --- a/Oqtane.Package/Oqtane.Framework.nuspec +++ b/Oqtane.Package/Oqtane.Framework.nuspec @@ -2,7 +2,7 @@ Oqtane.Framework - 3.4.3 + 4.0.0 Shaun Walker .NET Foundation Oqtane Framework @@ -11,8 +11,8 @@ .NET Foundation false MIT - https://github.com/oqtane/oqtane.framework/releases/download/v3.4.3/Oqtane.Framework.3.4.3.Upgrade.zip - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/download/v4.0.0/Oqtane.Framework.4.0.0.Upgrade.zip + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 icon.png oqtane framework diff --git a/Oqtane.Package/Oqtane.Server.nuspec b/Oqtane.Package/Oqtane.Server.nuspec index e4e993ad..70a25469 100644 --- a/Oqtane.Package/Oqtane.Server.nuspec +++ b/Oqtane.Package/Oqtane.Server.nuspec @@ -2,7 +2,7 @@ Oqtane.Server - 3.4.3 + 4.0.0 Shaun Walker .NET Foundation Oqtane Framework @@ -12,13 +12,13 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 icon.png oqtane - - + + \ No newline at end of file diff --git a/Oqtane.Package/Oqtane.Shared.nuspec b/Oqtane.Package/Oqtane.Shared.nuspec index 965fdcaa..6b073a4a 100644 --- a/Oqtane.Package/Oqtane.Shared.nuspec +++ b/Oqtane.Package/Oqtane.Shared.nuspec @@ -2,7 +2,7 @@ Oqtane.Shared - 3.4.3 + 4.0.0 Shaun Walker .NET Foundation Oqtane Framework @@ -12,13 +12,13 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 icon.png oqtane - - + + \ No newline at end of file diff --git a/Oqtane.Package/Oqtane.Updater.nuspec b/Oqtane.Package/Oqtane.Updater.nuspec index 12d8391b..9e667cc9 100644 --- a/Oqtane.Package/Oqtane.Updater.nuspec +++ b/Oqtane.Package/Oqtane.Updater.nuspec @@ -2,7 +2,7 @@ Oqtane.Updater - 3.4.3 + 4.0.0 Shaun Walker .NET Foundation Oqtane Framework @@ -12,12 +12,12 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 icon.png oqtane - + \ No newline at end of file diff --git a/Oqtane.Package/install.ps1 b/Oqtane.Package/install.ps1 index ed7f214e..9d1c4f9e 100644 --- a/Oqtane.Package/install.ps1 +++ b/Oqtane.Package/install.ps1 @@ -1 +1 @@ -Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.4.3.Install.zip" -Force \ No newline at end of file +Compress-Archive -Path "..\Oqtane.Server\bin\Release\net7.0\publish\*" -DestinationPath "Oqtane.Framework.4.0.0.Install.zip" -Force \ No newline at end of file diff --git a/Oqtane.Package/release.cmd b/Oqtane.Package/release.cmd index 05404321..c3e281c9 100644 --- a/Oqtane.Package/release.cmd +++ b/Oqtane.Package/release.cmd @@ -8,14 +8,14 @@ nuget.exe pack Oqtane.Client.nuspec nuget.exe pack Oqtane.Server.nuspec nuget.exe pack Oqtane.Shared.nuspec nuget.exe pack Oqtane.Framework.nuspec -del /F/Q/S "..\Oqtane.Server\bin\Release\net6.0\publish" > NUL -rmdir /Q/S "..\Oqtane.Server\bin\Release\net6.0\publish" +del /F/Q/S "..\Oqtane.Server\bin\Release\net7.0\publish" > NUL +rmdir /Q/S "..\Oqtane.Server\bin\Release\net7.0\publish" dotnet publish ..\Oqtane.Server\Oqtane.Server.csproj /p:Configuration=Release -del /F/Q/S "..\Oqtane.Server\bin\Release\net6.0\publish\wwwroot\Content" > NUL -rmdir /Q/S "..\Oqtane.Server\bin\Release\net6.0\publish\wwwroot\Content" +del /F/Q/S "..\Oqtane.Server\bin\Release\net7.0\publish\wwwroot\Content" > NUL +rmdir /Q/S "..\Oqtane.Server\bin\Release\net7.0\publish\wwwroot\Content" setlocal ENABLEDELAYEDEXPANSION set retain=Oqtane.Modules.Admin.Login,Oqtane.Modules.HtmlText,Templates -for /D %%i in ("..\Oqtane.Server\bin\Release\net6.0\publish\wwwroot\Modules\*") do ( +for /D %%i in ("..\Oqtane.Server\bin\Release\net7.0\publish\wwwroot\Modules\*") do ( set /A found=0 for %%j in (%retain%) do ( if "%%~nxi" == "%%j" set /A found=1 @@ -23,18 +23,18 @@ if "%%~nxi" == "%%j" set /A found=1 if not !found! == 1 rmdir /Q/S "%%i" ) set retain=Oqtane.Themes.BlazorTheme,Oqtane.Themes.OqtaneTheme,Templates -for /D %%i in ("..\Oqtane.Server\bin\Release\net6.0\publish\wwwroot\Themes\*") do ( +for /D %%i in ("..\Oqtane.Server\bin\Release\net7.0\publish\wwwroot\Themes\*") do ( set /A found=0 for %%j in (%retain%) do ( if "%%~nxi" == "%%j" set /A found=1 ) if not !found! == 1 rmdir /Q/S "%%i" ) -del "..\Oqtane.Server\bin\Release\net6.0\publish\appsettings.json" -ren "..\Oqtane.Server\bin\Release\net6.0\publish\appsettings.release.json" "appsettings.json" +del "..\Oqtane.Server\bin\Release\net7.0\publish\appsettings.json" +ren "..\Oqtane.Server\bin\Release\net7.0\publish\appsettings.release.json" "appsettings.json" C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe ".\install.ps1" -del "..\Oqtane.Server\bin\Release\net6.0\publish\appsettings.json" -del "..\Oqtane.Server\bin\Release\net6.0\publish\web.config" +del "..\Oqtane.Server\bin\Release\net7.0\publish\appsettings.json" +del "..\Oqtane.Server\bin\Release\net7.0\publish\web.config" C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe ".\upgrade.ps1" dotnet clean -c Release ..\Oqtane.Updater.sln dotnet build -c Release ..\Oqtane.Updater.sln diff --git a/Oqtane.Package/upgrade.ps1 b/Oqtane.Package/upgrade.ps1 index d05ecaee..17d5c251 100644 --- a/Oqtane.Package/upgrade.ps1 +++ b/Oqtane.Package/upgrade.ps1 @@ -1 +1 @@ -Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.4.3.Upgrade.zip" -Force \ No newline at end of file +Compress-Archive -Path "..\Oqtane.Server\bin\Release\net7.0\publish\*" -DestinationPath "Oqtane.Framework.4.0.0.Upgrade.zip" -Force \ No newline at end of file diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index 2073c8a6..1c0e5687 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -1,9 +1,9 @@ - net6.0 + net7.0 Debug;Release - 3.4.3 + 4.0.0 Oqtane Shaun Walker .NET Foundation @@ -11,7 +11,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 https://github.com/oqtane/oqtane.framework Git Oqtane @@ -32,21 +32,21 @@ - - - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + + + diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak index 6375fd66..72e692cf 100644 Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak differ diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak index 1fe60104..ab6529ff 100644 Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak differ diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak index 0bbc834b..e9cd97e6 100644 Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak differ diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak index 44b9b064..054330c8 100644 Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak differ diff --git a/Oqtane.Shared/Oqtane.Shared.csproj b/Oqtane.Shared/Oqtane.Shared.csproj index 00e174e9..5c3f82a5 100644 --- a/Oqtane.Shared/Oqtane.Shared.csproj +++ b/Oqtane.Shared/Oqtane.Shared.csproj @@ -1,9 +1,9 @@ - net6.0 + net7.0 Debug;Release - 3.4.3 + 4.0.0 Oqtane Shaun Walker .NET Foundation @@ -11,7 +11,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 https://github.com/oqtane/oqtane.framework Git Oqtane @@ -19,11 +19,11 @@ - - - + + + - + diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index 8dc00e73..f9474777 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/Oqtane.Shared/Shared/Constants.cs @@ -4,8 +4,8 @@ namespace Oqtane.Shared { public class Constants { - public static readonly string Version = "3.4.3"; - public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3"; + public static readonly string Version = "4.0.0"; + public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3,4.0.0"; public const string PackageId = "Oqtane.Framework"; public const string ClientId = "Oqtane.Client"; public const string UpdaterPackageId = "Oqtane.Updater"; diff --git a/Oqtane.Test/Oqtane.Client.Tests/LocalizationCookieTests.cs b/Oqtane.Test/Oqtane.Client.Tests/LocalizationCookieTests.cs deleted file mode 100644 index 4acc1bb9..00000000 --- a/Oqtane.Test/Oqtane.Client.Tests/LocalizationCookieTests.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Localization; -using Xunit; - -namespace Oqtane.Oqtane.Client.Tests -{ - public class LocalizationCookieTests - { - [Theory] - [InlineData("c=ar|uic=ar", "ar")] - [InlineData("c=ar", null)] - [InlineData("", null)] - [InlineData(null, null)] - public void ParseCookie(string localizationCookie, string expectedCulture) - { - // Arrange - var localizationCookieValue = CookieRequestCultureProvider.ParseCookieValue(localizationCookie); - - // Act - var culture = localizationCookieValue?.UICultures?[0].Value; - - // Assert - Assert.Equal(expectedCulture, culture); - } - } -} diff --git a/Oqtane.Test/Oqtane.Database.MySQL/MySqlDatabaseTests.cs b/Oqtane.Test/Oqtane.Database.MySQL/MySqlDatabaseTests.cs deleted file mode 100644 index a85f9181..00000000 --- a/Oqtane.Test/Oqtane.Database.MySQL/MySqlDatabaseTests.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Xunit; - -namespace Oqtane.Database.MySQL.Tests -{ - public class PostgreSQLDatabaseTests - { - [Fact()] - public void VerifyDatabaseTypeName() - { - // Arrange & Act - var database = new MySQLDatabase(); - - // Assert - Assert.Equal("Oqtane.Database.MySQL.MySQLDatabase, Oqtane.Database.MySQL", database.TypeName); - } - } -} diff --git a/Oqtane.Test/Oqtane.Database.PostgreSQL/PostgreSQLDatabaseTests.cs b/Oqtane.Test/Oqtane.Database.PostgreSQL/PostgreSQLDatabaseTests.cs deleted file mode 100644 index f8fac122..00000000 --- a/Oqtane.Test/Oqtane.Database.PostgreSQL/PostgreSQLDatabaseTests.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Xunit; - -namespace Oqtane.Database.PostgreSQL.Tests -{ - public class PostgreSQLDatabaseTests - { - [Fact()] - public void VerifyDatabaseTypeName() - { - // Arrange & Act - var database = new PostgreSQLDatabase(); - - // Assert - Assert.Equal("Oqtane.Database.PostgreSQL.PostgreSQLDatabase, Oqtane.Database.PostgreSQL", database.TypeName); - } - } -} diff --git a/Oqtane.Test/Oqtane.Database.SqlServer/SqlServerDatabaseTests.cs b/Oqtane.Test/Oqtane.Database.SqlServer/SqlServerDatabaseTests.cs deleted file mode 100644 index a6375e08..00000000 --- a/Oqtane.Test/Oqtane.Database.SqlServer/SqlServerDatabaseTests.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Xunit; - -namespace Oqtane.Database.SqlServer.Tests -{ - public class SqlServerDatabaseTests - { - [Fact()] - public void VerifyDatabaseTypeName() - { - // Arrange & Act - var database = new SqlServerDatabase(); - - // Assert - Assert.Equal("Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer", database.TypeName); - } - } -} diff --git a/Oqtane.Test/Oqtane.Database.Sqlite/SqliteDatabaseTests.cs b/Oqtane.Test/Oqtane.Database.Sqlite/SqliteDatabaseTests.cs deleted file mode 100644 index 49fa5613..00000000 --- a/Oqtane.Test/Oqtane.Database.Sqlite/SqliteDatabaseTests.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Xunit; - -namespace Oqtane.Database.Sqlite.Tests -{ - public class SqliteDatabaseTests - { - [Fact()] - public void VerifyDatabaseTypeName() - { - // Arrange & Act - var database = new SqliteDatabase(); - - // Assert - Assert.Equal("Oqtane.Database.Sqlite.SqliteDatabase, Oqtane.Database.Sqlite", database.TypeName); - } - } -} diff --git a/Oqtane.Test/Oqtane.Shared.Tests/UtilitiesTests.cs b/Oqtane.Test/Oqtane.Shared.Tests/UtilitiesTests.cs deleted file mode 100644 index 0a2dc47c..00000000 --- a/Oqtane.Test/Oqtane.Shared.Tests/UtilitiesTests.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System; -using System.Globalization; -using Oqtane.Shared; -using Xunit; - -namespace Oqtane.Test.Oqtane.Shared.Tests -{ - public class UtilitiesTests - { - [Theory] - [InlineData("contoso", "login", "returnUrl=/admin", "/contoso/login/!/returnUrl=/admin")] - [InlineData("contoso", "admin", "", "/contoso/admin")] - [InlineData("contoso", "", "pageId=4", "/contoso?pageId=4")] - [InlineData("contoso", "", "pageId=4&moduleId=10", "/contoso?pageId=4&moduleId=10")] - [InlineData("contoso", "", "", "/contoso")] - [InlineData("", "login", "returnUrl=/admin", "/login/!/returnUrl=/admin")] - [InlineData("", "admin", "", "/admin")] - [InlineData("", "", "pageId=4", "/?pageId=4")] - [InlineData("", "", "pageId=4&moduleId=10", "/?pageId=4&moduleId=10")] - [InlineData("", "", "", "/")] - public void NavigateUrlTest(string alias, string path, string parameters, string expectedUrl) - { - // Arrange - var navigatedUrl = string.Empty; - - // Act - navigatedUrl = Utilities.NavigateUrl(alias, path, parameters); - - // Assert - Assert.Equal(expectedUrl, navigatedUrl); - } - - [Theory] - [InlineData(2022, 02, 01, "21:00", "Eastern Standard Time", 2022, 2, 2, 2)] - [InlineData(2022, 02, 02, "15:00", "Eastern Standard Time", 2022, 2, 2, 20)] - [InlineData(2022, 02, 02, "", "Eastern Standard Time", 2022, 2, 2, 5)] - [InlineData(0, 0, 0, "", "Eastern Standard Time", 0, 0, 0, 0)] - public void LocalDateAndTimeAsUtcTest(int yr, int mo, int day, string timeString, string zone, int yrUtc, int moUtc, int dayUtc, int hrUtc) - { - // Arrange - DateTime? srcDate = null; - if (yr > 0) - { - srcDate = new DateTime(yr, mo, day); - } - - // Act - var dateTime = Utilities.LocalDateAndTimeAsUtc(srcDate, timeString, TimeZoneInfo.FindSystemTimeZoneById(zone)); - - // Assert - DateTime? expected = null; - if (yrUtc > 0) - { - expected = new DateTime(yrUtc, moUtc, dayUtc, hrUtc, 0, 0, DateTimeKind.Utc); - } - Assert.Equal(expected, dateTime); - } - - [Theory] - // Standard Time - [InlineData(2022, 2, 2, 2, DateTimeKind.Unspecified, "Eastern Standard Time", "2022/02/01", "21:00")] - [InlineData(2022, 2, 2, 2, DateTimeKind.Utc, "Eastern Standard Time", "2022/02/01", "21:00")] - [InlineData(2022, 2, 2, 20, DateTimeKind.Unspecified, "Eastern Standard Time", "2022/02/02", "15:00")] - [InlineData(2022, 2, 2, 20, DateTimeKind.Utc, "Eastern Standard Time", "2022/02/02", "15:00")] - [InlineData(2022, 2, 2, 5, DateTimeKind.Unspecified, "Eastern Standard Time", "2022/02/02", "")] - [InlineData(2022, 2, 2, 5, DateTimeKind.Utc, "Eastern Standard Time", "2022/02/02", "")] - // Daylight Savings Time - [InlineData(2022, 7, 2, 20, DateTimeKind.Unspecified, "Eastern Standard Time", "2022/07/02", "16:00")] - [InlineData(2022, 7, 2, 20, DateTimeKind.Utc, "Eastern Standard Time", "2022/07/02", "16:00")] - [InlineData(2022, 7, 2, 4, DateTimeKind.Unspecified, "Eastern Standard Time", "2022/07/02", "")] - [InlineData(2022, 7, 2, 4, DateTimeKind.Utc, "Eastern Standard Time", "2022/07/02", "")] - public void UtcAsLocalDateAndTimeTest(int yr, int mo, int day, int hr, DateTimeKind dateTimeKind, string zone, string expectedDate, string expectedTime) - { - // Arrange - DateTime? srcDate = null; - if (yr > 0) - { - srcDate = new DateTime(yr, mo, day, hr, 0, 0, dateTimeKind); - } - - // Act - var dateAndTime = Utilities.UtcAsLocalDateAndTime(srcDate, TimeZoneInfo.FindSystemTimeZoneById(zone)); - - // Assert - Assert.Equal(expectedDate, dateAndTime.date.Value.ToString("yyyy/MM/dd")); - Assert.Equal(expectedTime, dateAndTime.time); - } - } -} diff --git a/Oqtane.Test/Oqtane.Test.csproj b/Oqtane.Test/Oqtane.Test.csproj deleted file mode 100644 index 8641026e..00000000 --- a/Oqtane.Test/Oqtane.Test.csproj +++ /dev/null @@ -1,73 +0,0 @@ - - - - net6.0 - Debug;Release - 3.4.3 - Oqtane - Shaun Walker - .NET Foundation - Modular Application Framework for Blazor and MAUI - .NET Foundation - https://www.oqtane.org - https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 - https://github.com/oqtane/oqtane.framework - Git - Oqtane - false - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Oqtane.Updater/Oqtane.Updater.csproj b/Oqtane.Updater/Oqtane.Updater.csproj index 9cb41856..eb79be2f 100644 --- a/Oqtane.Updater/Oqtane.Updater.csproj +++ b/Oqtane.Updater/Oqtane.Updater.csproj @@ -1,9 +1,9 @@ - net6.0 + net7.0 Exe - 3.4.3 + 4.0.0 Oqtane Shaun Walker .NET Foundation @@ -11,7 +11,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v3.4.3 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 https://github.com/oqtane/oqtane.framework Git Oqtane diff --git a/Oqtane.sln b/Oqtane.sln index 2ef03009..f6d07ccb 100644 --- a/Oqtane.sln +++ b/Oqtane.sln @@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Client", "Oqtane.Cli EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Shared", "Oqtane.Shared\Oqtane.Shared.csproj", "{19D67A9D-3F2E-41BD-80E6-0B50CA83C3AE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Test", "Oqtane.Test\Oqtane.Test.csproj", "{823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{77EECA8C-B58E-469E-B8C5-D543AFC9A654}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig @@ -36,10 +34,6 @@ Global {19D67A9D-3F2E-41BD-80E6-0B50CA83C3AE}.Debug|Any CPU.Build.0 = Debug|Any CPU {19D67A9D-3F2E-41BD-80E6-0B50CA83C3AE}.Release|Any CPU.ActiveCfg = Release|Any CPU {19D67A9D-3F2E-41BD-80E6-0B50CA83C3AE}.Release|Any CPU.Build.0 = Release|Any CPU - {823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}.Debug|Any CPU.Build.0 = Debug|Any CPU - {823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}.Release|Any CPU.ActiveCfg = Release|Any CPU - {823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE