Merge remote-tracking branch 'oqtane/dev' into dev

Oqtane.Client/Program.cs

@@ -198,6 +198,8 @@ namespace Oqtane.Client
         private static void RegisterModuleServices(Assembly assembly, IServiceCollection services)
         {
             // dynamically register module scoped services
+            try
+            {
                 var implementationTypes = assembly.GetInterfaces<IService>();
                 foreach (var implementationType in implementationTypes)
                 {
@@ -208,8 +210,15 @@ namespace Oqtane.Client
                     }
                 }
             }
+            catch
+            {
+                // could not interrogate assembly - likely missing dependencies
+            }
+        }
 
         private static void RegisterClientStartups(Assembly assembly, IServiceCollection services)
+        {
+            try
             {
                 var startUps = assembly.GetInstances<IClientStartup>();
                 foreach (var startup in startUps)
@@ -217,6 +226,11 @@ namespace Oqtane.Client
                     startup.ConfigureServices(services);
                 }
             }
+            catch
+            {
+                // could not interrogate assembly - likely missing dependencies
+            }
+        }
 
         private static async Task SetCultureFromLocalizationCookie(IServiceProvider serviceProvider)
         {

Oqtane.Maui/MauiProgram.cs

@@ -212,6 +212,8 @@ public static class MauiProgram
     private static void RegisterModuleServices(Assembly assembly, IServiceCollection services)
     {
         // dynamically register module scoped services
+        try
+        {
             var implementationTypes = assembly.GetInterfaces<IService>();
             foreach (var implementationType in implementationTypes)
             {
@@ -222,8 +224,15 @@ public static class MauiProgram
                 }
             }
         }
+        catch
+        {
+            // could not interrogate assembly - likely missing dependencies
+        }
+    }
 
     private static void RegisterClientStartups(Assembly assembly, IServiceCollection services)
+    {
+        try
         {
             var startUps = assembly.GetInstances<IClientStartup>();
             foreach (var startup in startUps)
@@ -231,4 +240,9 @@ public static class MauiProgram
                 startup.ConfigureServices(services);
             }
         }
+        catch
+        {
+            // could not interrogate assembly - likely missing dependencies
+        }
+    }
 }

Oqtane.Maui/Oqtane.Maui.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
 		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
+    <!-- <TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks> -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
     <Version>3.4.1</Version>

Oqtane.Shared/Models/Folder.cs

@@ -97,6 +97,10 @@ namespace Oqtane.Models
             {
                 return JsonSerializer.Serialize(PermissionList);
             }
+            set
+            {
+                PermissionList = JsonSerializer.Deserialize<List<Permission>>(value);
+            }
         }
 
         #endregion

Oqtane.Shared/Models/Module.cs

@@ -121,6 +121,10 @@ namespace Oqtane.Models
             {
                 return JsonSerializer.Serialize(PermissionList);
             }
+            set
+            {
+                PermissionList = JsonSerializer.Deserialize<List<Permission>>(value);
+            }
         }
 
         #endregion

Oqtane.Shared/Models/ModuleDefinition.cs

@@ -136,6 +136,10 @@ namespace Oqtane.Models
             {
                 return JsonSerializer.Serialize(PermissionList);
             }
+            set
+            {
+                PermissionList = JsonSerializer.Deserialize<List<Permission>>(value);
+            }
         }
 
         #endregion

Oqtane.Shared/Models/Page.cs

@@ -132,6 +132,10 @@ namespace Oqtane.Models
             {
                 return JsonSerializer.Serialize(PermissionList);
             }
+            set
+            {
+                PermissionList = JsonSerializer.Deserialize<List<Permission>>(value);
+            }
         }
 
         #endregion

Oqtane.Shared/Models/SiteTemplate.cs

@@ -33,6 +33,10 @@ namespace Oqtane.Models
             {
                 return JsonSerializer.Serialize(PermissionList);
             }
+            set
+            {
+                PermissionList = JsonSerializer.Deserialize<List<Permission>>(value);
+            }
         }
     }
 
@@ -51,6 +55,10 @@ namespace Oqtane.Models
             {
                 return JsonSerializer.Serialize(PermissionList);
             }
+            set
+            {
+                PermissionList = JsonSerializer.Deserialize<List<Permission>>(value);
+            }
         }
     }
 }