Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/linker.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/linker
diff options
context:
space:
mode:
authorEugene Rozenfeld <erozen@microsoft.com>2017-03-15 02:03:36 +0300
committerMarek Safar <marek.safar@gmail.com>2017-03-15 20:27:35 +0300
commitc5f3f9fcd3e135749a2aa723259bc8bc4625c0a7 (patch)
tree0eb0056d3213ac4a9f319ef687e612108ce156e9 /linker
parent4171872104b356fa76b9698199c0dc83e58c34e9 (diff)
Fix DirectoryAssemblyResolver.
DirectoryAssemblyResolver shouldn't add the directory containing the core assembly for the linker itself to the list of search directories. That core assembly is not necessarily used by the app being linked so a wrong assembly may be found.
Diffstat (limited to 'linker')
-rw-r--r--linker/Mono.Linker/DirectoryAssemblyResolver.cs6
1 files changed, 0 insertions, 6 deletions
diff --git a/linker/Mono.Linker/DirectoryAssemblyResolver.cs b/linker/Mono.Linker/DirectoryAssemblyResolver.cs
index e190e7ba7..8ff0b50c2 100644
--- a/linker/Mono.Linker/DirectoryAssemblyResolver.cs
+++ b/linker/Mono.Linker/DirectoryAssemblyResolver.cs
@@ -56,12 +56,6 @@ namespace Mono.Linker {
if (assembly != null)
return assembly;
- var framework_dir = Path.GetDirectoryName (typeof (object).Module.FullyQualifiedName);
-
- assembly = SearchDirectory (name, new [] { framework_dir }, parameters);
- if (assembly != null)
- return assembly;
-
throw new AssemblyResolutionException (name);
}