From 71045c1441d87afb07866b3d8233b3f4f567cebe Mon Sep 17 00:00:00 2001 From: de4dot Date: Mon, 30 Jan 2012 22:13:20 +0100 Subject: [PATCH] Use Assembly.Load(byte[]) if it fails due to SN validation --- AssemblyData/AssemblyResolver.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/AssemblyData/AssemblyResolver.cs b/AssemblyData/AssemblyResolver.cs index decfe22a..49583efd 100644 --- a/AssemblyData/AssemblyResolver.cs +++ b/AssemblyData/AssemblyResolver.cs @@ -88,7 +88,17 @@ namespace AssemblyData { public Assembly load(string filename) { addConfigFile(filename + ".config"); - return addAssembly(Assembly.LoadFrom(filename)); + return addAssembly(loadFile(filename)); + } + + Assembly loadFile(string filename) { + try { + return Assembly.LoadFrom(filename); + } + catch (FileLoadException) { + // Here if eg. strong name signature validation failed and possibly other errors + return Assembly.Load(File.ReadAllBytes(filename)); + } } Assembly addAssembly(Assembly assembly) {