summaryrefslogtreecommitdiff
path: root/src/binder/assemblybinder.cpp
diff options
context:
space:
mode:
authorKoundinya Veluri <kouvel@microsoft.com>2015-09-30 12:20:52 -0700
committerKoundinya Veluri <kouvel@microsoft.com>2015-09-30 12:41:38 -0700
commite780495d6e7575812fd5c42d4125c35b6054fa95 (patch)
treef1d739498e166617c6e8dfb97bbffc2aee47611e /src/binder/assemblybinder.cpp
parent795786f0ac0e5ea82f288dfeb5b673845e1ef075 (diff)
downloadcoreclr-e780495d6e7575812fd5c42d4125c35b6054fa95.tar.gz
coreclr-e780495d6e7575812fd5c42d4125c35b6054fa95.tar.bz2
coreclr-e780495d6e7575812fd5c42d4125c35b6054fa95.zip
Remove the need for the PKT to match when binding to an assembly on the TPA list
There is some inconsistency in how binding works with and without a custom AssemblyLoadContext being active. By default, the binder allows binding to assemblies on the TPA list despite a PKT mismatch while searching app paths. This part is skipped when a custom AssemblyLoadContext is active. It has been determined that generally, the binder shouldn't require the PKT to match, so disabling that check. Fixes #1640
Diffstat (limited to 'src/binder/assemblybinder.cpp')
-rw-r--r--src/binder/assemblybinder.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/binder/assemblybinder.cpp b/src/binder/assemblybinder.cpp
index 3dc1d73e96..982e5c98ad 100644
--- a/src/binder/assemblybinder.cpp
+++ b/src/binder/assemblybinder.cpp
@@ -1228,17 +1228,9 @@ namespace BINDER_SPACE
#ifdef FEATURE_LEGACYNETCF
fWindowsPhone7 = RuntimeIsLegacyNetCF(pApplicationContext->GetAppDomainId()) == TRUE;
#endif
- //
- // Windows Phone 7 Quirk:
- //
- // NetCF allows partial binds to platform assemblies. If we are running a
- // Mango application, skip the PKT check if no Ref version is provided,
- // since there are apps in the Marketplace that do Assembly.Load("System")
- //
+
if (!tpaListAssembly || (fWindowsPhone7 && tpaListAssembly))
{
- dwIncludeFlags |= AssemblyName::EXCLUDE_PUBLIC_KEY_TOKEN_IF_MISSING;
-
//
// On Windows Phone 7, exclude culture comparisons when requesting an uncultured
// assembly for app compat reasons (there are main app assemblies with spurious cultures)