Remove always defined FEATURE_CORECLR

5 files changed, 1 insertions, 72 deletions

diff --git a/src/debug/di/cordb.cpp b/src/debug/di/cordb.cpp
index 7f8c087399..3cb93756ec 100644
--- a/src/debug/di/cordb.cpp
+++ b/src/debug/di/cordb.cpp
@@ -99,7 +99,6 @@ STDAPI CreateCordbObject(int iDebuggerVersion, IUnknown ** ppCordb)
     return Cordb::CreateObject((CorDebugInterfaceVersion)iDebuggerVersion, IID_ICorDebug, (void **) ppCordb);
 }
 
-#if defined(FEATURE_CORECLR)
 //
 // Public API.  
 // Telesto Creation path - only way to debug multi-instance.  
@@ -152,7 +151,6 @@ STDAPI CoreCLRCreateCordbObject(int iDebuggerVersion, DWORD pid, HMODULE hmodTar
     return hr;
 }
 
-#endif // FEATURE_CORECLR
 
 
 
diff --git a/src/debug/di/process.cpp b/src/debug/di/process.cpp
index 53fb2ca0f6..2d73c3a273 100644
--- a/src/debug/di/process.cpp
+++ b/src/debug/di/process.cpp
@@ -2361,18 +2361,7 @@ HRESULT CordbProcess::EnumerateHandles(CorGCReferenceType types, ICorDebugGCRefe
 
 HRESULT CordbProcess::EnableNGENPolicy(CorDebugNGENPolicy ePolicy)
 {
-#ifdef FEATURE_CORECLR
     return E_NOTIMPL;
-#else
-    HRESULT hr = S_OK;
-    PUBLIC_API_BEGIN(this);
-
-    IDacDbiInterface* pDAC = GetProcess()->GetDAC();
-    hr = pDAC->EnableNGENPolicy(ePolicy);
-
-    PUBLIC_API_END(hr);
-    return hr;
-#endif
 }
 
 
@@ -7507,33 +7496,6 @@ void CordbProcess::VerifyControlBlock()
     // For Telesto, Dbi and Wks have a more flexible versioning allowed, as described by the Debugger
     // Version Protocol String in DEBUGGER_PROTOCOL_STRING in DbgIpcEvents.h. This allows different build
     // numbers, but the other protocol numbers should still match.
-#if !defined(FEATURE_CORECLR)
-    bool fSkipVerCheck = false;
-#if _DEBUG
-    // In debug builds, allow us to disable the version check to help with applying hotfixes.
-    // The hotfix may be built against a compatible IPC protocol, but have a slightly different build number.
-    fSkipVerCheck = CLRConfig::GetConfigValue(CLRConfig::INTERNAL_DbgSkipVerCheck) != 0;
-#endif
-
-    if (!fSkipVerCheck)
-    {
-        //
-        // These asserts double check that the version of the Right Side matches the version of the left side.
-        //
-        // If you hit these asserts, it is probably because you rebuilt mscordbi without rebuilding mscorwks, or rebuilt
-        // mscorwks without rebuilding mscordbi. You might be able to ignore these asserts, but proceed at your own risk.
-        //
-        CONSISTENCY_CHECK_MSGF(VER_PRODUCTBUILD == GetDCB()->m_verMajor,
-            ("version of %s (%d) in the debuggee does not match version of mscordbi.dll (%d) in the debugger.\n"
-             "This means your setup is wrong. You can ignore this but proceed at your own risk.\n", 
-             MAIN_CLR_DLL_NAME_A, GetDCB()->m_verMajor, VER_PRODUCTBUILD));
-        CONSISTENCY_CHECK_MSGF(VER_PRODUCTBUILD_QFE == GetDCB()->m_verMinor,
-            ("QFE version of %s (%d) in the debuggee does not match QFE version of mscordbi.dll (%d) in the debugger.\n"
-             "Both dlls have build # (%d).\n"
-             "This means your setup is wrong. You can ignore this but proceed at your own risk.\n", 
-             MAIN_CLR_DLL_NAME_A, GetDCB()->m_verMinor, VER_PRODUCTBUILD_QFE, VER_PRODUCTBUILD));
-    }
-#endif // !FEATURE_CORECLR
 
     // These assertions verify that the debug manager is behaving correctly.
     // An assertion failure here means that the runtime version of the debuggee is different from the runtime version of
@@ -15175,11 +15137,7 @@ bool CordbProcess::IsCompatibleWith(DWORD clrMajorVersion)
     //  honored for SLv4.
     if (requiredVersion <= 0)
     {
-#if defined(FEATURE_CORECLR)
         requiredVersion = 2;
-#else
-        requiredVersion = 4;
-#endif
     }
 
     // Compare the version we were created for against the minimum required
diff --git a/src/debug/di/rsmain.cpp b/src/debug/di/rsmain.cpp
index 6e0ccf8872..542872577f 100644
--- a/src/debug/di/rsmain.cpp
+++ b/src/debug/di/rsmain.cpp
@@ -1306,7 +1306,6 @@ HRESULT Cordb::WaitForIPCEventFromProcess(CordbProcess* process,
                                                        event);
 }
 
