diff --git a/Oqtane.Server/Infrastructure/UpgradeManager.cs b/Oqtane.Server/Infrastructure/UpgradeManager.cs index aa32a669..79e3ae92 100644 --- a/Oqtane.Server/Infrastructure/UpgradeManager.cs +++ b/Oqtane.Server/Infrastructure/UpgradeManager.cs @@ -66,8 +66,8 @@ namespace Oqtane.Infrastructure case "5.1.0": Upgrade_5_1_0(tenant, scope); break; - case "5.2.0": - Upgrade_5_2_0(tenant, scope); + case "5.2.1": + Upgrade_5_2_1(tenant, scope); break; } } @@ -201,7 +201,7 @@ namespace Oqtane.Infrastructure } }; - AddPagesToSites(scope, pageTemplates); + AddPagesToSites(scope, tenant, pageTemplates); } private void Upgrade_3_1_3(Tenant tenant, IServiceScope scope) @@ -386,7 +386,7 @@ namespace Oqtane.Infrastructure } } - private void Upgrade_5_2_0(Tenant tenant, IServiceScope scope) + private void Upgrade_5_2_1(Tenant tenant, IServiceScope scope) { var pageTemplates = new List { @@ -438,14 +438,16 @@ namespace Oqtane.Infrastructure } }; - AddPagesToSites(scope, pageTemplates); + AddPagesToSites(scope, tenant, pageTemplates); } - private void AddPagesToSites(IServiceScope scope, List pageTemplates) + private void AddPagesToSites(IServiceScope scope, Tenant tenant, List pageTemplates) { + var tenants = scope.ServiceProvider.GetRequiredService(); var sites = scope.ServiceProvider.GetRequiredService(); foreach (var site in sites.GetSites().ToList()) { + tenants.SetAlias(tenant.TenantId, site.SiteId); sites.CreatePages(site, pageTemplates, null); } } diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index 4fef964f..9ab5428b 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 = "5.2.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"; + public static readonly string Version = "5.2.1"; + 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"; public const string PackageId = "Oqtane.Framework"; public const string ClientId = "Oqtane.Client"; public const string UpdaterPackageId = "Oqtane.Updater";