diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-03-23 12:38:37 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-03-23 13:11:31 -0700 |
| commit | e8a39ef3ee0501ff62d3fc8cdb8d063e7f0d149f (patch) | |
| tree | 0e694fc322211aa6721ad605f4a34f637654e55c /src/vm/corhost.cpp | |
| parent | 21cbca6a3165ac9f3e2a3c1753ac6ee023aa9443 (diff) | |
| download | coreclr-e8a39ef3ee0501ff62d3fc8cdb8d063e7f0d149f.tar.gz coreclr-e8a39ef3ee0501ff62d3fc8cdb8d063e7f0d149f.tar.bz2 coreclr-e8a39ef3ee0501ff62d3fc8cdb8d063e7f0d149f.zip | |
Remove special casing of platform assemblies
Diffstat (limited to 'src/vm/corhost.cpp')
| -rw-r--r-- | src/vm/corhost.cpp | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/src/vm/corhost.cpp b/src/vm/corhost.cpp index f0e90291b7..f3f9adbb7e 100644 --- a/src/vm/corhost.cpp +++ b/src/vm/corhost.cpp @@ -55,10 +55,6 @@ #include "clrprivtypecachewinrt.h" #endif -#ifdef FEATURE_WINDOWSPHONE -#include "thetestkey.h" -#endif - GVAL_IMPL_INIT(DWORD, g_fHostConfig, 0); #ifdef FEATURE_IMPLICIT_TLS @@ -1588,15 +1584,6 @@ HRESULT CorHost2::_CreateAppDomain( #ifdef FEATURE_CORECLR if (!m_fStarted) return HOST_E_INVALIDOPERATION; - -#if defined(FEATURE_WINDOWSPHONE) && defined(FEATURE_STRONGNAME_TESTKEY_ALLOWED) - if((APPDOMAIN_SET_TEST_KEY & dwFlags) && (m_dwStartupFlags & STARTUP_SINGLE_APPDOMAIN)) - { - const BYTE testKey[] = { TEST_KEY_VALUE }; - memcpy_s(g_rbTestKeyBuffer + sizeof(GUID)*2, sizeof(testKey), testKey, sizeof(testKey)); - } -#endif // defined(FEATURE_WINDOWSPHONE) && defined(FEATURE_STRONGNAME_TESTKEY_ALLOWED) - #endif // FEATURE_CORECLR if(wszFriendlyName == NULL) @@ -1631,30 +1618,9 @@ HRESULT CorHost2::_CreateAppDomain( { pDomain->SetIgnoreUnhandledExceptions(); } - - // Enable interop for all assemblies if the host has asked us to. - if (dwFlags & APPDOMAIN_ENABLE_PINVOKE_AND_CLASSIC_COMINTEROP) - { - pDomain->SetEnablePInvokeAndClassicComInterop(); - } - - if (dwFlags & APPDOMAIN_ENABLE_PLATFORM_SPECIFIC_APPS) - { - pDomain->SetAllowPlatformSpecificAppAssemblies(); - } - - if (dwFlags & APPDOMAIN_ENABLE_ASSEMBLY_LOADFILE) - { - pDomain->SetAllowLoadFile(); - } - - if (dwFlags & APPDOMAIN_DISABLE_TRANSPARENCY_ENFORCEMENT) - { - pDomain->DisableTransparencyEnforcement(); - } #endif // FEATURE_CORECLR - if (dwFlags & APPDOMAIN_SECURITY_FORBID_CROSSAD_REVERSE_PINVOKE) + if (dwFlags & APPDOMAIN_SECURITY_FORBID_CROSSAD_REVERSE_PINVOKE) pDomain->SetReversePInvokeCannotEnter(); if (dwFlags & APPDOMAIN_FORCE_TRIVIAL_WAIT_OPERATIONS) |