From c9850c6172e09fe824e02a6f2e7eb6c4863952d5 Mon Sep 17 00:00:00 2001 From: danmosemsft Date: Sun, 12 Feb 2017 10:54:14 -0800 Subject: Remove always defined FEATURE_HOST_ASSEMBLY_RESOLVER --- src/vm/assembly.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/vm/assembly.cpp') diff --git a/src/vm/assembly.cpp b/src/vm/assembly.cpp index cc24ec7038..9ab8fbd576 100644 --- a/src/vm/assembly.cpp +++ b/src/vm/assembly.cpp @@ -739,7 +739,6 @@ Assembly *Assembly::CreateDynamic(AppDomain *pDomain, CreateDynamicAssemblyArgs &ma)); pFile = PEAssembly::Create(pCallerAssembly->GetManifestFile(), pAssemblyEmit, args->access & ASSEMBLY_ACCESS_REFLECTION_ONLY); -#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) // Dynamically created modules (aka RefEmit assemblies) do not have a LoadContext associated with them since they are not bound // using an actual binder. As a result, we will assume the same binding/loadcontext information for the dynamic assembly as its // caller/creator to ensure that any assembly loads triggered by the dynamic assembly are resolved using the intended load context. @@ -785,7 +784,6 @@ Assembly *Assembly::CreateDynamic(AppDomain *pDomain, CreateDynamicAssemblyArgs // Set it as the fallback load context binder for the dynamic assembly being created pFile->SetFallbackLoadContextBinder(pFallbackLoadContextBinder); -#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) } -- cgit v1.2.3