Merge remote-tracking branch 'upstream/master'

Mono.Cecil.Cil/Symbols.cs

@@ -1000,7 +1000,7 @@ public static string GetMdbFileName (string assemblyFileName)
 
 		public static bool IsPortablePdb (string fileName)
 		{
-			using (var file = new FileStream (fileName, FileMode.Open, FileAccess.Read, FileShare.Read))
+			using (var file = new FileStream (fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
 				return IsPortablePdb (file);
 		}
 

Mono.Cecil.PE/Image.cs

@@ -28,6 +28,7 @@ sealed class Image : IDisposable {
 		public string RuntimeVersion;
 		public TargetArchitecture Architecture;
 		public ModuleCharacteristics Characteristics;
+		public ushort LinkerVersion;
 
 		public ImageDebugHeader DebugHeader;
 

Mono.Cecil.PE/ImageReader.cs

@@ -81,15 +81,16 @@ void ReadImage ()
 			// Characteristics		2
 			ushort characteristics = ReadUInt16 ();
 
-			ushort subsystem, dll_characteristics;
-			ReadOptionalHeaders (out subsystem, out dll_characteristics);
+			ushort subsystem, dll_characteristics, linker_version;
+			ReadOptionalHeaders (out subsystem, out dll_characteristics, out linker_version);
 			ReadSections (sections);
 			ReadCLIHeader ();
 			ReadMetadata ();
 			ReadDebugHeader ();
 
 			image.Kind = GetModuleKind (characteristics, subsystem);
 			image.Characteristics = (ModuleCharacteristics) dll_characteristics;
+			image.LinkerVersion = linker_version;
 		}
 
 		TargetArchitecture ReadArchitecture ()
@@ -108,7 +109,7 @@ static ModuleKind GetModuleKind (ushort characteristics, ushort subsystem)
 			return ModuleKind.Console;
 		}
 
-		void ReadOptionalHeaders (out ushort subsystem, out ushort dll_characteristics)
+		void ReadOptionalHeaders (out ushort subsystem, out ushort dll_characteristics, out ushort linker)
 		{
 			// - PEOptionalHeader
 			//   - StandardFieldsHeader
@@ -118,8 +119,7 @@ void ReadOptionalHeaders (out ushort subsystem, out ushort dll_characteristics)
 
 			//						pe32 || pe64
 
-			// LMajor				1
-			// LMinor				1
+			linker = ReadUInt16 ();
 			// CodeSize				4
 			// InitializedDataSize	4
 			// UninitializedDataSize4
@@ -142,7 +142,7 @@ void ReadOptionalHeaders (out ushort subsystem, out ushort dll_characteristics)
 			// ImageSize			4
 			// HeaderSize			4
 			// FileChecksum			4
-			Advance (66);
+			Advance (64);
 
 			// SubSystem			2
 			subsystem = ReadUInt16 ();

Mono.Cecil.PE/ImageWriter.cs

@@ -218,9 +218,8 @@ Section LastSection ()
 
 		void WriteOptionalHeaders ()
 		{
-			WriteUInt16 ((ushort) (!pe64 ? 0x10b : 0x20b));	// Magic
-			WriteByte (8);	// LMajor
-			WriteByte (0);	// LMinor
+			WriteUInt16 ((ushort) (!pe64 ? 0x10b : 0x20b)); // Magic
+			WriteUInt16 (module.linker_version);
 			WriteUInt32 (text.SizeOfRawData);	// CodeSize
 			WriteUInt32 ((reloc != null ? reloc.SizeOfRawData : 0)
 				+ (rsrc != null ? rsrc.SizeOfRawData : 0));	// InitializedDataSize

Mono.Cecil/AssemblyWriter.cs

@@ -2414,10 +2414,12 @@ void AddAsyncMethodBodyDebugInformation (ICustomDebugInformationProvider provide
 			var signature = CreateSignatureWriter ();
 			signature.WriteUInt32 ((uint) async_method.catch_handler.Offset + 1);
 
-			for (int i = 0; i < async_method.yields.Count; i++) {
-				signature.WriteUInt32 ((uint) async_method.yields [i].Offset);
-				signature.WriteUInt32 ((uint) async_method.resumes [i].Offset);
-				signature.WriteCompressedUInt32 (async_method.resume_methods [i].MetadataToken.RID);
+			if (!async_method.yields.IsNullOrEmpty ()) {
+				for (int i = 0; i < async_method.yields.Count; i++) {
+					signature.WriteUInt32 ((uint) async_method.yields [i].Offset);
+					signature.WriteUInt32 ((uint) async_method.resumes [i].Offset);
+					signature.WriteCompressedUInt32 (async_method.resume_methods [i].MetadataToken.RID);
+				}
 			}
 
 			AddCustomDebugInformation (provider, async_method, signature);

Mono.Cecil/ModuleDefinition.cs

@@ -276,6 +276,7 @@ public sealed class ModuleDefinition : ModuleReference, ICustomAttributeProvider
 		TargetArchitecture architecture;
 		ModuleAttributes attributes;
 		ModuleCharacteristics characteristics;
+		internal ushort linker_version = 8;
 		Guid mvid;
 		internal uint timestamp;
 
@@ -350,7 +351,7 @@ public ModuleCharacteristics Characteristics {
 			set { characteristics = value; }
 		}
 
-		[Obsolete("Use FileName")]
+		[Obsolete ("Use FileName")]
 		public string FullyQualifiedName {
 			get { return file_name; }
 		}
@@ -607,6 +608,7 @@ internal ModuleDefinition (Image image)
 			this.architecture = image.Architecture;
 			this.attributes = image.Attributes;
 			this.characteristics = image.Characteristics;
+			this.linker_version = image.LinkerVersion;
 			this.file_name = image.FileName;
 			this.timestamp = image.Timestamp;
 

Mono.Cecil/ModuleKind.cs

@@ -38,6 +38,7 @@ public enum TargetArchitecture {
 	public enum ModuleAttributes {
 		ILOnly = 1,
 		Required32Bit = 2,
+		ILLibrary = 4,
 		StrongNameSigned = 8,
 		Preferred32Bit = 0x00020000,
 	}