Also fixed the corerun sos command checked build problem.
ExtOut("If you are debugging a minidump, you need to make sure that your executable\n");
ExtOut("path is pointing to coreclr.dll as well.\n");
#else // FEATURE_PAL
- ExtOut("You can run the debugger command 'setclrpath' to control the load of %s.\n", MAKEDLLNAME_A("mscordaccore"));
- ExtOut("If that succeeds, the SOS command should work on retry.\n");
+ if (Status == CORDBG_E_MISSING_DEBUGGER_EXPORTS)
+ {
+ ExtOut("You can run the debugger command 'setclrpath' to control the load of %s.\n", MAKEDLLNAME_A("mscordaccore"));
+ ExtOut("If that succeeds, the SOS command should work on retry.\n");
+ }
+ else
+ {
+ ExtOut("Can not load or initialize %s. The target runtime may not be initialized.\n", MAKEDLLNAME_A("mscordaccore"));
+ }
#endif // FEATURE_PAL
}
int err = PAL_InitializeDLL();
if(err != 0)
{
- return E_FAIL;
+ return CORDBG_E_UNSUPPORTED;
}
char dacModulePath[MAX_LONGPATH];
strcpy_s(dacModulePath, _countof(dacModulePath), g_ExtServices->GetCoreClrDirectory());
HMODULE hdac = LoadLibraryA(dacModulePath);
if (hdac == NULL)
{
- return E_FAIL;
+ return CORDBG_E_MISSING_DEBUGGER_EXPORTS;
}
PFN_CLRDataCreateInstance pCLRDataCreateInstance = (PFN_CLRDataCreateInstance)GetProcAddress(hdac, "CLRDataCreateInstance");
if (pCLRDataCreateInstance == NULL)
{
FreeLibrary(hdac);
- return E_FAIL;
+ return CORDBG_E_MISSING_DEBUGGER_EXPORTS;
}
ICLRDataTarget *target = new DataTarget();
hr = pCLRDataCreateInstance(__uuidof(IXCLRDataProcess), target, (void**)&s_clrDataProcess);
services.cpp
)
-if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG)
+if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED)
list(APPEND SOURCES
coreruncommand.cpp
${CLR_DIR}/src/coreclr/hosts/unixcorerun/corerun.cpp
${CLR_DIR}/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp
)
-endif(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG)
+endif(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED)
add_library(sosplugin SHARED ${SOURCES})
add_dependencies(sosplugin sos)