added globally unique identifier for Site ( used string data type to ensure compatibility with multiple database engines )

Oqtane.Server/Infrastructure/UpgradeManager.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using Oqtane.Extensions;
 using Oqtane.Models;
 using Oqtane.Repository;
 using Oqtane.Shared;
@@ -25,12 +24,31 @@ namespace Oqtane.Infrastructure
 
         public void Upgrade(Tenant tenant, string version)
         {
-            // core framework upgrade logic - note that you can check if current tenant is Master if you only want to execute the logic once
+            // core framework upgrade logic - executed for every tenant
+            using (var scope = _serviceScopeFactory.CreateScope())
+            {
+                // set SiteState based on tenant
+                var siteState = scope.ServiceProvider.GetRequiredService<SiteState>();
+                siteState.Alias = new Alias { TenantId = tenant.TenantId };
+
                 switch (version)
                 {
-                case "0.9.0":
+                    case "1.0.0":
-                    // this code is commented out on purpose - it provides an example of how to programmatically add a page to all existing sites on upgrade
+                        Upgrade_1_0_0(tenant, scope);
+                        break;
+                    case "2.0.2":
+                        Upgrade_2_0_2(tenant, scope);
+                        break;
+                }
+            }
+        }
+
+        private void Upgrade_1_0_0(Tenant tenant, IServiceScope scope)
+        {
             var pageTemplates = new List<PageTemplate>();
+
+            // **Note: this code is commented out on purpose - it provides an example of how to programmatically add a page to all existing sites on upgrade
+
             //pageTemplates.Add(new PageTemplate
             //{
             //    Name = "Test",
@@ -61,9 +79,12 @@ namespace Oqtane.Infrastructure
             //        }
             //    }
             //});
-                    CreateSitePages(tenant, pageTemplates);
+
-                    break;
+            CreateSitePages(scope, pageTemplates);
-                case "2.0.2":
+        }
+
+        private void Upgrade_2_0_2(Tenant tenant, IServiceScope scope)
+        {
             if (tenant.Name == TenantNames.Master)
             {
                 // remove Internal module template files as they are no longer supported
@@ -73,33 +94,25 @@ namespace Oqtane.Infrastructure
                     Directory.Delete(internalTemplatePath, true);
                 }
             }
-                    break;
+
+            // initialize SiteGuid
+            var sites = scope.ServiceProvider.GetRequiredService<ISiteRepository>();
+            foreach (Site site in sites.GetSites().ToList())
+            {
+                site.SiteGuid = System.Guid.NewGuid().ToString();
+                sites.UpdateSite(site);
             }
         }
 
-        private void CreateSitePages(Tenant tenant, List<PageTemplate> pageTemplates)
+        private void CreateSitePages(IServiceScope scope, List<PageTemplate> pageTemplates)
         {
             if (pageTemplates.Count != 0)
             {
-                var processed = new List<Site>();
-                foreach (Alias alias in _aliases.GetAliases().Where(item => item.TenantId == tenant.TenantId))
-                {
-                    if (!processed.Exists(item => item.SiteId == alias.SiteId))
-                    {
-                        using (var scope = _serviceScopeFactory.CreateScope())
-                        {
-                            var siteState = scope.ServiceProvider.GetRequiredService<SiteState>();
-                            siteState.Alias = alias;
                 var sites = scope.ServiceProvider.GetRequiredService<ISiteRepository>();
-                            var site = sites.GetSite(alias.SiteId);
+                foreach (Site site in sites.GetSites().ToList())
-                            if (site != null)
                 {
                     sites.CreatePages(site, pageTemplates);
                 }
-                            processed.Add(site);
-                        }
-                    }
-                }
             }
         }
     }

Oqtane.Server/Oqtane.Server.csproj

@@ -36,6 +36,7 @@
     <EmbeddedResource Include="Scripts\Tenant.02.00.01.01.sql" />
     <EmbeddedResource Include="Scripts\Tenant.02.00.01.02.sql" />
     <EmbeddedResource Include="Scripts\Tenant.02.00.01.03.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.02.00.02.01.sql" />
     <EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.1.0.0.sql" />
     <EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.Uninstall.sql" />
   </ItemGroup>

Oqtane.Server/Repository/SiteRepository.cs

@@ -605,7 +605,7 @@ namespace Oqtane.Repository
 
         public Site AddSite(Site site)
         {
-            
+            site.SiteGuid = System.Guid.NewGuid().ToString();
             _db.Site.Add(site);
             _db.SaveChanges();
             CreateSite(site);

Oqtane.Server/Scripts/Tenant.02.00.02.01.sql

@@ -0,0 +1,10 @@
+/*  
+
+Version 2.0.2 Tenant migration script
+
+*/
+
+ALTER TABLE [dbo].[Site] ADD
+	[SiteGuid] [char](36) NULL
+GO
+

Oqtane.Shared/Models/Site.cs

@@ -18,6 +18,7 @@ namespace Oqtane.Models
         public int? PwaAppIconFileId { get; set; }
         public int? PwaSplashIconFileId { get; set; }
         public bool AllowRegistration { get; set; }
+        public string SiteGuid { get; set; }
 
         public string CreatedBy { get; set; }
         public DateTime CreatedOn { get; set; }