-#ifdef FEATURE_CORECLR
 HRESULT Cordb::SetTargetCLR(HMODULE hmodTargetCLR)
 {
     if (m_initialized)
@@ -1328,7 +1327,6 @@ HRESULT Cordb::SetTargetCLR(HMODULE hmodTargetCLR)
 
     return S_OK;
 }
-#endif // FEATURE_CORECLR
 
 //-----------------------------------------------------------
 // ICorDebug
@@ -1407,7 +1405,7 @@ HRESULT Cordb::SetUnmanagedHandler(ICorDebugUnmanagedCallback *pCallback)
 // It is currently supported on Mac CoreCLR, but that may change.
 bool Cordb::IsCreateProcessSupported()
 {
-#if defined(FEATURE_CORECLR) && !defined(FEATURE_DBGIPC_TRANSPORT_DI)
+#if !defined(FEATURE_DBGIPC_TRANSPORT_DI)
     return false;
 #else 
     return true;
diff --git a/src/debug/di/rsmda.cpp b/src/debug/di/rsmda.cpp
index d69b448309..751fdc8938 100644
--- a/src/debug/di/rsmda.cpp
+++ b/src/debug/di/rsmda.cpp
@@ -150,11 +150,7 @@ HRESULT CordbMDA::GetName(ULONG32 cchName, ULONG32 * pcchName, __out_ecount_part
     HRESULT hr = S_OK;
     PUBLIC_API_BEGIN(this)
     {    
-#if defined(FEATURE_CORECLR)
         hr = E_NOTIMPL;
-#else  // !FEATURE_CORECLR
-        hr = CopyOutString(m_szName, cchName, pcchName, szName);
-#endif // FEATURE_CORECLR
     }
     PUBLIC_API_END(hr);
     return hr;
@@ -169,11 +165,7 @@ HRESULT CordbMDA::GetDescription(ULONG32 cchName, ULONG32 * pcchName, __out_ecou
     HRESULT hr = S_OK;
     PUBLIC_API_BEGIN(this)
     {        
-#if defined(FEATURE_CORECLR)
         hr = E_NOTIMPL;
-#else  // !FEATURE_CORECLR
-        hr = CopyOutString(m_szDescription, cchName, pcchName, szName);
-#endif // FEATURE_CORECLR
     }
     PUBLIC_API_END(hr);
     return hr;
@@ -190,11 +182,7 @@ HRESULT CordbMDA::GetXML(ULONG32 cchName, ULONG32 * pcchName, __out_ecount_part_
     HRESULT hr = S_OK;
     PUBLIC_API_BEGIN(this)
     {        
-#if defined(FEATURE_CORECLR)
         hr = E_NOTIMPL;
-#else  // !FEATURE_CORECLR
-        hr = CopyOutString(m_szXml, cchName, pcchName, szName);
-#endif // FEATURE_CORECLR
     }
     PUBLIC_API_END(hr);
     return hr;
@@ -208,12 +196,7 @@ HRESULT CordbMDA::GetFlags(CorDebugMDAFlags * pFlags)
     HRESULT hr = S_OK;
     PUBLIC_API_BEGIN(this)
     {        
-#if defined(FEATURE_CORECLR)
         hr = E_NOTIMPL;
-#else  // !FEATURE_CORECLR
-        ValidateOrThrow(pFlags);
-        *pFlags = this->m_flags;
-#endif // FEATURE_CORECLR
     }
     PUBLIC_API_END(hr);
     return hr;
@@ -229,13 +212,7 @@ HRESULT CordbMDA::GetOSThreadId(DWORD * pOsTid)
     HRESULT hr = S_OK;
     PUBLIC_API_BEGIN(this)
     {        
-#if defined(FEATURE_CORECLR)
         hr = E_NOTIMPL;
-#else  // !FEATURE_CORECLR
-        ValidateOrThrow(pOsTid);
-        
-        *pOsTid = this->m_dwOSTID;
-#endif // FEATURE_CORECLR
     }
     PUBLIC_API_END(hr);
     return hr;
diff --git a/src/debug/di/rspriv.h b/src/debug/di/rspriv.h
index 1db784b636..5b832c7731 100644
--- a/src/debug/di/rspriv.h
+++ b/src/debug/di/rspriv.h
@@ -2199,9 +2199,7 @@ public:
     // ICorDebug
     //-----------------------------------------------------------
 
-#ifdef FEATURE_CORECLR
     HRESULT SetTargetCLR(HMODULE hmodTargetCLR);
-#endif // FEATURE_CORECLR
 
     COM_METHOD Initialize();
     COM_METHOD Terminate();