From f7585ef29164a2f3f9d3913eb9f87943094d30b3 Mon Sep 17 00:00:00 2001 From: danmosemsft Date: Sun, 12 Feb 2017 11:19:46 -0800 Subject: Remove always defined FEATURE_VERSIONING --- src/binder/inc/fusionhelpers.hpp | 6 ------ src/inc/corpriv.h | 2 -- src/inc/fusion.idl | 5 ----- src/vm/appdomain.cpp | 12 ------------ src/vm/appdomain.hpp | 13 ------------- src/vm/appdomainnative.cpp | 4 ---- src/vm/appdomainnative.hpp | 2 -- src/vm/assembly.cpp | 2 -- src/vm/coreassemblyspec.cpp | 2 -- src/vm/corhost.cpp | 2 -- src/vm/ecalllist.h | 2 -- src/vm/pefile.cpp | 2 -- src/vm/pefile.inl | 12 ------------ 13 files changed, 66 deletions(-) (limited to 'src') diff --git a/src/binder/inc/fusionhelpers.hpp b/src/binder/inc/fusionhelpers.hpp index 229ebe6c4e..7b81e8589c 100644 --- a/src/binder/inc/fusionhelpers.hpp +++ b/src/binder/inc/fusionhelpers.hpp @@ -21,12 +21,6 @@ #include "ex.h" #include "fusion.h" -#ifndef FEATURE_VERSIONING -// Rename the fusion bind result to avoid collision with core bind result -#define IBindResult IBindResult_Fusion -#include "binderngen.h" -#undef IBindResult -#endif #include "peinformation.h" diff --git a/src/inc/corpriv.h b/src/inc/corpriv.h index edab391827..197c7793d9 100644 --- a/src/inc/corpriv.h +++ b/src/inc/corpriv.h @@ -40,9 +40,7 @@ STDAPI MetaDataGetDispenser( // Return HRESULT STDAPI RuntimeCheckLocationAccess(LPCWSTR wszLocation); STDAPI RuntimeIsNativeImageOptedOut(IAssemblyName* pAssemblyDef); -#ifdef FEATURE_VERSIONING LocaleID RuntimeGetFileSystemLocale(); -#endif // FEATURE_VERSIONING BOOL RuntimeFileNotFound(HRESULT hr); diff --git a/src/inc/fusion.idl b/src/inc/fusion.idl index e64909e845..317e690fe6 100644 --- a/src/inc/fusion.idl +++ b/src/inc/fusion.idl @@ -31,11 +31,6 @@ cpp_quote("#ifdef _MSC_VER") cpp_quote("#pragma once") cpp_quote("#endif") -#if !defined(FEATURE_FUSION) && !defined(FEATURE_VERSIONING) -cpp_quote("#if defined(_CLR_BLD) && !defined(FEATURE_FUSION)") -cpp_quote("#error FEATURE_FUSION is not enabled, please do not include fusion.h") -cpp_quote("#endif") -#endif // !defined(FEATURE_FUSION) && !defined(FEATURE_VERSIONING) interface IAssemblyCache; interface IAssemblyCacheItem; diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp index 59c43bb2b8..b40dba4ce8 100644 --- a/src/vm/appdomain.cpp +++ b/src/vm/appdomain.cpp @@ -92,9 +92,7 @@ #include "stringarraylist.h" -#ifdef FEATURE_VERSIONING #include "../binder/inc/clrprivbindercoreclr.h" -#endif #if defined(FEATURE_APPX_BINDER) #include "appxutil.h" @@ -2514,7 +2512,6 @@ void SystemDomain::Init() DWORD size = 0; -#ifdef FEATURE_VERSIONING // Get the install directory so we can find mscorlib hr = GetInternalSystemDirectory(NULL, &size); @@ -2529,11 +2526,6 @@ void SystemDomain::Init() // At this point m_SystemDirectory should already be canonicalized -#else - - m_SystemDirectory = GetInternalSystemDirectory(&size); - -#endif // FEATURE_VERSIONING m_BaseLibrary.Append(m_SystemDirectory); if (!m_BaseLibrary.EndsWith(DIRECTORY_SEPARATOR_CHAR_W)) @@ -9220,9 +9212,7 @@ void AppDomain::InitializeDomainContext(BOOL allowRedirects, CreateFusionContext(); #endif // FEATURE_FUSION -#ifdef FEATURE_VERSIONING CreateFusionContext(); -#endif // FEATURE_VERSIONING return; } @@ -9472,7 +9462,6 @@ BOOL AppDomain::SetContextProperty(IApplicationContext* pFusionContext, } #endif // FEATURE_FUSION -#ifdef FEATURE_VERSIONING IUnknown *AppDomain::CreateFusionContext() { CONTRACT(IUnknown *) @@ -9503,7 +9492,6 @@ IUnknown *AppDomain::CreateFusionContext() RETURN m_pFusionContext; } -#endif // FEATURE_VERSIONING #ifdef FEATURE_FUSION LPWSTR AppDomain::GetDynamicDir() diff --git a/src/vm/appdomain.hpp b/src/vm/appdomain.hpp index ecf7bd0ca5..1ee38cf5ce 100644 --- a/src/vm/appdomain.hpp +++ b/src/vm/appdomain.hpp @@ -31,9 +31,7 @@ #include "ilstubcache.h" #include "testhookmgr.h" #include "gcheaputilities.h" -#ifdef FEATURE_VERSIONING #include "../binder/inc/applicationcontext.hpp" -#endif // FEATURE_VERSIONING #include "rejit.h" #ifdef FEATURE_MULTICOREJIT @@ -1785,9 +1783,7 @@ public: protected: DWORD m_type; LPVOID m_value; -#if FEATURE_VERSIONING ULONG m_uIdentityHash; -#endif }; #endif // FEATURE_LOADER_OPTIMIZATION @@ -2765,9 +2761,7 @@ public: IApplicationContext *CreateFusionContext(); void SetupLoaderOptimization(DWORD optimization); #endif -#ifdef FEATURE_VERSIONING IUnknown *CreateFusionContext(); -#endif // FEATURE_VERSIONING void OverrideDefaultContextBinder(IUnknown *pOverrideBinder) { @@ -4703,15 +4697,8 @@ private: InlineSString<100> m_BaseLibrary; -#ifdef FEATURE_VERSIONING - InlineSString<100> m_SystemDirectory; -#else - - LPCWSTR m_SystemDirectory; - -#endif LPWSTR m_pwDevpath; DWORD m_dwDevpath; diff --git a/src/vm/appdomainnative.cpp b/src/vm/appdomainnative.cpp index fd3897e7a4..0391dbac8f 100644 --- a/src/vm/appdomainnative.cpp +++ b/src/vm/appdomainnative.cpp @@ -23,9 +23,7 @@ #include "clrprivbinderappx.h" #include "clrprivtypecachewinrt.h" #endif // FEATURE_APPX_BINDER -#ifdef FEATURE_VERSIONING #include "../binder/inc/clrprivbindercoreclr.h" -#endif #include "clr/fs/path.h" using namespace clr::fs; @@ -503,7 +501,6 @@ FCIMPL3(void, AppDomainNative::UpdateContextProperty, LPVOID fusionContext, Stri FCIMPLEND #endif // FEATURE_FUSION -#ifdef FEATURE_VERSIONING FCIMPL1(void, AppDomainNative::CreateContext, AppDomainBaseObject *refThisUNSAFE) @@ -563,7 +560,6 @@ void QCALLTYPE AppDomainNative::SetupBindingPaths(__in_z LPCWSTR wszTrustedPlatf END_QCALL; } -#endif // FEATURE_VERSIONING FCIMPL9(Object*, AppDomainNative::CreateDynamicAssembly, AppDomainBaseObject* refThisUNSAFE, AssemblyNameBaseObject* assemblyNameUNSAFE, Object* identityUNSAFE, StackCrawlMark* stackMark, U1Array *securityRulesBlobUNSAFE, U1Array *aptcaBlobUNSAFE, INT32 access, INT32 dwFlags, SecurityContextSource securityContextSource) { diff --git a/src/vm/appdomainnative.hpp b/src/vm/appdomainnative.hpp index 964c3604c6..16e6d82c63 100644 --- a/src/vm/appdomainnative.hpp +++ b/src/vm/appdomainnative.hpp @@ -43,10 +43,8 @@ public: static FCDECL1(FC_BOOL_RET, IsDefaultAppDomainForEvidence, AppDomainBaseObject* refThisUNSAFE); static FCDECL2(Object*, GetAssemblies, AppDomainBaseObject* refThisUNSAFE, CLR_BOOL fForIntrospection); static FCDECL2(Object*, GetOrInternString, AppDomainBaseObject* refThisUNSAFE, StringObject* pStringUNSAFE); -#ifdef FEATURE_VERSIONING static FCDECL1(void, CreateContext, AppDomainBaseObject *refThisUNSAFE); static void QCALLTYPE SetupBindingPaths(__in_z LPCWSTR wszTrustedPlatformAssemblies, __in_z LPCWSTR wszPlatformResourceRoots, __in_z LPCWSTR wszAppPaths, __in_z LPCWSTR wszAppNiPaths, __in_z LPCWSTR appLocalWinMD); -#endif // FEATURE_VERSIONING static FCDECL1(void, Unload, INT32 dwId); static FCDECL1(Object*, GetDynamicDir, AppDomainBaseObject* refThisUNSAFE); static FCDECL1(INT32, GetId, AppDomainBaseObject* refThisUNSAFE); diff --git a/src/vm/assembly.cpp b/src/vm/assembly.cpp index 9ab8fbd576..093de2ed25 100644 --- a/src/vm/assembly.cpp +++ b/src/vm/assembly.cpp @@ -3250,7 +3250,6 @@ BOOL Assembly::CanBeShared(DomainAssembly *pDomainAssembly) } #endif -#ifdef FEATURE_VERSIONING BOOL Assembly::CanBeShared(DomainAssembly *pDomainAssembly) { @@ -3280,7 +3279,6 @@ BOOL Assembly::CanBeShared(DomainAssembly *pDomainAssembly) return TRUE; } -#endif // FEATURE_VERSIONING #endif // FEATURE_LOADER_OPTIMIZATION diff --git a/src/vm/coreassemblyspec.cpp b/src/vm/coreassemblyspec.cpp index d4637a1857..33499e5f4c 100644 --- a/src/vm/coreassemblyspec.cpp +++ b/src/vm/coreassemblyspec.cpp @@ -85,7 +85,6 @@ STDAPI BinderGetDisplayName(PEAssembly *pAssembly, } -#ifdef FEATURE_VERSIONING static VOID ThrowLoadError(AssemblySpec * pSpec, HRESULT hr) { @@ -222,7 +221,6 @@ VOID AssemblySpec::Bind(AppDomain *pAppDomain, } } -#endif // FEATURE_VERSIONING STDAPI BinderAcquirePEImage(LPCWSTR wszAssemblyPath, PEImage **ppPEImage, diff --git a/src/vm/corhost.cpp b/src/vm/corhost.cpp index 712c19545d..7bedffed05 100644 --- a/src/vm/corhost.cpp +++ b/src/vm/corhost.cpp @@ -5126,12 +5126,10 @@ void CExecutionEngine::GetLastThrownObjectExceptionFromThread(void **ppvExceptio } // HRESULT CExecutionEngine::GetLastThrownObjectExceptionFromThread() -#ifdef FEATURE_VERSIONING LocaleID RuntimeGetFileSystemLocale() { return PEImage::GetFileSystemLocale(); }; -#endif HRESULT CorHost2::DllGetActivationFactory(DWORD appDomainID, LPCWSTR wszTypeName, IActivationFactory ** factory) { diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h index cdf9446ed6..6cfb8fd27b 100644 --- a/src/vm/ecalllist.h +++ b/src/vm/ecalllist.h @@ -642,9 +642,7 @@ FCFuncStart(gAppDomainFuncs) #if FEATURE_COMINTEROP FCFuncElement("nSetDisableInterfaceCache", AppDomainNative::SetDisableInterfaceCache) #endif // FEATURE_COMINTEROP -#ifdef FEATURE_VERSIONING FCFuncElement("nCreateContext", AppDomainNative::CreateContext) -#endif // FEATURE_VERSIONING #ifdef FEATURE_REMOTING FCFuncElement("nUnload", AppDomainNative::Unload) #endif // FEATURE_REMOTING diff --git a/src/vm/pefile.cpp b/src/vm/pefile.cpp index fcbd29020f..afe5730c6f 100644 --- a/src/vm/pefile.cpp +++ b/src/vm/pefile.cpp @@ -32,9 +32,7 @@ #endif #include "strongnameinternal.h" -#ifdef FEATURE_VERSIONING #include "../binder/inc/applicationcontext.hpp" -#endif #ifndef FEATURE_FUSION #include "clrprivbinderutil.h" diff --git a/src/vm/pefile.inl b/src/vm/pefile.inl index da70cc2a74..455a46d919 100644 --- a/src/vm/pefile.inl +++ b/src/vm/pefile.inl @@ -106,19 +106,7 @@ inline ULONG PEAssembly::HashIdentity() GC_TRIGGERS; } CONTRACTL_END; -#ifdef FEATURE_VERSIONING return BINDER_SPACE::GetAssemblyFromPrivAssemblyFast(m_pHostAssembly)->GetAssemblyName()->Hash(BINDER_SPACE::AssemblyName::INCLUDE_VERSION); -#else - if (!m_identity->HasID()) - { - if (!IsLoaded()) - return 0; - else - return (ULONG) dac_cast(GetLoaded()->GetBase()); - } - else - return m_identity->GetIDHash(); -#endif } inline void PEFile::ValidateForExecution() -- cgit v1.2.3