Fold mscorrc.dll into coreclr.dll (#122135)

Simplifies resource loading and get rid of module loading.

Author: huoyaoyuan

src/coreclr/binder/bindertracing.cpp

@@ -219,9 +219,9 @@ namespace BinderTracing
         if (mvidMismatch)
         {
             StackSString format;
-            format.LoadResource(CCompRC::Error, IDS_EE_FILELOAD_ERROR_GENERIC);
+            format.LoadResource(IDS_EE_FILELOAD_ERROR_GENERIC);
             StackSString details;
-            details.LoadResource(CCompRC::Error, IDS_HOST_ASSEMBLY_RESOLVER_ASSEMBLY_ALREADY_LOADED_IN_CONTEXT);
+            details.LoadResource(IDS_HOST_ASSEMBLY_RESOLVER_ASSEMBLY_ALREADY_LOADED_IN_CONTEXT);
             errorMsg.FormatMessage(FORMAT_MESSAGE_FROM_STRING, format.GetUnicode(), 0, 0, m_assemblyName, details);
         }
 

src/coreclr/debug/di/process.cpp

@@ -18,7 +18,6 @@
 
 #include "corpriv.h"
 #include "corexcep.h"
-#include "../../dlls/mscorrc/resource.h"
 #include <limits.h>
 
 #include <sstring.h>

src/coreclr/debug/di/rsappdomain.cpp

@@ -17,7 +17,6 @@
 #endif
 
 #include "corpriv.h"
-#include "../../dlls/mscorrc/resource.h"
 #include <limits.h>
 
 

src/coreclr/debug/di/rsassembly.cpp

@@ -17,7 +17,6 @@
 #endif
 
 #include "corpriv.h"
-#include "../../dlls/mscorrc/resource.h"
 #include <limits.h>
 
 

src/coreclr/debug/di/rsmain.cpp

@@ -19,7 +19,6 @@
 #endif
 
 #include "corpriv.h"
-#include "../../dlls/mscorrc/resource.h"
 #include <limits.h>
 
 

src/coreclr/debug/ee/debugger.cpp

@@ -13,7 +13,6 @@
 #include "debugdebugger.h"
 #include "../inc/common.h"
 #include "eeconfig.h" // This is here even for retail & free builds...
-#include "../../dlls/mscorrc/resource.h"
 
 #include "vars.hpp"
 #include <limits.h>

src/coreclr/debug/ee/debuggermessagebox.cpp

@@ -9,7 +9,6 @@
 #include <utilcode.h>                   // Utility helpers.
 #include <corerror.h>
 #include <clrversion.h>
-#include "../../dlls/mscorrc/resource.h"
 
 // Output printf-style formatted text to the debugger if it's present or stdout otherwise.
 static void DbgPrintf(const LPCSTR szFormat, ...)

src/coreclr/debug/ee/funceval.cpp

@@ -16,7 +16,6 @@
 #include "debugdebugger.h"
 #include "../inc/common.h"
 #include "eeconfig.h" // This is here even for retail & free builds...
-#include "../../dlls/mscorrc/resource.h"
 
 #include "vars.hpp"
 #include "threads.h"

src/coreclr/dlls/mscoree/coreclr/CMakeLists.txt

@@ -82,6 +82,7 @@ endif (CLR_CMAKE_HOST_UNIX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 # order dependent and changing the order can result in undefined symbols in the shared
 # library.
 set(CORECLR_LIBRARIES
+    mscorrc
     utilcode
     ${START_LIBRARY_GROUP} # Start group of libraries that have circular references
     ${LIB_CORDBEE}
@@ -137,7 +138,6 @@ if(CLR_CMAKE_TARGET_WIN32)
 else()
     list(APPEND CORECLR_LIBRARIES
         coreclrpal
-        mscorrc
     )
 endif(CLR_CMAKE_TARGET_WIN32)
 

src/coreclr/dlls/mscorrc/CMakeLists.txt

@@ -1,22 +1,9 @@
 include_directories("../../pal/prebuilt/corerror")
 
-add_definitions(-DFX_VER_INTERNALNAME_STR=mscorrc.dll)
-
 if(CLR_CMAKE_HOST_WIN32)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NOENTRY")
-
-    # remove /guard:cf, /guard:ehcont, and /CETCOMPAT from resource-only libraries
-    set_property(DIRECTORY PROPERTY CLR_CONTROL_FLOW_GUARD OFF)
-
-    if (CLR_CMAKE_HOST_ARCH_AMD64)
-        set_property(DIRECTORY PROPERTY CLR_EH_CONTINUATION OFF)
-        string(REPLACE "/CETCOMPAT" "" CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS})
-    endif (CLR_CMAKE_HOST_ARCH_AMD64)
-
-    add_library_clr(mscorrc SHARED
+    add_library_clr(mscorrc OBJECT
         include.rc
     )
-    install_clr(TARGETS mscorrc DESTINATIONS . sharedFramework COMPONENT runtime)
 
 else()
     build_resources(${CMAKE_CURRENT_SOURCE_DIR}/include.rc mscorrc TARGET_CPP_FILE)