diff options
| author | Gaurav Khanna (CLR) <gaurav.khanna@microsoft.com> | 2016-01-15 15:06:01 -0800 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-01-21 07:26:51 -0800 |
| commit | 7e1a3b532dc2fb2eab2d41994c971759243def19 (patch) | |
| tree | f85fba1b7b911ee580768aa8eb40d771a61c0ec1 /src/binder/inc | |
| parent | 17cf0eae0414c01c33af403cc54bb37cf3b84016 (diff) | |
| download | coreclr-7e1a3b532dc2fb2eab2d41994c971759243def19.tar.gz coreclr-7e1a3b532dc2fb2eab2d41994c971759243def19.tar.bz2 coreclr-7e1a3b532dc2fb2eab2d41994c971759243def19.zip | |
Add support for AssemblyResolution when an assembly is not found in a given Load Context.
1) Expose AssemblyResolve event off AssemblyLoadContext
2) Invoke the event if the abstract Load implementation does not return an assembly.
Diffstat (limited to 'src/binder/inc')
| -rw-r--r-- | src/binder/inc/assemblybinder.hpp | 2 | ||||
| -rw-r--r-- | src/binder/inc/clrprivbindercoreclr.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/binder/inc/assemblybinder.hpp b/src/binder/inc/assemblybinder.hpp index 4ca0c4f18c..bfe851d8e9 100644 --- a/src/binder/inc/assemblybinder.hpp +++ b/src/binder/inc/assemblybinder.hpp @@ -76,7 +76,7 @@ namespace BINDER_SPACE /* in */ LPCTSTR szMDAssemblyPath = NULL); #if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN) - static HRESULT BindUsingHostAssemblyResolver (/* in */ CLRPrivBinderAssemblyLoadContext *pLoadContextToBindWithin, + static HRESULT BindUsingHostAssemblyResolver (/* in */ INT_PTR pManagedAssemblyLoadContextToBindWithin, /* in */ AssemblyName *pAssemblyName, /* in */ IAssemblyName *pIAssemblyName, /* out */ Assembly **ppAssembly); diff --git a/src/binder/inc/clrprivbindercoreclr.h b/src/binder/inc/clrprivbindercoreclr.h index 4d98c9b55a..ce545561f2 100644 --- a/src/binder/inc/clrprivbindercoreclr.h +++ b/src/binder/inc/clrprivbindercoreclr.h @@ -79,12 +79,12 @@ public: BINDER_SPACE::Assembly **ppCoreCLRFoundAssembly, bool excludeAppPaths); - INT_PTR GetManagedTPABinderInstance() + INT_PTR GetManagedAssemblyLoadContext() { return m_ptrManagedAssemblyLoadContext; } - void SetManagedTPABinderInstance(INT_PTR ptrManagedTPABinderInstance) + void SetManagedAssemblyLoadContext(INT_PTR ptrManagedTPABinderInstance) { _ASSERTE(m_ptrManagedAssemblyLoadContext == NULL); |