Fix writing symbols when using deterministic mvids. The ppdb file emb…

…eds the guid of the corresponding assembly. Fixes jbevain#583.
vargaz · May 30, 2019 · 4b34dad · 4b34dad
1 parent a6c8f5e
commit 4b34dad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/Mono.Cecil.Cil/PortablePdb.cs b/Mono.Cecil.Cil/PortablePdb.cs
@@ -276,6 +276,11 @@ internal PortablePdbWriter (MetadataBuilder pdb_metadata, ModuleDefinition modul
 			this.writer = writer;
 		}
 
+		public void PatchMvid (Guid guid)
+		{
+			writer.PatchMvid (guid);
+		}
+
 		public ISymbolReaderProvider GetReaderProvider ()
 		{
 			return new PortablePdbReaderProvider ();

diff --git a/Mono.Cecil/AssemblyWriter.cs b/Mono.Cecil/AssemblyWriter.cs
@@ -126,6 +126,8 @@ static void Write (ModuleDefinition module, Disposable<Stream> stream, WriterPar
 					if (parameters.DeterministicMvid) {
 						module.Mvid = ComputeGuid (stream.value);
 						writer.PatchMvid (module.Mvid);
+						if (symbol_writer is PortablePdbWriter ppdb_writer)
+							ppdb_writer.PatchMvid (module.Mvid);
 					}
 				}
 			} finally {