summaryrefslogtreecommitdiff
path: root/src/vm/assemblyname.cpp
diff options
context:
space:
mode:
authorKoundinya Veluri <kouvel@microsoft.com>2015-11-10 10:35:30 -0800
committerKoundinya Veluri <kouvel@microsoft.com>2015-11-11 11:43:28 -0800
commit6a617fbd6296352fa1041bdf5efe02da1a41b9a7 (patch)
tree78a8b5a79f085abc1548667221ff252bb20c639a /src/vm/assemblyname.cpp
parent077d5cb53bf9c0339cca6e2dc64e1d523987098d (diff)
downloadcoreclr-6a617fbd6296352fa1041bdf5efe02da1a41b9a7.tar.gz
coreclr-6a617fbd6296352fa1041bdf5efe02da1a41b9a7.tar.bz2
coreclr-6a617fbd6296352fa1041bdf5efe02da1a41b9a7.zip
Fix a couple of issues involving assembly loading
Fixes #1740 - After an assembly is loaded through a custom load context, when its dependencies are being loaded and the dependencies are in an app folder but not on the TPA list, don't search app paths when using the TPA binder, and instead use the default binder for the dependent assembly to load dependencies through the same custom AssemblyLoadContext. Fixes #1187 - In the AssemblyName created by AssemblyLoadContext.GetAssemblyName(), don't initialize the CodeBase property since it's not in the exposed surface area for .NET Core. If the AssemblyName is passed to Assembly.Load(), note that regardless of the path sent to GetAssemblyName(), default search orders are still used to load the assembly by name. A custom AssemblyLoadContext would need to be used to control where an assembly is loaded from. - Fixed a couple of error messages that mentioned phone
Diffstat (limited to 'src/vm/assemblyname.cpp')
-rw-r--r--src/vm/assemblyname.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vm/assemblyname.cpp b/src/vm/assemblyname.cpp
index 3a66851e34..173f3dbbdd 100644
--- a/src/vm/assemblyname.cpp
+++ b/src/vm/assemblyname.cpp
@@ -85,7 +85,9 @@ FCIMPL1(Object*, AssemblyNameNative::GetFileInformation, StringObject* filenameU
AssemblySpec spec;
spec.InitializeSpec(TokenFromRid(mdtAssembly,1),pImage->GetMDImport(),NULL,TRUE);
+#ifndef FEATURE_CORECLR
spec.SetCodeBase(sUrl);
+#endif
spec.AssemblyNameInit(&gc.result, pImage);
HELPER_METHOD_FRAME_END();