#687 Guard against duplicate assemlbies

Caliburn-Micro · Jun 4, 2020 · 0c4306a · 0c4306a
1 parent 113f412
commit 0c4306a
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 10 deletions.
diff --git a/src/Caliburn.Micro.Platform/AssemblySource.cs b/src/Caliburn.Micro.Platform/AssemblySource.cs
@@ -17,6 +17,27 @@ public static class AssemblySource
         /// </summary>
         public static readonly IObservableCollection<Assembly> Instance = new BindableCollection<Assembly>();
 
+
+        /// <summary>
+        /// Adds a collection of assemblies to AssemblySource
+        /// </summary>
+        /// <param name="assemblies">The assemblies to add</param>
+        public static void AddRange(IEnumerable<Assembly> assemblies)
+        {
+            foreach(var assembly in assemblies)
+            {
+                try
+                {
+                    if (!Instance.Contains(assembly))
+                        Instance.Add(assembly);
+                }
+                catch (ArgumentException)
+                {
+                    // ignore
+                }
+            }
+        }
+
         /// <summary>
         /// Finds a type which matches one of the elements in the sequence of names.
         /// </summary>

diff --git a/src/Caliburn.Micro.Platform/Platforms/Android/CaliburnApplication.cs b/src/Caliburn.Micro.Platform/Platforms/Android/CaliburnApplication.cs
@@ -30,7 +30,7 @@ public CaliburnApplication(IntPtr javaReference, JniHandleOwnership transfer)
         protected virtual void StartDesignTime()
         {
             AssemblySource.Instance.Clear();
-            AssemblySource.Instance.AddRange(SelectAssemblies());
+            AssemblySource.AddRange(SelectAssemblies());
 
             Configure();
 
@@ -45,7 +45,7 @@ protected virtual void StartDesignTime()
         protected virtual void StartRuntime()
         {
             AssemblySourceCache.Install();
-            AssemblySource.Instance.AddRange(SelectAssemblies());
+            AssemblySource.AddRange(SelectAssemblies());
 
             Configure();
 

diff --git a/src/Caliburn.Micro.Platform/Platforms/iOS/CaliburnApplicationDelegate.cs b/src/Caliburn.Micro.Platform/Platforms/iOS/CaliburnApplicationDelegate.cs
@@ -43,7 +43,7 @@ public CaliburnApplicationDelegate(NSObjectFlag t)
         protected virtual void StartDesignTime()
         {
             AssemblySource.Instance.Clear();
-            AssemblySource.Instance.AddRange(SelectAssemblies());
+            AssemblySource.AddRange(SelectAssemblies());
 
             Configure();
 
@@ -58,7 +58,7 @@ protected virtual void StartDesignTime()
         protected virtual void StartRuntime()
         {
             AssemblySourceCache.Install();
-            AssemblySource.Instance.AddRange(SelectAssemblies());
+            AssemblySource.AddRange(SelectAssemblies());
 
             Configure();
             IoC.GetInstance = GetInstance;

diff --git a/src/Caliburn.Micro.Platform/Platforms/net46-netcore/Bootstrapper.cs b/src/Caliburn.Micro.Platform/Platforms/net46-netcore/Bootstrapper.cs
@@ -83,7 +83,7 @@ public void Initialize()
         protected virtual void StartDesignTime()
         {
             AssemblySource.Instance.Clear();
-            AssemblySource.Instance.AddRange(SelectAssemblies());
+            AssemblySource.AddRange(SelectAssemblies());
 
             Configure();
             IoC.GetInstance = GetInstance;
@@ -97,7 +97,7 @@ protected virtual void StartDesignTime()
         protected virtual void StartRuntime()
         {
             AssemblySourceCache.Install();
-            AssemblySource.Instance.AddRange(SelectAssemblies());
+            AssemblySource.AddRange(SelectAssemblies());
 
             if (useApplication)
             {

diff --git a/src/Caliburn.Micro.Platform/Platforms/net46/Bootstrapper.cs b/src/Caliburn.Micro.Platform/Platforms/net46/Bootstrapper.cs
@@ -83,7 +83,7 @@ public void Initialize()
         protected virtual void StartDesignTime()
         {
             AssemblySource.Instance.Clear();
-            AssemblySource.Instance.AddRange(SelectAssemblies());
+            AssemblySource.AddRange(SelectAssemblies());
 
             Configure();
             IoC.GetInstance = GetInstance;
@@ -97,7 +97,7 @@ protected virtual void StartDesignTime()
         protected virtual void StartRuntime()
         {
             AssemblySourceCache.Install();
-            AssemblySource.Instance.AddRange(SelectAssemblies());
+            AssemblySource.AddRange(SelectAssemblies());
 
             if (useApplication)
             {

diff --git a/src/Caliburn.Micro.Platform/Platforms/uap/CaliburnApplication.cs b/src/Caliburn.Micro.Platform/Platforms/uap/CaliburnApplication.cs
@@ -28,7 +28,7 @@ public abstract class CaliburnApplication : Application
         protected virtual void StartDesignTime()
         {
             AssemblySource.Instance.Clear();
-            AssemblySource.Instance.AddRange(SelectAssemblies());
+            AssemblySource.AddRange(SelectAssemblies());
 
             Configure();
             IoC.GetInstance = GetInstance;
@@ -42,7 +42,7 @@ protected virtual void StartDesignTime()
         protected virtual void StartRuntime()
         {
             AssemblySourceCache.Install();
-            AssemblySource.Instance.AddRange(SelectAssemblies());
+            AssemblySource.AddRange(SelectAssemblies());
 
             PrepareApplication();
             Configure();