Merge pull request #92 from oqtane/dev

sync

Oqtane.Server/Migrations/01000000_InitializeTenant.cs

@@ -22,15 +22,22 @@ namespace Oqtane.Migrations
             var siteEntityBuilder = new SiteEntityBuilder(migrationBuilder, ActiveDatabase);
             siteEntityBuilder.Create();
 
+            //Add Column to Site table (for Sql Server only) we will drop it later for Sql Server only
+            if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB")
+            {
+                siteEntityBuilder.AddStringColumn("DefaultLayoutType", 200, true);
+            }
+
             //Create Page table
             var pageEntityBuilder = new PageEntityBuilder(migrationBuilder, ActiveDatabase);
             pageEntityBuilder.Create();
             pageEntityBuilder.AddIndex("IX_Page", new [] {"SiteId", "Path", "UserId"}, true);
 
-            //Add Column to Page table (for Sql Server only) we will drop it later for Sql Server only
+            //Add Columns to Page table (for Sql Server only) we will drop them later for Sql Server only
             if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB")
             {
                 pageEntityBuilder.AddBooleanColumn("EditMode");
+                pageEntityBuilder.AddStringColumn("LayoutType", 200, true);
             }
 
             //Create Module table

Oqtane.Server/Migrations/02000202_UpdateDefaultContainerTypeInSitePage.cs

@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Oqtane.Interfaces;
+using Oqtane.Migrations.EntityBuilders;
+using Oqtane.Repository;
+
+namespace Oqtane.Migrations
+{
+    [DbContext(typeof(TenantDBContext))]
+    [Migration("Tenant.02.00.02.02")]
+    public class UpdateDefaultContainerTypeInSitePage : MultiDatabaseMigration
+    {
+        public UpdateDefaultContainerTypeInSitePage(IEnumerable<IOqtaneDatabase> databases) : base(databases)
+        {
+        }
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB")
+            {
+                //Update DefaultContainerType In Site
+                var siteEntityBuilder = new SiteEntityBuilder(migrationBuilder, ActiveDatabase);
+                siteEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'");
+                siteEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client'");
+
+                //Update DefaultContainerType in Page
+                var pageEntityBuilder = new PageEntityBuilder(migrationBuilder, ActiveDatabase);
+                pageEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'");
+                pageEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client'");
+
+                //Update ContainerType in PageModule
+                var pageModuleEntityBuilder = new PageModuleEntityBuilder(migrationBuilder, ActiveDatabase);
+                pageModuleEntityBuilder.UpdateColumn("ContainerType", "'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'", "ContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'");
+                pageModuleEntityBuilder.UpdateColumn("ContainerType", "'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'", "ContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client'");
+            }
+
+        }
+    }
+}

Oqtane.Server/Migrations/02000203_DropDefaultLayoutInSite.cs

@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Oqtane.Interfaces;
+using Oqtane.Migrations.EntityBuilders;
+using Oqtane.Repository;
+
+namespace Oqtane.Migrations
+{
+    [DbContext(typeof(TenantDBContext))]
+    [Migration("Tenant.02.00.02.03")]
+    public class DropDefaultLayoutInSite : MultiDatabaseMigration
+    {
+        public DropDefaultLayoutInSite(IEnumerable<IOqtaneDatabase> databases) : base(databases)
+        {
+        }
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB")
+            {
+                //Alter Column in Setting table for Sql Server
+                var settingEntityBuilder = new SettingEntityBuilder(migrationBuilder, ActiveDatabase);
+                settingEntityBuilder.DropIndex("IX_Setting");
+                settingEntityBuilder.AlterStringColumn("SettingName", 200);
+                settingEntityBuilder.AddIndex("IX_Setting", new [] {"EntityName", "EntityId", "SettingName"}, true);
+
+                //Drop Column from Site Table
+                var siteEntityBuilder = new SiteEntityBuilder(migrationBuilder, ActiveDatabase);
+                siteEntityBuilder.DropColumn("DefaultLayoutType");
+
+                //Update DefaultContainerType In Site
+                siteEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'");
+                siteEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'");
+
+                //Drop Column from Page Table
+                var pageEntityBuilder = new PageEntityBuilder(migrationBuilder, ActiveDatabase);
+                pageEntityBuilder.DropColumn("LayoutType");
+
+                //Update DefaultContainerType in Page
+                pageEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'");
+                pageEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'");
+
+
+                //Update ContainerType in PageModule
+                var pageModuleEntityBuilder = new PageModuleEntityBuilder(migrationBuilder, ActiveDatabase);
+                pageModuleEntityBuilder.UpdateColumn("ContainerType", "'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'", "ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'");
+                pageModuleEntityBuilder.UpdateColumn("ContainerType", "'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'", "ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'");
+
+            }
+        }
+    }
+}

Oqtane.Server/Migrations/02010000_AddAppVersionsTableInTenant.cs

