Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b

mcs/tools/cil-stringreplacer/Makefile

@@ -7,4 +7,8 @@ NO_INSTALL = yes
 
 LIB_REFS = System Mono.Cecil
 
+ifdef MCS_MODE
+LIB_REFS += Mono.Cecil.Mdb
+endif
+
 include ../../build/executable.make

mcs/tools/cil-stringreplacer/cil-stringreplacer.cs

@@ -100,14 +100,19 @@ public class Program
 
 	static void RewriteAssembly (string assemblyLocation, Dictionary<string, string> resourcesStrings, CmdOptions options)
 	{
-		var readerParameters = new ReaderParameters { ReadSymbols = true, ReadWrite = true };
+		var readerParameters = new ReaderParameters {
+			ReadSymbols = true,
+			ReadWrite = true,
+			SymbolReaderProvider = new DefaultSymbolReaderProvider (false)
+		};
+
 		using (var assembly = AssemblyDefinition.ReadAssembly (assemblyLocation, readerParameters)) {
 			foreach (var module in assembly.Modules) {
 				foreach (var type in module.GetTypes ()) {
 					foreach (var method in type.Methods) {
 						if (!method.HasBody)
 							continue;
-						
+
 						foreach (var instr in method.Body.Instructions) {
 							if (instr.OpCode != OpCodes.Ldstr)
 								continue;
@@ -125,7 +130,10 @@ public class Program
 				}
 			}
 
-			var writerParameters = new WriterParameters { WriteSymbols = true };
+			var writerParameters = new WriterParameters () {
+				WriteSymbols = assembly.MainModule.HasSymbols
+			};
+
 			assembly.Write (writerParameters);
 		}
 	}