From dbc6dde738589c646c9f2c48d1e0ee744af300e8 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Fri, 30 Mar 2018 18:55:35 +0200
Subject: [PATCH] Fix build of ILSpy.csproj

---
 ILSpy/LoadedAssembly.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ILSpy/LoadedAssembly.cs b/ILSpy/LoadedAssembly.cs
index 41b51ac3d..1beff37bc 100644
--- a/ILSpy/LoadedAssembly.cs
+++ b/ILSpy/LoadedAssembly.cs
@@ -111,13 +111,13 @@ namespace ICSharpCode.ILSpy
 		PEFile LoadAssembly(object state)
 		{
 			var stream = state as Stream;
-			PEReader module;
+			PEFile module;
 
 			// runs on background thread
 			if (stream != null)
 			{
 				// Read the module from a precrafted stream
-				module = new PEReader(stream);
+				module = new PEFile(fileName, stream, PEStreamOptions.Default) { AssemblyResolver = new MyAssemblyResolver(this) };
 			}
 			else
 			{
@@ -126,7 +126,7 @@ namespace ICSharpCode.ILSpy
 					var ms = new MemoryStream();
 					fs.CopyTo(ms);
 					ms.Position = 0;
-					module = new PEReader(ms, PEStreamOptions.PrefetchEntireImage);
+					module = new PEFile(fileName, ms, PEStreamOptions.Default) { AssemblyResolver = new MyAssemblyResolver(this) };
 				}
 			}
 
@@ -139,10 +139,10 @@ namespace ICSharpCode.ILSpy
 					// ignore any errors during symbol loading
 				}
 			}
-			return new PEFile(fileName, module, new MyAssemblyResolver(this));
+			return module;
 		}
 		
-		private void LoadSymbols(PEReader reader)
+		private void LoadSymbols(PEFile module)
 		{
 			/*string pdbDirectory = Path.GetDirectoryName(fileName);
 			if (!reader.TryOpenAssociatedPortablePdb(pdbDirectory, OpenStream, out var provider, out var pdbFileName) {
@@ -224,7 +224,7 @@ namespace ICSharpCode.ILSpy
 		class MyUniversalResolver : UniversalAssemblyResolver
 		{
 			public MyUniversalResolver(LoadedAssembly assembly)
-				: base(assembly.FileName, false)
+				: base(assembly.FileName, false, true, assembly.GetTargetFrameworkIdAsync().Result, PEStreamOptions.Default)
 			{
 			}
 		}
@@ -251,7 +251,7 @@ namespace ICSharpCode.ILSpy
 				if (isWinRT) {
 					file = Path.Combine(Environment.SystemDirectory, "WinMetadata", fullName.Name + ".winmd");
 				} else {
-					var resolver = new MyUniversalResolver(this) { TargetFramework = GetTargetFrameworkIdAsync().Result };
+					var resolver = new MyUniversalResolver(this);
 					file = resolver.FindAssemblyFile(fullName);
 				}