@@ -10,7 +10,6 @@ namespace Oqtane.Migrations
 {
     [DbContext(typeof(TenantDBContext))]
     [Migration("Tenant.02.01.00.00")]
-
     public class AddAppVersionsTable : MultiDatabaseMigration
     {
         public AddAppVersionsTable(IEnumerable<IOqtaneDatabase> databases) : base(databases)

Oqtane.Server/Migrations/EntityBuilders/PageEntityBuilder.cs

@@ -41,7 +41,6 @@ namespace Oqtane.Migrations.EntityBuilders
             Order = AddIntegerColumn(table,"Order");
             IsNavigation = AddBooleanColumn(table,"IsNavigation");
             Url = AddStringColumn(table,"Url", 500, true);
-            LayoutType = AddStringColumn(table,"LayoutType", 200);
             UserId = AddIntegerColumn(table,"UserId", true);
             IsPersonalizable = AddBooleanColumn(table,"IsPersonalizable");
             DefaultContainerType = AddStringColumn(table,"DefaultContainerType", 200, true);
@@ -73,8 +72,6 @@ namespace Oqtane.Migrations.EntityBuilders
 
         public OperationBuilder<AddColumnOperation> Url { get; private set; }
 
-        public OperationBuilder<AddColumnOperation> LayoutType { get; private set; }
-
         public OperationBuilder<AddColumnOperation> UserId { get; private set; }
 
         public OperationBuilder<AddColumnOperation> IsPersonalizable { get; private set; }

Oqtane.Server/Migrations/EntityBuilders/SettingEntityBuilder.cs

@@ -24,7 +24,7 @@ namespace Oqtane.Migrations.EntityBuilders
             SettingId = AddAutoIncrementColumn(table,"SettingId");
             EntityName = AddStringColumn(table,"EntityName", 50);
             EntityId = AddIntegerColumn(table,"EntityId");
-            SettingName = AddStringColumn(table,"SettingName", 50);
+            SettingName = AddStringColumn(table,"SettingName", 200);
             SettingValue = AddMaxStringColumn(table,"SettingValue");
 
             AddAuditableColumns(table);

Oqtane.Server/Migrations/EntityBuilders/SiteEntityBuilder.cs

@@ -27,7 +27,6 @@ namespace Oqtane.Migrations.EntityBuilders
             LogoFileId = AddIntegerColumn(table,"LogoFileId", true);
             FaviconFileId = AddIntegerColumn(table,"FaviconFileId", true);
             DefaultThemeType = AddStringColumn(table,"DefaultThemeType", 200);
-            DefaultLayoutType = AddStringColumn(table,"DefaultLayoutType", 200);
             DefaultContainerType = AddStringColumn(table,"DefaultContainerType", 200);
             PwaIsEnabled = AddBooleanColumn(table,"PwaIsEnabled");
             PwaAppIconFileId = AddIntegerColumn(table,"PwaAppIconFileId", true);
@@ -52,8 +51,6 @@ namespace Oqtane.Migrations.EntityBuilders
 
         public OperationBuilder<AddColumnOperation> DefaultThemeType { get; private set; }
 
-        public OperationBuilder<AddColumnOperation> DefaultLayoutType { get; private set; }
-
         public OperationBuilder<AddColumnOperation> DefaultContainerType { get; private set; }
 
         public OperationBuilder<AddColumnOperation> PwaIsEnabled { get; private set; }

Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.1.0.0.sql

@@ -1,19 +0,0 @@
-CREATE TABLE [dbo].[HtmlText](
-	[HtmlTextId] [int] IDENTITY(1,1) NOT NULL,
-	[ModuleId] [int] NOT NULL,
-	[Content] [nvarchar](max) NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_HtmlText] PRIMARY KEY CLUSTERED 
-  (
-	[HtmlTextId] ASC
-  )
-)
-GO
-
-ALTER TABLE [dbo].[HtmlText] WITH CHECK ADD CONSTRAINT [FK_HtmlText_Module] FOREIGN KEY([ModuleId])
-REFERENCES [dbo].[Module] ([ModuleId])
-ON DELETE CASCADE
-GO

Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.Uninstall.sql

@@ -1,2 +0,0 @@
-DROP TABLE [dbo].[HtmlText]
-GO

Oqtane.Server/Oqtane.Server.csproj

@@ -25,25 +25,6 @@
     <EmbeddedResource Remove="wwwroot\Themes\Templates\**" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Scripts\Master.00.00.00.00.sql" />
-    <EmbeddedResource Include="Scripts\Master.00.09.00.00.sql" />
-    <EmbeddedResource Include="Scripts\Master.01.00.01.00.sql" />
-    <EmbeddedResource Include="Scripts\Tenant.00.00.00.00.sql" />
-    <EmbeddedResource Include="Scripts\Tenant.00.09.00.00.sql" />
-    <EmbeddedResource Include="Scripts\Tenant.00.09.01.00.sql" />
-    <EmbeddedResource Include="Scripts\Tenant.00.09.02.00.sql" />
-    <EmbeddedResource Include="Scripts\Tenant.01.00.01.00.sql" />
-    <EmbeddedResource Include="Scripts\Tenant.01.00.01.01.sql" />
-    <EmbeddedResource Include="Scripts\Tenant.01.00.02.01.sql" />
-    <EmbeddedResource Include="Scripts\Tenant.02.00.00.01.sql" />
-    <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="Scripts\Tenant.02.00.02.02.sql" />
-    <EmbeddedResource Include="Scripts\Tenant.02.00.02.03.sql" />
-    <EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.1.0.0.sql" />
-    <EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.Uninstall.sql" />
     <EmbeddedResource Include="Scripts\MigrateMaster.sql" />
     <EmbeddedResource Include="Scripts\MigrateTenant.sql" />
   </ItemGroup>

Oqtane.Server/Scripts/Master.00.00.00.00.sql

@@ -1,10 +0,0 @@
-/*  
-
-migrate to new naming convention for scripts
-
-*/
-
-UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Master.00.09.00.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Master.0.9.0.sql'
-GO
-UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Master.01.00.01.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Master.1.0.1.sql'
-GO

Oqtane.Server/Scripts/Master.00.09.00.00.sql

@@ -1,110 +0,0 @@
-/*  
-
-Create tables
-
-*/
-CREATE TABLE [dbo].[Tenant](
-	[TenantId] [int] IDENTITY(1,1) NOT NULL,
-	[Name] [nvarchar](100) NOT NULL,
-	[DBConnectionString] [nvarchar](1024) NOT NULL,
-	[Version] [nvarchar](50) NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_Tenant] PRIMARY KEY CLUSTERED 
-  (
-	[TenantId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[Alias](
-	[AliasId] [int] IDENTITY(1,1) NOT NULL,
-	[Name] [nvarchar](200) NOT NULL,
-	[TenantId] [int] NOT NULL,
-	[SiteId] [int] NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_Alias] PRIMARY KEY CLUSTERED 
-  (
-	[AliasId] ASC
-  )
-)
-GO
-
-
-CREATE TABLE [dbo].[ModuleDefinition](
-	[ModuleDefinitionId] [int] IDENTITY(1,1) NOT NULL,
-	[ModuleDefinitionName] [nvarchar](200) NOT NULL,
-	[Name] [nvarchar](200) NULL,
-	[Description] [nvarchar](2000) NULL,
-	[Categories] [nvarchar](200) NULL,
-	[Version] [nvarchar](50) NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_ModuleDefinition] PRIMARY KEY CLUSTERED 
-  (
-	[ModuleDefinitionId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[Job] (
-	[JobId] [int] IDENTITY(1,1) NOT NULL,
-	[Name] [nvarchar](200) NOT NULL,
-	[JobType] [nvarchar](200) NOT NULL,
-	[Frequency] [char](1) NOT NULL,
-	[Interval] [int] NOT NULL,
-	[StartDate] [datetime] NULL,
-	[EndDate] [datetime] NULL,
-	[IsEnabled] [bit] NOT NULL,
-	[IsStarted] [bit] NOT NULL,
-	[IsExecuting] [bit] NOT NULL,
-	[NextExecution] [datetime] NULL,
-	[RetentionHistory] [int] NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-    CONSTRAINT [PK_Job] PRIMARY KEY CLUSTERED 
-    (
-	  [JobId] ASC
-    )
-)
-GO
-
-CREATE TABLE [dbo].[JobLog] (
-	[JobLogId] [int] IDENTITY(1,1) NOT NULL,
-	[JobId] [int] NOT NULL,
-	[StartDate] [datetime] NOT NULL,
-	[FinishDate] [datetime] NULL,
-	[Succeeded] [bit] NULL,
-	[Notes] [nvarchar](max) NULL,
-    CONSTRAINT [PK_JobLog] PRIMARY KEY CLUSTERED 
-    (
-	  [JobLogId] ASC
-    ) 
-)
-GO
-
-/*  
-
-Create foreign key relationships
-
-*/
-ALTER TABLE [dbo].[Alias]  WITH CHECK ADD  CONSTRAINT [FK_Alias_Tenant] FOREIGN KEY([TenantId])
-REFERENCES [dbo].[Tenant] ([TenantId])
-ON DELETE CASCADE
-GO
-
-ALTER TABLE [dbo].[JobLog]  WITH NOCHECK ADD CONSTRAINT [FK_JobLog_Job] FOREIGN KEY([JobId])
-REFERENCES [dbo].[Job] ([JobId])
-ON DELETE CASCADE
-GO
-
-

Oqtane.Server/Scripts/Master.01.00.01.00.sql

@@ -1,29 +0,0 @@
-/*  
-
-Version 1.0.1 Master migration script
-
-*/
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_Tenant ON [dbo].[Tenant]
-	(
-	[Name]
-	) ON [PRIMARY]
-GO
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_Alias ON [dbo].[Alias]
-	(
-	[Name]
-	) ON [PRIMARY]
-GO
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_ModuleDefinition ON [dbo].[ModuleDefinition]
-	(
-	[ModuleDefinitionName]
-	) ON [PRIMARY]
-GO
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_Job ON [dbo].[Job]
-	(
-	[JobType]
-	) ON [PRIMARY]
-GO

Oqtane.Server/Scripts/Tenant.00.00.00.00.sql

@@ -1,14 +0,0 @@
-/*  
-
-migrate to new naming convention for scripts
-
-*/
-
-UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Tenant.00.09.00.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Tenant.0.9.0.sql'
-GO
-UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Tenant.00.09.01.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Tenant.0.9.1.sql'
-GO
-UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Tenant.00.09.02.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Tenant.0.9.2.sql'
-GO
-UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Tenant.01.00.01.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Tenant.1.0.1.sql'
-GO

Oqtane.Server/Scripts/Tenant.00.09.00.00.sql

@@ -1,528 +0,0 @@
-/*  
-
-Create tables
-
-*/
-
-CREATE TABLE [dbo].[Site](
-	[SiteId] [int] IDENTITY(1,1) NOT NULL,
-	[TenantId] [int] NOT NULL,
-	[Name] [nvarchar](200) NOT NULL,
-	[LogoFileId] [int] NULL,
-	[FaviconFileId] [int] NULL,
-	[DefaultThemeType] [nvarchar](200) NOT NULL,
-	[DefaultLayoutType] [nvarchar](200) NOT NULL,
-	[DefaultContainerType] [nvarchar](200) NOT NULL,
-	[PwaIsEnabled] [bit] NOT NULL,
-	[PwaAppIconFileId] [int] NULL,
-	[PwaSplashIconFileId] [int] NULL,
-	[AllowRegistration] [bit] NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-	[DeletedBy] [nvarchar](256) NULL,
-	[DeletedOn] [datetime] NULL,
-	[IsDeleted][bit] NOT NULL,
-  CONSTRAINT [PK_Site] PRIMARY KEY CLUSTERED 
-  (
-	[SiteId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[Page](
-	[PageId] [int] IDENTITY(1,1) NOT NULL,
-	[SiteId] [int] NOT NULL,
-	[Path] [nvarchar](50) NOT NULL,
-	[Name] [nvarchar](50) NOT NULL,
-	[Title] [nvarchar](200) NULL,
-	[ThemeType] [nvarchar](200) NULL,
-	[Icon] [nvarchar](50) NOT NULL,
-	[ParentId] [int] NULL,
-	[Order] [int] NOT NULL,
-	[IsNavigation] [bit] NOT NULL,
-	[Url] [nvarchar](500) NULL,
-	[LayoutType] [nvarchar](200) NOT NULL,
-	[EditMode] [bit] NOT NULL,
-	[UserId] [int] NULL,
-	[IsPersonalizable] [bit] NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-	[DeletedBy] [nvarchar](256) NULL,
-	[DeletedOn] [datetime] NULL,
-	[IsDeleted][bit] NOT NULL,
-  CONSTRAINT [PK_Page] PRIMARY KEY CLUSTERED 
-  (
-	[PageId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[Module](
-	[ModuleId] [int] IDENTITY(1,1) NOT NULL,
-	[SiteId] [int] NOT NULL,
-	[ModuleDefinitionName] [nvarchar](200) NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_Module] PRIMARY KEY CLUSTERED 
-  (
-	[ModuleId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[PageModule](
-	[PageModuleId] [int] IDENTITY(1,1) NOT NULL,
-	[PageId] [int] NOT NULL,
-	[ModuleId] [int] NOT NULL,
-	[Title] [nvarchar](200) NOT NULL,
-	[Pane] [nvarchar](50) NOT NULL,
-	[Order] [int] NOT NULL,
-	[ContainerType] [nvarchar](200) NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-	[DeletedBy] [nvarchar](256) NULL,
-	[DeletedOn] [datetime] NULL,
-	[IsDeleted][bit] NOT NULL,
-  CONSTRAINT [PK_PageModule] PRIMARY KEY CLUSTERED 
-  (
-	[PageModuleId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[User](
-	[UserId] [int] IDENTITY(1,1) NOT NULL,
-	[Username] [nvarchar](256) NOT NULL,
-	[DisplayName] [nvarchar](50) NOT NULL,
-	[Email] [nvarchar](256) NOT NULL,
-	[PhotoFileId] [int] NULL,
-	[LastLoginOn] [datetime] NULL,
-	[LastIPAddress] [nvarchar](50) NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-	[DeletedBy] [nvarchar](256) NULL,
-	[DeletedOn] [datetime] NULL,
-	[IsDeleted][bit] NOT NULL,
-  CONSTRAINT [PK_User] PRIMARY KEY CLUSTERED 
-  (
-	[UserId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[Role](
-	[RoleId] [int] IDENTITY(1,1) NOT NULL,
-	[SiteId] [int] NULL,
-	[Name] [nvarchar](256) NOT NULL,
-	[Description] [nvarchar](50) NOT NULL,
-	[IsAutoAssigned] [bit] NOT NULL,
-	[IsSystem] [bit] NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_Role] PRIMARY KEY CLUSTERED 
-  (
-	[RoleId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[UserRole](
-	[UserRoleId] [int] IDENTITY(1,1) NOT NULL,
-	[UserId] [int] NOT NULL,
-	[RoleId] [int] NOT NULL,
-	[EffectiveDate] [datetime] NULL,
-	[ExpiryDate] [datetime] NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_UserRole] PRIMARY KEY CLUSTERED 
-  (
-	[UserRoleId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[Permission](
-	[PermissionId] [int] IDENTITY(1,1) NOT NULL,
-	[SiteId] [int] NOT NULL,
-	[EntityName] [nvarchar](50) NOT NULL,
-	[EntityId] [int] NOT NULL,
-	[PermissionName] [nvarchar](50) NOT NULL,
-	[RoleId] [int] NULL,
-	[UserId] [int] NULL,
-	[IsAuthorized] [bit] NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_Permission] PRIMARY KEY CLUSTERED 
-  (
-	[PermissionId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[Setting](
-	[SettingId] [int] IDENTITY(1,1) NOT NULL,
-	[EntityName] [nvarchar](50) NOT NULL,
-	[EntityId] [int] NOT NULL,
-	[SettingName] [nvarchar](50) NOT NULL,
-	[SettingValue] [nvarchar](max) NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_Setting] PRIMARY KEY CLUSTERED 
-  (
-	[SettingId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[Profile](
-	[ProfileId] [int] IDENTITY(1,1) NOT NULL,
-	[SiteId] [int] NULL,
-	[Name] [nvarchar](50) NOT NULL,
-	[Title] [nvarchar](50) NOT NULL,
-	[Description] [nvarchar](256) NULL,
-	[Category] [nvarchar](50) NOT NULL,
-	[ViewOrder] [int] NOT NULL,
-	[MaxLength] [int] NOT NULL,
-	[DefaultValue] [nvarchar](2000) NULL,
-	[IsRequired] [bit] NOT NULL,
-	[IsPrivate] [bit] NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_Profile] PRIMARY KEY CLUSTERED 
-  (
-	[ProfileId] ASC
-  )
-)
-
-GO
-
-CREATE TABLE [dbo].[Log] (
-
-   [LogId] [int] IDENTITY(1,1) NOT NULL,
-   [SiteId] [int] NULL,
-   [LogDate] [datetime] NOT NULL,
-   [PageId] [int] NULL,
-   [ModuleId] [int] NULL,
-   [UserId] [int] NULL,
-   [Url] [nvarchar](2048) NOT NULL,
-   [Server] [nvarchar](200) NOT NULL,
-   [Category] [nvarchar](200) NOT NULL,
-   [Feature] [nvarchar](200) NOT NULL,
-   [Function] [nvarchar](20) NOT NULL,
-   [Level] [nvarchar](20) NOT NULL,
-   [Message] [nvarchar](max) NOT NULL,
-   [MessageTemplate] [nvarchar](max) NOT NULL,
-   [Exception] [nvarchar](max) NULL,
-   [Properties] [nvarchar](max) NULL
-
-   CONSTRAINT [PK_Log] PRIMARY KEY CLUSTERED 
-   (
-     [LogId] ASC
-   ) 
-)
-GO
-
-CREATE TABLE [dbo].[Notification](
-	[NotificationId] [int] IDENTITY(1,1) NOT NULL,
-    [SiteId] [int] NOT NULL,
-	[FromUserId] [int] NULL,
-	[ToUserId] [int] NULL,
-	[ToEmail] [nvarchar](256) NOT NULL,
-	[Subject] [nvarchar](256) NOT NULL,
-	[Body] [nvarchar](max) NOT NULL,
-	[ParentId] [int] NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[IsDelivered] [bit] NOT NULL,
-	[DeliveredOn] [datetime] NULL,
-	[DeletedBy] [nvarchar](256) NULL,
-	[DeletedOn] [datetime] NULL,
-	[IsDeleted][bit] NOT NULL,
-  CONSTRAINT [PK_Notification] PRIMARY KEY CLUSTERED 
-  (
-	[NotificationId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[Folder](
-	[FolderId] [int] IDENTITY(1,1) NOT NULL,
-	[SiteId] [int] NOT NULL,
-	[Path] [nvarchar](50) NOT NULL,
-	[Name] [nvarchar](50) NOT NULL,
-	[ParentId] [int] NULL,
-	[Order] [int] NOT NULL,
-	[IsSystem] [bit] NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-	[DeletedBy] [nvarchar](256) NULL,
-	[DeletedOn] [datetime] NULL,
-	[IsDeleted][bit] NOT NULL,
-  CONSTRAINT [PK_Folder] PRIMARY KEY CLUSTERED 
-  (
-	[FolderId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[File](
-	[FileId] [int] IDENTITY(1,1) NOT NULL,
-	[FolderId] [int] NOT NULL,
-	[Name] [nvarchar](250) NOT NULL,
-	[Extension] [nvarchar](50) NOT NULL,
-	[Size] [int] NOT NULL,
-	[ImageHeight] [int] NOT NULL,
-	[ImageWidth] [int] NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-	[DeletedBy] [nvarchar](256) NULL,
-	[DeletedOn] [datetime] NULL,
-	[IsDeleted][bit] NOT NULL,
-  CONSTRAINT [PK_File] PRIMARY KEY CLUSTERED 
-  (
-	[FileId] ASC
-  )
-)
-GO
-
-CREATE TABLE [dbo].[HtmlText](
-	[HtmlTextId] [int] IDENTITY(1,1) NOT NULL,
-	[ModuleId] [int] NOT NULL,
-	[Content] [nvarchar](max) NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_HtmlText] PRIMARY KEY CLUSTERED 
-  (
-	[HtmlTextId] ASC
-  )
-)
-GO
-
-/*  
-
-Create foreign key relationships
-
-*/
-ALTER TABLE [dbo].[Module] WITH CHECK ADD CONSTRAINT [FK_Module_Site] FOREIGN KEY([SiteId])
-REFERENCES [dbo].[Site] ([SiteId])
-ON DELETE CASCADE
-GO
-
-ALTER TABLE [dbo].[Page] WITH CHECK ADD CONSTRAINT [FK_Page_Site] FOREIGN KEY([SiteId])
-REFERENCES [dbo].[Site] ([SiteId])
-ON DELETE CASCADE
-GO
-
-ALTER TABLE [dbo].[PageModule] WITH CHECK ADD CONSTRAINT [FK_PageModule_Module] FOREIGN KEY([ModuleId])
-REFERENCES [dbo].[Module] ([ModuleId])
-GO
-
-ALTER TABLE [dbo].[PageModule] WITH CHECK ADD CONSTRAINT [FK_PageModule_Page] FOREIGN KEY([PageId])
-REFERENCES [dbo].[Page] ([PageId])
-ON DELETE CASCADE
-GO
-
-ALTER TABLE [dbo].[Role]  WITH CHECK ADD CONSTRAINT [FK_Role_Site] FOREIGN KEY ([SiteId]) 
-REFERENCES [dbo].[Site] ([SiteId]) 
-ON DELETE CASCADE 
-GO
-
-ALTER TABLE [dbo].[UserRole] WITH CHECK ADD CONSTRAINT [FK_UserRole_User] FOREIGN KEY ([UserId]) 
-REFERENCES [dbo].[User] ([UserId]) 
-ON DELETE CASCADE 
-GO
-
-ALTER TABLE [dbo].[UserRole] WITH CHECK ADD CONSTRAINT [FK_UserRole_Role] FOREIGN KEY ([RoleId]) 
-REFERENCES [dbo].[Role] ([RoleId]) 
-GO
-
-ALTER TABLE [dbo].[Permission] WITH CHECK ADD CONSTRAINT [FK_Permission_Site] FOREIGN KEY ([SiteId]) 
-REFERENCES [dbo].[Site] ([SiteId]) 
-ON DELETE CASCADE 
-GO
-
-ALTER TABLE [dbo].[Permission] WITH CHECK ADD CONSTRAINT [FK_Permission_User] FOREIGN KEY ([UserId]) 
-REFERENCES [dbo].[User] ([UserId]) 	
-GO
-
-ALTER TABLE [dbo].[Permission] WITH CHECK ADD CONSTRAINT [FK_Permission_Role] FOREIGN KEY ([RoleId]) 
-REFERENCES [dbo].[Role] ([RoleId]) 
-GO
-
-ALTER TABLE [dbo].[Profile] WITH NOCHECK ADD CONSTRAINT [FK_Profile_Sites] FOREIGN KEY([SiteId])
-REFERENCES [dbo].[Site] ([SiteId])
-ON DELETE CASCADE
-GO
-
-ALTER TABLE [dbo].[Log] WITH CHECK ADD CONSTRAINT [FK_Log_Site] FOREIGN KEY([SiteId])
-REFERENCES [dbo].[Site] ([SiteId])
-ON DELETE CASCADE
-GO
-
-ALTER TABLE [dbo].[Notification] WITH CHECK ADD CONSTRAINT [FK_Notification_Site] FOREIGN KEY([SiteId])
-REFERENCES [dbo].[Site] ([SiteId])
-ON DELETE CASCADE
-GO
-
-ALTER TABLE [dbo].[Folder] WITH CHECK ADD CONSTRAINT [FK_Folder_Site] FOREIGN KEY([SiteId])
-REFERENCES [dbo].[Site] ([SiteId])
-ON DELETE CASCADE
-GO
-
-ALTER TABLE [dbo].[File] WITH CHECK ADD CONSTRAINT [FK_File_Folder] FOREIGN KEY([FolderId])
-REFERENCES [dbo].[Folder] ([FolderId])
-ON DELETE CASCADE
-GO
-
-ALTER TABLE [dbo].[HtmlText] WITH CHECK ADD CONSTRAINT [FK_HtmlText_Module] FOREIGN KEY([ModuleId])
-REFERENCES [dbo].[Module] ([ModuleId])
-ON DELETE CASCADE
-GO
-
-
-/*  
-
-Create indexes
-
-*/
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_Setting ON [dbo].Setting
-	(
-	EntityName,
-	EntityId,
-	SettingName
-	) ON [PRIMARY]
-GO
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_User ON [dbo].[User]
-	(
-	Username
-	) ON [PRIMARY]
-GO
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_Permission ON [dbo].Permission
-	(
-	SiteId,
-	EntityName,
-	EntityId,
-	PermissionName,
-	RoleId,
-	UserId
-	) ON [PRIMARY]
-GO
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_Page ON [dbo].Page
-	(
-	SiteId,
-	[Path],
-	UserId
-	) ON [PRIMARY]
-GO
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_UserRole ON [dbo].UserRole
-	(
-	RoleId,
-	UserId
-	) ON [PRIMARY]
-GO
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_Folder ON [dbo].Folder
-	(
-	SiteId,
-	[Path]
-	) ON [PRIMARY]
-GO
-
-/*  
-
-ASP.NET Identity Minimal Schema
-
-*/
-
-CREATE TABLE [dbo].[AspNetUsers](
-	[Id] [nvarchar](450) NOT NULL,
-	[UserName] [nvarchar](256) NULL,
-	[NormalizedUserName] [nvarchar](256) NULL,
-	[Email] [nvarchar](256) NULL,
-	[NormalizedEmail] [nvarchar](256) NULL,
-	[EmailConfirmed] [bit] NOT NULL,
-	[PasswordHash] [nvarchar](max) NULL,
-	[SecurityStamp] [nvarchar](max) NULL,
-	[ConcurrencyStamp] [nvarchar](max) NULL,
-	[PhoneNumber] [nvarchar](max) NULL,
-	[PhoneNumberConfirmed] [bit] NOT NULL,
-	[TwoFactorEnabled] [bit] NOT NULL,
-	[LockoutEnd] [datetimeoffset](7) NULL,
-	[LockoutEnabled] [bit] NOT NULL,
-	[AccessFailedCount] [int] NOT NULL,
- CONSTRAINT [PK_AspNetUsers] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-) ON [PRIMARY]
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[AspNetUserClaims](
-	[Id] [int] IDENTITY(1,1) NOT NULL,
-	[UserId] [nvarchar](450) NOT NULL,
-	[ClaimType] [nvarchar](max) NULL,
-	[ClaimValue] [nvarchar](max) NULL,
- CONSTRAINT [PK_AspNetUserClaims] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-) ON [PRIMARY]
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [IX_AspNetUserClaims_UserId] ON [dbo].[AspNetUserClaims]
-(
-	[UserId] ASC
-) ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [EmailIndex] ON [dbo].[AspNetUsers]
-(
-	[NormalizedEmail] ASC
-) ON [PRIMARY]
-GO
-
-CREATE UNIQUE NONCLUSTERED INDEX [UserNameIndex] ON [dbo].[AspNetUsers]
-(
-	[NormalizedUserName] ASC
-)
-WHERE ([NormalizedUserName] IS NOT NULL)
-ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[AspNetUserClaims]  WITH CHECK ADD  CONSTRAINT [FK_AspNetUserClaims_AspNetUsers_UserId] FOREIGN KEY([UserId])
-REFERENCES [dbo].[AspNetUsers] ([Id])
-ON DELETE CASCADE
-GO
-
-ALTER TABLE [dbo].[AspNetUserClaims] CHECK CONSTRAINT [FK_AspNetUserClaims_AspNetUsers_UserId]
-GO

Oqtane.Server/Scripts/Tenant.00.09.01.00.sql

@@ -1,14 +0,0 @@
-/*  
-
-Version 0.9.1 migration script
-
-*/
-
-ALTER TABLE [dbo].[Module] ADD
-	[AllPages] [bit] NULL
-GO
-
-UPDATE [dbo].[Module]
-SET [AllPages] = 0
-GO
-

Oqtane.Server/Scripts/Tenant.00.09.02.00.sql

@@ -1,18 +0,0 @@
-/*  
-
-Version 0.9.2 migration script
-
-*/
-
-ALTER TABLE [dbo].[Role]
-ALTER COLUMN [Description] VARCHAR (256) NOT NULL
-GO
-
-ALTER TABLE [dbo].[Page] ADD
-	[DefaultContainerType] [nvarchar](200) NULL
-GO
-
-UPDATE [dbo].[Page]
-SET [DefaultContainerType] = ''
-GO
-

Oqtane.Server/Scripts/Tenant.01.00.01.00.sql

@@ -1,39 +0,0 @@
-/*  
-
-Version 1.0.1 Tenant migration script
-
-*/
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_Site ON [dbo].[Site]
-	(
-	[TenantId],
-	[Name]
-	) ON [PRIMARY]
-GO
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_Role ON [dbo].[Role]
-	(
-	[SiteId],
-	[Name]
-	) ON [PRIMARY]
-GO
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_Profile ON [dbo].[Profile]
-	(
-	[SiteId],
-	[Name]
-	) ON [PRIMARY]
-GO
-
-CREATE UNIQUE NONCLUSTERED INDEX IX_File ON [dbo].[File]
-	(
-	[FolderId],
-	[Name]
-	) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[Notification] ADD
-	[FromDisplayName] [nvarchar](50) NULL,
-	[FromEmail] [nvarchar](256) NULL,
-	[ToDisplayName] [nvarchar](50) NULL
-GO

Oqtane.Server/Scripts/Tenant.01.00.01.01.sql

@@ -1,12 +0,0 @@
-/*  
-
-Version 1.0.1 Notification migration script
-
-*/
-
-ALTER TABLE [dbo].[Notification] ADD
-	[SendOn] [datetime] NULL
-GO
-
-UPDATE [dbo].[Notification] SET SendOn = CreatedOn WHERE SendOn IS NULL
-GO

Oqtane.Server/Scripts/Tenant.01.00.02.01.sql

@@ -1,9 +0,0 @@
-/*  
-
-Version 1.0.2.1 migration script
-
-*/
-
-ALTER TABLE [dbo].[Page]
-	DROP COLUMN EditMode
-GO

Oqtane.Server/Scripts/Tenant.02.00.00.01.sql

@@ -1,16 +0,0 @@
-/*  
-
-Version 2.0.0 Tenant migration script
-
-*/
-
-ALTER TABLE  [dbo].[Page] 
-ALTER COLUMN [Path] [nvarchar](256) NOT NULL
-GO
-
-ALTER TABLE [dbo].[Profile] ADD
-	[Options] [nvarchar](2000) NULL
-GO
-
-UPDATE [dbo].[Profile] SET Options = ''
-GO

Oqtane.Server/Scripts/Tenant.02.00.01.01.sql

@@ -1,9 +0,0 @@
-/*  
-
-Version 2.0.1 Tenant migration script
-
-*/
-
-UPDATE [dbo].[Page] SET Icon = IIF(Icon <> '', 'oi oi-' + Icon, '');
-GO
-

Oqtane.Server/Scripts/Tenant.02.00.01.02.sql

@@ -1,27 +0,0 @@
-/*  
-
-Version 2.0.1 Tenant migration script
-
-*/
-
-CREATE TABLE [dbo].[Language](
-	[LanguageId] [int] IDENTITY(1,1) NOT NULL,
-	[Name] [nvarchar](100) NOT NULL,
-    [Code] [nvarchar](10) NOT NULL,
-    [IsDefault] [bit] NOT NULL,
-    [SiteId] [int] NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_Language] PRIMARY KEY CLUSTERED 
-  (
-	[LanguageId] ASC
-  )
-)
-GO
-
-ALTER TABLE [dbo].[Language]  WITH CHECK ADD  CONSTRAINT [FK_Language_Site] FOREIGN KEY([SiteId])
-REFERENCES [dbo].[Site] ([SiteId])
-ON DELETE CASCADE
-GO

Oqtane.Server/Scripts/Tenant.02.00.01.03.sql

@@ -1,17 +0,0 @@
-/*  
-
-Version 2.0.1 Tenant migration script
-
-*/
-
-DELETE FROM [dbo].[Page]
-WHERE Path = 'admin/tenants';
-GO
-
-ALTER TABLE [dbo].[Site] ADD
-	[AdminContainerType] [nvarchar](200) NULL
-GO
-
-UPDATE [dbo].[Site] SET AdminContainerType = ''
-GO
-

Oqtane.Server/Scripts/Tenant.02.00.02.01.sql

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

Oqtane.Server/Scripts/Tenant.02.00.02.02.sql

@@ -1,20 +0,0 @@
-/*  
-
-Version 2.0.2 Tenant migration script
-
-*/
-
-UPDATE [dbo].[Site] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client';
-GO
-UPDATE [dbo].[Site] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client';
-GO
-
-UPDATE [dbo].[Page] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client';
-GO
-UPDATE [dbo].[Page] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client';
-GO
-
-UPDATE [dbo].[PageModule] SET ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client' WHERE ContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client';
-GO
-UPDATE [dbo].[PageModule] SET ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client' WHERE ContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client';
-GO

Oqtane.Server/Scripts/Tenant.02.00.02.03.sql

@@ -1,31 +0,0 @@
-/*  
-
-Version 2.0.2 Tenant migration script
-
-*/
-
-ALTER TABLE [dbo].[Setting] ALTER COLUMN [SettingName] [nvarchar](200) NOT NULL
-GO
-
-ALTER TABLE [dbo].[Site]
-	DROP COLUMN DefaultLayoutType
-GO
-
-ALTER TABLE [dbo].[Page]
-	DROP COLUMN LayoutType
-GO
-
-UPDATE [dbo].[Site] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client';
-GO
-UPDATE [dbo].[Site] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client';
-GO
-
-UPDATE [dbo].[Page] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client';
-GO
-UPDATE [dbo].[Page] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client';
-GO
-
-UPDATE [dbo].[PageModule] SET ContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client' WHERE ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client';
-GO
-UPDATE [dbo].[PageModule] SET ContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client' WHERE ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client';
-GO

Oqtane.Shared/Shared/Constants.cs

@@ -5,8 +5,8 @@ namespace Oqtane.Shared {
 
     public class Constants {
         public const string PackageId = "Oqtane.Framework";
-        public const string Version = "2.0.2";
+        public const string Version = "2.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";
+        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";
 
         public const string PageComponent = "Oqtane.UI.ThemeBuilder, Oqtane.Client";
         public const string ContainerComponent = "Oqtane.UI.ContainerBuilder, Oqtane.Client";