Merge pull request #916 from hishamco/runtime

Runtime enum should be in Oqtane.Shared

Oqtane.Client/Modules/Admin/Login/Index.razor

@@ -87,7 +87,7 @@
 
     private async Task Login()
     {
-        if (PageState.Runtime == Runtime.Server)
+        if (PageState.Runtime == Oqtane.Shared.Runtime.Server)
         {
             // server-side Blazor
             var user = new User();

Oqtane.Client/Themes/Controls/LoginBase.cs

@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using Oqtane.Providers;
 using Oqtane.Services;
-using Oqtane.UI;
+using Oqtane.Shared;
 
 namespace Oqtane.Themes.Controls
 {

Oqtane.Client/UI/PageState.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Oqtane.Models;
 
@@ -19,6 +19,6 @@ namespace Oqtane.UI
         public string Action { get; set; }
         public bool EditMode { get; set; }
         public DateTime LastSyncDate { get; set; }
-        public Runtime Runtime { get; set; }
+        public Oqtane.Shared.Runtime Runtime { get; set; }
     }
-}
+}

Oqtane.Client/UI/Runtime.cs

@@ -1,5 +1,8 @@
-namespace Oqtane.UI
+using System;
+
+namespace Oqtane.UI
 {
+    [Obsolete("This enum is deprecated and will be removed in the upcoming major release, please use Oqtane.Shared.Runtime instead.")]
     public enum Runtime
     {
         Server,

Oqtane.Client/UI/SiteRouter.razor

@@ -549,8 +549,8 @@
         return pageresources;
     }
 
-    private Runtime GetRuntime()
+    private Oqtane.Shared.Runtime GetRuntime()
 => RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER"))
-        ? Runtime.WebAssembly
-        : Runtime.Server;
+        ? Oqtane.Shared.Runtime.WebAssembly
+        : Oqtane.Shared.Runtime.Server;
 }

Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -8,7 +8,6 @@ using Oqtane.Infrastructure;
 using Oqtane.Modules;
 using Oqtane.Services;
 using Oqtane.Shared;
-using Oqtane.UI;
 
 // ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection

Oqtane.Server/Startup.cs

@@ -21,7 +21,6 @@ using Oqtane.Repository;
 using Oqtane.Security;
 using Oqtane.Services;
 using Oqtane.Shared;
-using Oqtane.UI;
 
 namespace Oqtane
 {

Oqtane.Shared/Enums/Runtime.cs

@@ -0,0 +1,8 @@
+namespace Oqtane.Shared
+{
+    public enum Runtime
+    {
+        Server,
+        WebAssembly
+    }
+}