diff options
author | Alexis Christoforides <alexis@thenull.net> | 2015-12-18 03:27:26 +0300 |
---|---|---|
committer | Alexis Christoforides <alexis@thenull.net> | 2015-12-18 05:38:19 +0300 |
commit | 84d7f7e8886e5dbe638360dcd76c61895bbb8e8b (patch) | |
tree | 3dd00474ef0b33642b85a922d35852e9646c1d43 /mcs | |
parent | d6c522d5edc5a47737b1985873ada34ff273b6a9 (diff) |
[mkbundle] Allow override of embedded assemblies.
If they exist, name-matched assemblies in the current directory will be embedded instead of the properly resolved ones.
Diffstat (limited to 'mcs')
-rwxr-xr-x | mcs/tools/mkbundle/mkbundle.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mcs/tools/mkbundle/mkbundle.cs b/mcs/tools/mkbundle/mkbundle.cs index 7f0e4a6c466..f3112249366 100755 --- a/mcs/tools/mkbundle/mkbundle.cs +++ b/mcs/tools/mkbundle/mkbundle.cs @@ -299,7 +299,7 @@ void mono_register_config_for_assembly (const char* assembly_name, cons // Do the file reading and compression in parallel Action<string> body = delegate (string url) { - string fname = new Uri (url).LocalPath; + string fname = LocateFile (new Uri (url).LocalPath); Stream stream = File.OpenRead (fname); long real_size = stream.Length; @@ -334,7 +334,7 @@ void mono_register_config_for_assembly (const char* assembly_name, cons // The non-parallel part byte [] buffer = new byte [8192]; foreach (var url in files) { - string fname = new Uri (url).LocalPath; + string fname = LocateFile (new Uri (url).LocalPath); string aname = Path.GetFileName (fname); string encoded = aname.Replace ("-", "_").Replace (".", "_"); |