Added RegisterAssembly overload.

dsuryd · Dec 8, 2017 · 02652a5 · 02652a5
1 parent 5892c9c
commit 02652a5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/DotNetifyLib.Core/DotNetifyConfiguration.cs b/DotNetifyLib.Core/DotNetifyConfiguration.cs
@@ -39,12 +39,12 @@ public class DotNetifyConfiguration : IDotNetifyConfiguration
       /// <summary>
       /// Register view model classes in an assembly that are subtypes of BaseVM.
       /// </summary>
-      public void RegisterAssembly(Assembly assembly) => VMController.RegisterAssembly<BaseVM>(assembly);
+      public void RegisterAssembly(Assembly assembly) => VMController.RegisterAssembly(assembly);
 
       /// <summary>
       /// Register view model classes in an assembly that are subtypes of BaseVM.
       /// </summary>
-      public void RegisterAssembly(string assemblyName) => VMController.RegisterAssembly<BaseVM>(Assembly.Load(new AssemblyName(assemblyName)));
+      public void RegisterAssembly(string assemblyName) => VMController.RegisterAssembly(Assembly.Load(new AssemblyName(assemblyName)));
 
       /// <summary>
       /// Register view model classes in an assembly that are subtypes of a certain type.
@@ -79,7 +79,12 @@ public IDotNetifyConfiguration Register(string typeName, Func<object[], INotifyP
       /// <summary>
       /// Registers view model classes in the entry assembly.
       /// </summary>
-      public void RegisterEntryAssembly() => VMController.RegisterAssembly<BaseVM>(Assembly.GetEntryAssembly());
+      public void RegisterEntryAssembly()
+      {
+         var entryAssembly = Assembly.GetEntryAssembly();
+         if (entryAssembly != null)
+            VMController.RegisterAssembly(entryAssembly);
+      }
 
       /// <summary>
       /// Whether anything has been registered.

diff --git a/DotNetifyLib.Core/VMController.Registration.cs b/DotNetifyLib.Core/VMController.Registration.cs
@@ -51,6 +51,12 @@ public partial class VMController
 
       #endregion
 
+      /// <summary>
+      /// Registers all view model types in an assembly.
+      /// </summary>
+      /// <param name="vmAssembly">Assembly.</param>
+      public static void RegisterAssembly(Assembly vmAssembly) => RegisterAssembly<BaseVM>(vmAssembly);
+
       /// <summary>
       /// Registers all view model types in an assembly.
       /// </summary>