From 0616035d5d6a027be287c7d2954bd69804e9ea10 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Sat, 23 Oct 2010 13:39:54 -0700 Subject: [PATCH] Null assembly check when adding razor assembly references --HG-- branch : dev --- .../Mvc/ViewEngines/Razor/RazorCompilationEventsShim.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Orchard/Mvc/ViewEngines/Razor/RazorCompilationEventsShim.cs b/src/Orchard/Mvc/ViewEngines/Razor/RazorCompilationEventsShim.cs index b868f809d..470f82222 100644 --- a/src/Orchard/Mvc/ViewEngines/Razor/RazorCompilationEventsShim.cs +++ b/src/Orchard/Mvc/ViewEngines/Razor/RazorCompilationEventsShim.cs @@ -39,7 +39,10 @@ namespace Orchard.Mvc.ViewEngines.Razor { provider.AssemblyBuilder.AddAssemblyReference(Assembly.Load(entry.descriptor.Name)); } else if (entry.directive.StartsWith("<%@ Assembly Src=\"")) { - provider.AssemblyBuilder.AddAssemblyReference(BuildManager.GetCompiledAssembly(entry.descriptor.VirtualPath)); + // Returned assembly may be null if the .csproj file doesn't containt any .cs file, for example + Assembly assembly = BuildManager.GetCompiledAssembly(entry.descriptor.VirtualPath); + if (assembly != null) + provider.AssemblyBuilder.AddAssemblyReference(assembly); } } foreach (var virtualDependency in entry.dependencies) {