diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-05-17 18:46:21 -0700 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-05-17 18:46:21 -0700 |
| commit | d1df1851846e35703c9b0606748fe90423af464f (patch) | |
| tree | a48b76c99b88b0887817250b34b7026261afe40b /src/binder/clrprivbindercoreclr.cpp | |
| parent | e78338ef715dc6fd89d9cbd0bf93c7f88d211c20 (diff) | |
| download | coreclr-d1df1851846e35703c9b0606748fe90423af464f.tar.gz coreclr-d1df1851846e35703c9b0606748fe90423af464f.tar.bz2 coreclr-d1df1851846e35703c9b0606748fe90423af464f.zip | |
Revert "Enable overriding assemblies from TPA"
Diffstat (limited to 'src/binder/clrprivbindercoreclr.cpp')
| -rw-r--r-- | src/binder/clrprivbindercoreclr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/binder/clrprivbindercoreclr.cpp b/src/binder/clrprivbindercoreclr.cpp index d62af867ef..a2fb1c8237 100644 --- a/src/binder/clrprivbindercoreclr.cpp +++ b/src/binder/clrprivbindercoreclr.cpp @@ -80,8 +80,7 @@ HRESULT CLRPrivBinderCoreCLR::BindAssemblyByName(IAssemblyName *pIAssemblyNa INT_PTR pManagedAssemblyLoadContext = GetManagedAssemblyLoadContext(); if (pManagedAssemblyLoadContext != NULL) { - hr = AssemblyBinder::BindUsingHostAssemblyResolver(pManagedAssemblyLoadContext, pAssemblyName, pIAssemblyName, - NULL, &pCoreCLRFoundAssembly); + hr = AssemblyBinder::BindUsingHostAssemblyResolver(pManagedAssemblyLoadContext, pAssemblyName, pIAssemblyName, &pCoreCLRFoundAssembly); if (SUCCEEDED(hr)) { // We maybe returned an assembly that was bound to a different AssemblyLoadContext instance. |