From 4ef03611ddbcbffb7f40d5855a9a053f285ff386 Mon Sep 17 00:00:00 2001 From: Chris Poole Date: Thu, 20 Dec 2018 14:25:53 +0000 Subject: [PATCH] Add folder null check in GetMscorlibBasePath to stop exception on NETCF 3.5 assemblies --- .../Metadata/UniversalAssemblyResolver.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ICSharpCode.Decompiler/Metadata/UniversalAssemblyResolver.cs b/ICSharpCode.Decompiler/Metadata/UniversalAssemblyResolver.cs index c8dd7c60e..0040d7808 100644 --- a/ICSharpCode.Decompiler/Metadata/UniversalAssemblyResolver.cs +++ b/ICSharpCode.Decompiler/Metadata/UniversalAssemblyResolver.cs @@ -397,10 +397,12 @@ namespace ICSharpCode.Decompiler.Metadata string folder = GetSubFolderForVersion(); - foreach (var path in frameworkPaths) { - var basePath = Path.Combine(path, folder); - if (Directory.Exists(basePath)) - return basePath; + if (folder != null) { + foreach (var path in frameworkPaths) { + var basePath = Path.Combine(path, folder); + if (Directory.Exists(basePath)) + return basePath; + } } if (throwOnError) @@ -415,7 +417,6 @@ namespace ICSharpCode.Decompiler.Metadata return "v1.0.3705"; return "v1.1.4322"; case 2: - case 3: return "v2.0.50727"; case 4: return "v4.0.30319";