Merge pull request #1001 from thecodejunkie/sdhpimprovements

Various SDHP improvements

Author: grumpydev

Diff for: src/Nancy.Demo.Hosting.Aspnet/Web.config

@@ -17,7 +17,6 @@
   <razor disableAutoIncludeModelNamespace="false">
     <assemblies>
       <add assembly="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-      <add assembly="Nancy.Hosting.Aspnet" />
     </assemblies>
     <namespaces>
       <add namespace="System.Xml" />

Diff for: src/Nancy.ViewEngines.Razor/RazorViewEngine.cs

@@ -155,15 +155,13 @@ private Func<INancyRazorView> GenerateRazorViewFactory(IRazorViewRenderer viewRe
                 GetAssemblyPath(modelType)
             };
 
+            assemblies.AddRange(AppDomainAssemblyTypeScanner.Assemblies.Select(GetAssemblyPath));
+
             if (referencingAssembly != null)
             {
                 assemblies.Add(GetAssemblyPath(referencingAssembly));
             }
-
-            assemblies = assemblies
-                .Union(viewRenderer.Assemblies)
-                .ToList();
-
+            
             if (this.razorConfiguration != null)
             {
                 var assemblyNames = this.razorConfiguration.GetAssemblyNames();
@@ -178,7 +176,12 @@ private Func<INancyRazorView> GenerateRazorViewFactory(IRazorViewRenderer viewRe
                 }
             }
 
-            var compilerParameters = new CompilerParameters(assemblies.ToArray(), outputAssemblyName);
+            assemblies = assemblies
+                .Union(viewRenderer.Assemblies)
+                .ToList();
+
+            var compilerParameters = 
+                new CompilerParameters(assemblies.ToArray(), outputAssemblyName);
 
             CompilerResults results;
             lock (this.compileLock)

Diff for: src/Nancy/Bootstrapper/AppDomainAssemblyTypeScanner.cs

@@ -15,7 +15,7 @@ public static class AppDomainAssemblyTypeScanner
     {
         static AppDomainAssemblyTypeScanner()
         {
-            LoadNancyAssemblies();
+            LoadAssembliesWithNancyReferences();
         }
 
         /// <summary>
@@ -34,9 +34,9 @@ static AppDomainAssemblyTypeScanner()
         private static IEnumerable<Assembly> assemblies;
 
         /// <summary>
-        /// Indicates whether the nancy assemblies have already been loaded
+        /// Indicates whether the all Assemblies, that references a Nancy assembly, have already been loaded
         /// </summary>
-        private static bool nancyAssembliesLoaded;
+        private static bool nancyReferencingAssembliesLoaded;
 
         private static IEnumerable<Func<Assembly, bool>> assembliesToScan;
 
@@ -206,18 +206,47 @@ where AssembliesToScan.Any(asm => asm(assembly))
         }
 
         /// <summary>
-        /// Loads any Nancy*.dll assemblies in the app domain base directory
+        /// Loads any assembly that references a Nancy assembly.
         /// </summary>
-        public static void LoadNancyAssemblies()
+        public static void LoadAssembliesWithNancyReferences()
         {
-            if (nancyAssembliesLoaded)
+            if (nancyReferencingAssembliesLoaded)
             {
                 return;
             }
 
-            LoadAssemblies(@"Nancy*.dll");
+            UpdateAssemblies();
+
+            foreach (var directory in GetAssemblyDirectories())
+            {
+                var existingAssemblyPaths =
+                    assemblies.Select(a => a.Location).ToArray();
+
+                var unloadedAssemblies = Directory
+                    .GetFiles(directory, "*.dll")
+                    .Where(f => !existingAssemblyPaths.Contains(f, StringComparer.InvariantCultureIgnoreCase)).ToArray();
+
+                foreach (var unloadedAssembly in unloadedAssemblies)
+                {
+                    var inspectedAssembly =
+                        Assembly.ReflectionOnlyLoadFrom(unloadedAssembly);
+
+                    if (inspectedAssembly.GetReferencedAssemblies().Any(r => r.Name.StartsWith("Nancy", StringComparison.OrdinalIgnoreCase)))
+                    {
+                        try
+                        {
+                            Assembly.Load(inspectedAssembly.GetName());
+                        }
+                        catch
+                        {
+                        }
+                    }
+                }
+            }
+
+            UpdateTypes();
 
-            nancyAssembliesLoaded = true;
+            nancyReferencingAssembliesLoaded = true;
         }
 
         /// <summary>

Diff for: src/Nancy/Bootstrapper/NancyBootstrapperBase.cs

@@ -209,8 +209,6 @@ protected virtual DiagnosticsConfiguration DiagnosticsConfiguration
         /// </summary>
         public void Initialise()
         {
-            AppDomainAssemblyTypeScanner.LoadNancyAssemblies();
-
             if (this.InternalConfiguration == null)
             {
                 throw new InvalidOperationException("Configuration cannot be null");