Exception handling for loading assemblies when GetAssemblies fails.

programystic · Mar 25, 2019 · 197b4a4 · 197b4a4
1 parent d9953e8
commit 197b4a4
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/src/DeployCmsData.Core/Data/UpgradeScriptRepository.cs b/src/DeployCmsData.Core/Data/UpgradeScriptRepository.cs
@@ -1,7 +1,6 @@
-using System;
+using DeployCmsData.Core.Interfaces;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using DeployCmsData.Core.Interfaces;
 
 namespace DeployCmsData.Core.Data
 {
@@ -10,7 +9,28 @@ public sealed class UpgradeScriptRepository : IUpgradeScriptRepository
         IEnumerable<Type> IUpgradeScriptRepository.GetTypes =>
             GetTypes;
 
-        public static IEnumerable<Type> GetTypes =>
-            AppDomain.CurrentDomain.GetAssemblies().SelectMany(s => s.GetTypes());
+        private IEnumerable<Type> GetTypes
+        {
+            get
+            {
+                var result = new List<Type>();
+                var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+
+                foreach (var assembly in assemblies)
+                {
+                    try
+                    {
+                        var assemblyTypes = assembly.GetTypes();
+                        result.AddRange(assemblyTypes);
+                    }
+                    catch
+                    {
+                        // there was an error calling assembly.GetTypes() - there's nothing we can do 
+                    }
+                }
+
+                return result;
+            }
+        }
     }
 }
diff --git a/src/DeployCmsData.Core/Properties/AssemblyInfo.cs b/src/DeployCmsData.Core/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("DeployCmsData.Core")]
-[assembly: AssemblyDescription("Run code on startup")]
+[assembly: AssemblyDescription("Upgrade script management for DeployCmsData")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Programystic")]
 [assembly: AssemblyProduct("DeployCmsData.Core")]
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.3.0")]
 //[assembly: AssemblyInformationalVersion("1.0.1.0-beta")]