Merge pull request #4019 from sbwalker/dev

fix #4017 - SiteState being lost in server rendered scenarios

Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -99,9 +99,6 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddScoped<IVisitorService, VisitorService>();
             services.AddScoped<ISyncService, SyncService>();
 
-            // alternative used within infrastructure classes
-            services.AddScoped<Oqtane.Infrastructure.SiteState>();
-
             return services;
         }
 

Oqtane.Server/Infrastructure/SiteState.cs

@@ -1,9 +0,0 @@
-using Oqtane.Models;
-
-namespace Oqtane.Infrastructure
-{
-    public class SiteState
-    {
-        public Alias Alias { get; set; }
-    }
-}

Oqtane.Server/Infrastructure/TenantManager.cs

@@ -1,9 +1,9 @@
 using System;
-using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Http;
 using Oqtane.Models;
 using Oqtane.Repository;
+using Oqtane.Shared;
 
 namespace Oqtane.Infrastructure
 {

Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs

@@ -2,10 +2,10 @@ using System.Linq;
 using Oqtane.Documentation;
 using System.Collections.Generic;
 using Microsoft.Extensions.Caching.Memory;
-using Oqtane.Infrastructure;
 using System;
 using Microsoft.EntityFrameworkCore;
 using System.Threading.Tasks;
+using Oqtane.Shared;
 
 namespace Oqtane.Modules.HtmlText.Repository
 {

Oqtane.Server/Repository/PermissionRepository.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
 using Microsoft.Extensions.Caching.Memory;
-using Oqtane.Infrastructure;
+using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {