diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj
index fe970ff9..4439f011 100644
--- a/Oqtane.Client/Oqtane.Client.csproj
+++ b/Oqtane.Client/Oqtane.Client.csproj
@@ -4,7 +4,7 @@
net9.0
Exe
Debug;Release
- 6.0.2
+ 6.1.0
Oqtane
Shaun Walker
.NET Foundation
@@ -12,7 +12,7 @@
.NET Foundation
https://www.oqtane.org
https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE
- https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
https://github.com/oqtane/oqtane.framework
Git
Oqtane
diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
index 59428c93..df6c506a 100644
--- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
+++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
@@ -2,7 +2,7 @@
net9.0
- 6.0.2
+ 6.1.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/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
https://github.com/oqtane/oqtane.framework
Git
true
diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
index fb90faa1..f936db4a 100644
--- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
+++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
@@ -2,7 +2,7 @@
net9.0
- 6.0.2
+ 6.1.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/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
https://github.com/oqtane/oqtane.framework
Git
true
diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
index d358b88d..2cc6f942 100644
--- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
+++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
@@ -2,7 +2,7 @@
net9.0
- 6.0.2
+ 6.1.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/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
https://github.com/oqtane/oqtane.framework
Git
true
diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
index c4f90077..7d1d72e2 100644
--- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
+++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
@@ -2,7 +2,7 @@
net9.0
- 6.0.2
+ 6.1.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/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
https://github.com/oqtane/oqtane.framework
Git
true
diff --git a/Oqtane.Maui/Oqtane.Maui.csproj b/Oqtane.Maui/Oqtane.Maui.csproj
index 09f24894..98ae9384 100644
--- a/Oqtane.Maui/Oqtane.Maui.csproj
+++ b/Oqtane.Maui/Oqtane.Maui.csproj
@@ -6,7 +6,7 @@
Exe
- 6.0.2
+ 6.1.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/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
https://github.com/oqtane/oqtane.framework
Git
Oqtane.Maui
@@ -30,7 +30,7 @@
com.oqtane.maui
- 6.0.2
+ 6.1.0
1
diff --git a/Oqtane.Package/Oqtane.Client.nuspec b/Oqtane.Package/Oqtane.Client.nuspec
index 1d82676d..ae243057 100644
--- a/Oqtane.Package/Oqtane.Client.nuspec
+++ b/Oqtane.Package/Oqtane.Client.nuspec
@@ -2,7 +2,7 @@
Oqtane.Client
- 6.0.2
+ 6.1.0
Shaun Walker
.NET Foundation
Oqtane Framework
@@ -12,7 +12,7 @@
false
MIT
https://github.com/oqtane/oqtane.framework
- https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
readme.md
icon.png
oqtane
diff --git a/Oqtane.Package/Oqtane.Framework.nuspec b/Oqtane.Package/Oqtane.Framework.nuspec
index a268e043..085cad61 100644
--- a/Oqtane.Package/Oqtane.Framework.nuspec
+++ b/Oqtane.Package/Oqtane.Framework.nuspec
@@ -2,7 +2,7 @@
Oqtane.Framework
- 6.0.2
+ 6.1.0
Shaun Walker
.NET Foundation
Oqtane Framework
@@ -11,8 +11,8 @@
.NET Foundation
false
MIT
- https://github.com/oqtane/oqtane.framework/releases/download/v6.0.2/Oqtane.Framework.6.0.2.Upgrade.zip
- https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/download/v6.1.0/Oqtane.Framework.6.1.0.Upgrade.zip
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
readme.md
icon.png
oqtane framework
diff --git a/Oqtane.Package/Oqtane.Server.nuspec b/Oqtane.Package/Oqtane.Server.nuspec
index 8e0a0fcc..2f5380a9 100644
--- a/Oqtane.Package/Oqtane.Server.nuspec
+++ b/Oqtane.Package/Oqtane.Server.nuspec
@@ -2,7 +2,7 @@
Oqtane.Server
- 6.0.2
+ 6.1.0
Shaun Walker
.NET Foundation
Oqtane Framework
@@ -12,7 +12,7 @@
false
MIT
https://github.com/oqtane/oqtane.framework
- https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
readme.md
icon.png
oqtane
diff --git a/Oqtane.Package/Oqtane.Shared.nuspec b/Oqtane.Package/Oqtane.Shared.nuspec
index 1b8db074..92b94496 100644
--- a/Oqtane.Package/Oqtane.Shared.nuspec
+++ b/Oqtane.Package/Oqtane.Shared.nuspec
@@ -2,7 +2,7 @@
Oqtane.Shared
- 6.0.2
+ 6.1.0
Shaun Walker
.NET Foundation
Oqtane Framework
@@ -12,7 +12,7 @@
false
MIT
https://github.com/oqtane/oqtane.framework
- https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
readme.md
icon.png
oqtane
diff --git a/Oqtane.Package/Oqtane.Updater.nuspec b/Oqtane.Package/Oqtane.Updater.nuspec
index ea5a8715..c0e5e5db 100644
--- a/Oqtane.Package/Oqtane.Updater.nuspec
+++ b/Oqtane.Package/Oqtane.Updater.nuspec
@@ -2,7 +2,7 @@
Oqtane.Updater
- 6.0.2
+ 6.1.0
Shaun Walker
.NET Foundation
Oqtane Framework
@@ -12,7 +12,7 @@
false
MIT
https://github.com/oqtane/oqtane.framework
- https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
readme.md
icon.png
oqtane
diff --git a/Oqtane.Package/install.ps1 b/Oqtane.Package/install.ps1
index b94436f3..7336d3b4 100644
--- a/Oqtane.Package/install.ps1
+++ b/Oqtane.Package/install.ps1
@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.0.2.Install.zip" -Force
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.1.0.Install.zip" -Force
diff --git a/Oqtane.Package/upgrade.ps1 b/Oqtane.Package/upgrade.ps1
index 5fbb0191..80e44c4d 100644
--- a/Oqtane.Package/upgrade.ps1
+++ b/Oqtane.Package/upgrade.ps1
@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.0.2.Upgrade.zip" -Force
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.1.0.Upgrade.zip" -Force
diff --git a/Oqtane.Server/Infrastructure/UpgradeManager.cs b/Oqtane.Server/Infrastructure/UpgradeManager.cs
index b4e8aedf..b32adaeb 100644
--- a/Oqtane.Server/Infrastructure/UpgradeManager.cs
+++ b/Oqtane.Server/Infrastructure/UpgradeManager.cs
@@ -74,8 +74,8 @@ namespace Oqtane.Infrastructure
case "6.0.1":
Upgrade_6_0_1(tenant, scope);
break;
- case "6.0.2":
- Upgrade_6_0_2(tenant, scope);
+ case "6.1.0":
+ Upgrade_6_1_0(tenant, scope);
break;
}
}
@@ -484,14 +484,14 @@ namespace Oqtane.Infrastructure
RemoveAssemblies(assemblies, "6.0.1");
}
- private void Upgrade_6_0_2(Tenant tenant, IServiceScope scope)
+ private void Upgrade_6_1_0(Tenant tenant, IServiceScope scope)
{
// remove MySql.EntityFrameworkCore package (replaced by Pomelo.EntityFrameworkCore.MySql)
string[] assemblies = {
"MySql.EntityFrameworkCore.dll"
};
- RemoveAssemblies(assemblies, "6.0.2");
+ RemoveAssemblies(assemblies, "6.1.0");
}
private void AddPagesToSites(IServiceScope scope, Tenant tenant, List pageTemplates)
diff --git a/Oqtane.Server/Migrations/Master/06000201_AddThemeVersion.cs b/Oqtane.Server/Migrations/Master/06010001_AddThemeVersion.cs
similarity index 95%
rename from Oqtane.Server/Migrations/Master/06000201_AddThemeVersion.cs
rename to Oqtane.Server/Migrations/Master/06010001_AddThemeVersion.cs
index def80a48..d88f55c1 100644
--- a/Oqtane.Server/Migrations/Master/06000201_AddThemeVersion.cs
+++ b/Oqtane.Server/Migrations/Master/06010001_AddThemeVersion.cs
@@ -7,7 +7,7 @@ using Oqtane.Repository;
namespace Oqtane.Migrations.Master
{
[DbContext(typeof(MasterDBContext))]
- [Migration("Master.06.00.02.01")]
+ [Migration("Master.06.01.00.01")]
public class AddThemeVersion : MultiDatabaseMigration
{
public AddThemeVersion(IDatabase database) : base(database)
diff --git a/Oqtane.Server/Migrations/Tenant/06000201_AddFolderCacheControl.cs b/Oqtane.Server/Migrations/Tenant/06010001_AddFolderCacheControl.cs
similarity index 95%
rename from Oqtane.Server/Migrations/Tenant/06000201_AddFolderCacheControl.cs
rename to Oqtane.Server/Migrations/Tenant/06010001_AddFolderCacheControl.cs
index 7e566bea..d2cd810b 100644
--- a/Oqtane.Server/Migrations/Tenant/06000201_AddFolderCacheControl.cs
+++ b/Oqtane.Server/Migrations/Tenant/06010001_AddFolderCacheControl.cs
@@ -7,7 +7,7 @@ using Oqtane.Repository;
namespace Oqtane.Migrations.Tenant
{
[DbContext(typeof(TenantDBContext))]
- [Migration("Tenant.06.00.02.01")]
+ [Migration("Tenant.06.01.00.01")]
public class AddFolderCacheControl : MultiDatabaseMigration
{
public AddFolderCacheControl(IDatabase database) : base(database)
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index 9e06b595..5c1852df 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -3,7 +3,7 @@
net9.0
Debug;Release
- 6.0.2
+ 6.1.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/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
https://github.com/oqtane/oqtane.framework
Git
Oqtane
diff --git a/Oqtane.Shared/Oqtane.Shared.csproj b/Oqtane.Shared/Oqtane.Shared.csproj
index d1e7c0b7..91f13025 100644
--- a/Oqtane.Shared/Oqtane.Shared.csproj
+++ b/Oqtane.Shared/Oqtane.Shared.csproj
@@ -3,7 +3,7 @@
net9.0
Debug;Release
- 6.0.2
+ 6.1.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/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
https://github.com/oqtane/oqtane.framework
Git
Oqtane
diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs
index 04d3bda7..447da2fa 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 = "6.0.2";
- 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,4.0.1,4.0.2,4.0.3,4.0.4,4.0.5,4.0.6,5.0.0,5.0.1,5.0.2,5.0.3,5.1.0,5.1.1,5.1.2,5.2.0,5.2.1,5.2.2,5.2.3,5.2.4,6.0.0,6.0.1,6.0.2";
+ public static readonly string Version = "6.1.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,4.0.1,4.0.2,4.0.3,4.0.4,4.0.5,4.0.6,5.0.0,5.0.1,5.0.2,5.0.3,5.1.0,5.1.1,5.1.2,5.2.0,5.2.1,5.2.2,5.2.3,5.2.4,6.0.0,6.0.1,6.1.0";
public const string PackageId = "Oqtane.Framework";
public const string ClientId = "Oqtane.Client";
public const string UpdaterPackageId = "Oqtane.Updater";
diff --git a/Oqtane.Updater/Oqtane.Updater.csproj b/Oqtane.Updater/Oqtane.Updater.csproj
index 79332b79..58cd963e 100644
--- a/Oqtane.Updater/Oqtane.Updater.csproj
+++ b/Oqtane.Updater/Oqtane.Updater.csproj
@@ -3,7 +3,7 @@
net9.0
Exe
- 6.0.2
+ 6.1.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/v6.0.2
+ https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.0
https://github.com/oqtane/oqtane.framework
Git
Oqtane