Merge pull request #4403 from BrzVlad/fix-workers-par-context

[mono.git] / mcs / tools / cil-stringreplacer / cil-stringreplacer.cs

diff --git a/mcs/tools/cil-stringreplacer/cil-stringreplacer.cs b/mcs/tools/cil-stringreplacer/cil-stringreplacer.cs
index 20dc653526af2f7b7ee9e48a77a608b9d09d7f27..3226b3911d9b291093cc8d100a871014dc7f016a 100644 (file)
--- a/mcs/tools/cil-stringreplacer/cil-stringreplacer.cs
+++ b/mcs/tools/cil-stringreplacer/cil-stringreplacer.cs
@@ -100,22 +100,12 @@ public class Program
 
        static void RewriteAssembly (string assemblyLocation, Dictionary<string, string> resourcesStrings, CmdOptions options)
        {
-               Stream pdbSymbols = null;
-
-               var debugSymbols = Path.ChangeExtension (assemblyLocation, "pdb");
-               if (File.Exists (debugSymbols))
-                       pdbSymbols = File.Open (debugSymbols, FileMode.Open, FileAccess.ReadWrite);
-
                var readerParameters = new ReaderParameters {
+                       ReadSymbols = true,
                        ReadWrite = true,
+                       SymbolReaderProvider = new DefaultSymbolReaderProvider (false)
                };
 
-               if (pdbSymbols != null) {
-                       readerParameters.ReadSymbols = true;
-                       readerParameters.SymbolReaderProvider = new PortablePdbReaderProvider ();
-                       readerParameters.SymbolStream = pdbSymbols;
-               }
-
                using (var assembly = AssemblyDefinition.ReadAssembly (assemblyLocation, readerParameters)) {
                        foreach (var module in assembly.Modules) {
                                foreach (var type in module.GetTypes ()) {
@@ -140,19 +130,12 @@ public class Program
                                }
                        }
 
-                       var writerParameters = new WriterParameters ();
-
-                       if (pdbSymbols != null) {
-                               writerParameters.WriteSymbols = true;
-                               writerParameters.SymbolStream = pdbSymbols;
-                               writerParameters.SymbolWriterProvider = new PortablePdbWriterProvider ();
-                               pdbSymbols.Seek (0, SeekOrigin.Begin);
-                       }
+                       var writerParameters = new WriterParameters () {
+                               WriteSymbols = assembly.MainModule.HasSymbols
+                       };
 
                        assembly.Write (writerParameters);
                }
-
-               pdbSymbols?.Dispose ();
        }
 
        static bool LoadGetResourceStrings (Dictionary<string, string> resourcesStrings, CmdOptions options)