Merge pull request #3709 from sbwalker/dev

fix .NET MAUI integration
oqtane · Jan 31, 2024 · 0210ef2 · 0210ef2
2 parents a88be30 + c66982c
commit 0210ef2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/Oqtane.Client/Routes.razor b/Oqtane.Client/Routes.razor
@@ -16,7 +16,7 @@
             <div style="@_display">
                 <CascadingAuthenticationState>
                     <CascadingValue Value="@PageState">
-                        <SiteRouter Runtime="Web" RenderMode="@RenderMode" VisitorId="@VisitorId" OnStateChange="@ChangeState" />
+                        <SiteRouter Runtime="@Runtime" RenderMode="@RenderMode" VisitorId="@VisitorId" OnStateChange="@ChangeState" />
                     </CascadingValue>
                 </CascadingAuthenticationState>
             </div>
@@ -34,6 +34,9 @@
     [Parameter]
     public string AntiForgeryToken { get; set; }
 
+    [Parameter]
+    public string Runtime { get; set; }
+
     [Parameter]
     public string RenderMode { get; set; }
 

diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
@@ -285,7 +285,7 @@
                         Action = action,
                         EditMode = editmode,
                         LastSyncDate = lastsyncdate,
-                        Runtime = Shared.Runtime.Hybrid,
+                        Runtime = (Shared.Runtime)Enum.Parse(typeof(Shared.Runtime), Runtime),
                         RenderMode = RenderMode,
 						VisitorId = VisitorId,
 						RemoteIPAddress = SiteState.RemoteIPAddress,

diff --git a/Oqtane.Maui/Main.razor b/Oqtane.Maui/Main.razor
@@ -11,7 +11,7 @@ else
 }
 
 @code {
-    Type ComponentType = Type.GetType("Oqtane.App, Oqtane.Client");
+    Type ComponentType = Type.GetType("Oqtane.Routes, Oqtane.Client");
     private IDictionary<string, object> Parameters { get; set; }
     private string message = "";
 

diff --git a/Oqtane.Server/Components/App.razor b/Oqtane.Server/Components/App.razor
@@ -62,11 +62,11 @@
     {
         @if (_renderMode == RenderModes.StaticServer)
         {
-            <Routes AntiForgeryToken="@_antiForgeryToken" RenderMode="@_renderMode" VisitorId="@_visitorId" RemoteIPAddress="@_remoteIPAddress" AuthorizationToken="@_authorizationToken" />
+            <Routes AntiForgeryToken="@_antiForgeryToken" Runtime="Web" RenderMode="@_renderMode" VisitorId="@_visitorId" RemoteIPAddress="@_remoteIPAddress" AuthorizationToken="@_authorizationToken" />
         }
         else
         {
-            <Routes AntiForgeryToken="@_antiForgeryToken" RenderMode="@_renderMode" VisitorId="@_visitorId" RemoteIPAddress="@_remoteIPAddress" AuthorizationToken="@_authorizationToken" @rendermode="@RenderMode.GetInteractiveRenderMode((_renderMode), _prerender)" />
+            <Routes AntiForgeryToken="@_antiForgeryToken" Runtime="Web" RenderMode="@_renderMode" VisitorId="@_visitorId" RemoteIPAddress="@_remoteIPAddress" AuthorizationToken="@_authorizationToken" @rendermode="@RenderMode.GetInteractiveRenderMode((_renderMode), _prerender)" />
         }
 
         <script src="js/interop.js"></script>