huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Load the precompilation type from the loaded assembly

This commit is contained in:
Pranav K 2017-05-25 10:58:43 -07:00
parent 9ea37a1bbb
commit bb5eb96625
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewManfiest.cs
View File

@ -15,19 +15,15 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
public static Type GetManifestType(AssemblyPart assemblyPart, string typeName)
{
EnsureFeatureAssembly(assemblyPart);
var precompiledAssemblyName = new AssemblyName(assemblyPart.Assembly.FullName);
precompiledAssemblyName.Name = precompiledAssemblyName.Name + PrecompiledViewsAssemblySuffix;
return Type.GetType($"{typeName},{precompiledAssemblyName}");
var assembly = GetFeatureAssembly(assemblyPart);
return assembly?.GetType(typeName);
}
private static void EnsureFeatureAssembly(AssemblyPart assemblyPart)
private static Assembly GetFeatureAssembly(AssemblyPart assemblyPart)
{
if (assemblyPart.Assembly.IsDynamic || string.IsNullOrEmpty(assemblyPart.Assembly.Location))
{
return;
return null;
}
var precompiledAssemblyFileName = assemblyPart.Assembly.GetName().Name
@ -41,13 +37,15 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
{
try
{
Assembly.LoadFile(precompiledAssemblyFilePath);
return Assembly.LoadFile(precompiledAssemblyFilePath);
}
catch (FileLoadException)
{
// Don't throw if assembly cannot be loaded. This can happen if the file is not a managed assembly.
}
}
return null;
}
}
}