dotnet · jkoritzinsky · Jun 24, 2024 · Jun 6, 2024 · Jun 7, 2024 · Jun 7, 2024
diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
@@ -125,6 +125,9 @@ add_subdirectory(pal/prebuilt/inc)
 set(EP_GENERATED_HEADER_PATH "${GENERATED_INCLUDE_DIR}")
 include (${CLR_SRC_NATIVE_DIR}/eventpipe/configure.cmake)
 
+add_subdirectory(${CLR_SRC_NATIVE_DIR}/containers containers)
+add_subdirectory(${CLR_SRC_NATIVE_DIR}/eventpipe eventpipe)
+
 if(NOT CLR_CMAKE_HOST_MACCATALYST AND NOT CLR_CMAKE_HOST_IOS AND NOT CLR_CMAKE_HOST_TVOS)
   add_subdirectory(debug/debug-pal)
 endif()

diff --git a/src/coreclr/debug/debug-pal/CMakeLists.txt b/src/coreclr/debug/debug-pal/CMakeLists.txt
@@ -1,8 +1,6 @@
 include_directories(../inc)
 include_directories(../../pal/inc)
-include_directories(${EP_GENERATED_HEADER_PATH})
 
-set(SHARED_EVENTPIPE_SOURCE_PATH ${CLR_SRC_NATIVE_DIR}/eventpipe)
 add_definitions(-DFEATURE_CORECLR)
 add_definitions(-DFEATURE_PERFTRACING)
 add_definitions(-DFEATURE_PERFTRACING_STANDALONE_PAL)
@@ -12,9 +10,7 @@ if(CLR_CMAKE_HOST_WIN32)
     include_directories(../../inc) #needed for warning control
 
     if(CLR_CMAKE_TARGET_WIN32)
-            set (EVENTPIPE_PAL_SOURCES "${SHARED_EVENTPIPE_SOURCE_PATH}/ds-ipc-pal-namedpipe.c")
-            set_source_files_properties(${EVENTPIPE_PAL_SOURCES} PROPERTIES LANGUAGE CXX)
-
+        set(DEBUG_PAL_REFEREENCE_DIAGNOSTICSERVER ON)
         set(TWO_WAY_PIPE_SOURCES
             ${EVENTPIPE_PAL_SOURCES}
             win/twowaypipe.cpp
@@ -28,14 +24,11 @@ if(CLR_CMAKE_HOST_WIN32)
 endif(CLR_CMAKE_HOST_WIN32)
 
 if(CLR_CMAKE_HOST_UNIX)
+    set(DEBUG_PAL_REFEREENCE_DIAGNOSTICSERVER ON)
 
     add_definitions(-DPAL_IMPLEMENTATION)
     add_definitions(-D_POSIX_C_SOURCE=200809L)
 
-    set (EVENTPIPE_PAL_SOURCES "${SHARED_EVENTPIPE_SOURCE_PATH}/ds-ipc-pal-socket.c")
-    set_source_files_properties(${EVENTPIPE_PAL_SOURCES} PROPERTIES LANGUAGE CXX)
-    set_source_files_properties(${EVENTPIPE_PAL_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)
-
     set(TWO_WAY_PIPE_SOURCES
       ${EVENTPIPE_PAL_SOURCES}
       unix/twowaypipe.cpp
@@ -45,3 +38,13 @@ if(CLR_CMAKE_HOST_UNIX)
 endif(CLR_CMAKE_HOST_UNIX)
 
 add_library_clr(debug-pal OBJECT ${TWO_WAY_PIPE_SOURCES})
+
+if (DEBUG_PAL_REFEREENCE_DIAGNOSTICSERVER)
+    target_link_libraries(debug-pal PRIVATE dn-diagnosticserver-pal)
+
+    # The DiagnosticServer Runtime implementation in CoreCLR is C++,
+    # but the Diagnostic Server PAL is written in C.
+    # Override those files to build as C++.
+    get_property(ds_pal_sources TARGET dn-diagnosticserver-pal PROPERTY INTERFACE_SOURCES)
+    set_source_files_properties(${ds_pal_sources} PROPERTIES LANGUAGE CXX)
+endif()
@@ -106,89 +106,28 @@ endif()
 
 set(AOT_EVENTPIPE_SHIM_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 
-set (CONTAINER_SOURCES "")
-set (CONTAINER_HEADERS "")
 set (MINIPAL_SOURCES "")
 set (EVENTPIPE_SOURCES "")
-set (EVENTPIPE_HEADERS "")
 
-# Use TCP for EventPipe on mobile platforms
-if (CLR_CMAKE_HOST_IOS OR CLR_CMAKE_HOST_TVOS OR CLR_CMAKE_HOST_ANDROID)
-  set(FEATURE_PERFTRACING_PAL_TCP 1)
-  set(FEATURE_PERFTRACING_DISABLE_DEFAULT_LISTEN_PORT 1)
-endif()
-
-set (SHARED_CONTAINERS_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/containers")
-set (SHARED_EVENTPIPE_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/eventpipe")
 set (SHARED_MINIPAL_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/minipal")
-include (${SHARED_EVENTPIPE_SOURCE_PATH}/eventpipe.cmake)
-include (${SHARED_CONTAINERS_SOURCE_PATH}/containers.cmake)
 
 list(APPEND MINIPAL_SOURCES
   utf8.c
 )
 
-if(CLR_CMAKE_HOST_WIN32)
-  list(APPEND SHARED_DIAGNOSTIC_SERVER_SOURCES
-    ds-ipc-pal-namedpipe.c
-  )
-
-  list(APPEND SHARED_DIAGNOSTIC_SERVER_HEADERS
-    ds-ipc-pal-namedpipe.h
-  )
-endif(CLR_CMAKE_HOST_WIN32)
-
 if(CLR_CMAKE_HOST_UNIX)
-  list(APPEND SHARED_DIAGNOSTIC_SERVER_SOURCES
-    ds-ipc-pal-socket.c
-  )
-
-  list(APPEND SHARED_DIAGNOSTIC_SERVER_HEADERS
-    ds-ipc-pal-socket.h
-  )
-
   include(${CLR_SRC_NATIVE_DIR}/minipal/configure.cmake)
   list(APPEND MINIPAL_SOURCES
     random.c
   )
 
 endif(CLR_CMAKE_HOST_UNIX)
 
-list(APPEND EVENTPIPE_SOURCES
-  ${SHARED_EVENTPIPE_SOURCES}
-  ${SHARED_DIAGNOSTIC_SERVER_SOURCES}
-)
-
-list(APPEND EVENTPIPE_HEADERS
-  ${SHARED_EVENTPIPE_HEADERS}
-  ${SHARED_DIAGNOSTIC_SERVER_HEADERS}
-)
-
-addprefix(CONTAINER_SOURCES ${SHARED_CONTAINERS_SOURCE_PATH} "${SHARED_CONTAINER_SOURCES}")
-addprefix(CONTAINER_HEADERS ${SHARED_CONTAINERS_SOURCE_PATH} "${SHARED_CONTAINER_HEADERS}")
 addprefix(MINIPAL_SOURCES ${SHARED_MINIPAL_SOURCE_PATH} "${MINIPAL_SOURCES}")
 
-addprefix(EVENTPIPE_SOURCES ${SHARED_EVENTPIPE_SOURCE_PATH} "${EVENTPIPE_SOURCES}")
-addprefix(EVENTPIPE_HEADERS ${SHARED_EVENTPIPE_SOURCE_PATH} "${EVENTPIPE_HEADERS}")
-
-set_source_files_properties(${SHARED_EVENTPIPE_SOURCE_PATH}/ep-sources.c PROPERTIES COMPILE_DEFINITIONS EP_FORCE_INCLUDE_SOURCE_FILES)
-set_source_files_properties(${SHARED_EVENTPIPE_SOURCE_PATH}/ds-sources.c PROPERTIES COMPILE_DEFINITIONS DS_FORCE_INCLUDE_SOURCE_FILES)
-
-set_source_files_properties(${CONTAINER_SOURCES} PROPERTIES LANGUAGE CXX)
-set_source_files_properties(${EVENTPIPE_SOURCES} PROPERTIES LANGUAGE CXX)
-
-if(CLR_CMAKE_HOST_UNIX)
-    set_source_files_properties(${CONTAINER_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)
-    set_source_files_properties(${EVENTPIPE_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)
-endif(CLR_CMAKE_HOST_UNIX)
-
-if (CLR_CMAKE_TARGET_WIN32)
-    set_source_files_properties(${EVENTPIPE_SOURCES} PROPERTIES COMPILE_FLAGS "/FI\"${RUNTIME_DIR}/eventpipe/NativeaotEventPipeSupport.h\"")
-endif()
-
 list(APPEND AOT_EVENTPIPE_SHIM_SOURCES
   ${AOT_EVENTPIPE_SHIM_DIR}/ep-rt-aot.cpp
-  ${AOT_EVENTPIPE_SHIM_DIR}/ds-rt-aot.cpp  
+  ${AOT_EVENTPIPE_SHIM_DIR}/ds-rt-aot.cpp
 )
 
 list(APPEND AOT_EVENTPIPE_SHIM_HEADERS
@@ -229,18 +168,56 @@ if (FEATURE_EVENT_TRACE)
   endif()
 endif()
 
-
+# The NativeAOT EventPipe runtime is C++, but the EventPipe and DiagnosticServer sources are C.
+# Forcibly override them to build as C++.
+get_property(diagnosticserver_sources TARGET dn-diagnosticserver PROPERTY INTERFACE_SOURCES)
+get_property(diagnosticserver_pal_sources TARGET dn-diagnosticserver-pal PROPERTY INTERFACE_SOURCES)
+get_property(eventpipe_sources TARGET dn-eventpipe PROPERTY INTERFACE_SOURCES)
+set_source_files_properties(${diagnosticserver_sources} ${diagnosticserver_pal_sources} ${eventpipe_sources} PROPERTIES LANGUAGE CXX)
+
+add_library(eventpipe-shared-objects OBJECT)
+target_link_libraries(eventpipe-shared-objects PRIVATE dn-diagnosticserver dn-eventpipe dn-diagnosticserver-pal)
+# Build EventPipe and DiagnosticServer as unity-builds for better inlining.
+set_target_properties(eventpipe-shared-objects PROPERTIES
+  UNITY_BUILD ON
+  UNITY_BUILD_BATCH_SIZE 0
+  COMPILE_PDB_NAME "eventpipe-shared-objects"
+  COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>"
+)
+if (CLR_CMAKE_TARGET_WIN32)
+    add_library(eventpipe-shared-objects.GuardCF OBJECT)
+    target_link_libraries(eventpipe-shared-objects.GuardCF PRIVATE dn-diagnosticserver dn-eventpipe dn-diagnosticserver-pal)
+
+    target_compile_options(eventpipe-shared-objects PRIVATE
+        "/FI${RUNTIME_DIR}/eventpipe/NativeaotEventPipeSupport.h")
+
+    target_compile_options(eventpipe-shared-objects.GuardCF PRIVATE
+        "/FI${RUNTIME_DIR}/eventpipe/NativeaotEventPipeSupport.h")
+
+    # Build EventPipe and DiagnosticServer as unity-builds for better inlining.
+    set_target_properties(eventpipe-shared-objects.GuardCF PROPERTIES
+        UNITY_BUILD ON
+        UNITY_BUILD_BATCH_SIZE 0
+        CLR_CONTROL_FLOW_GUARD ON
+        COMPILE_PDB_NAME "eventpipe-shared-objects.GuardCF"
+        COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
+
+    # Install the compile PDB for the eventpipe unity builds.
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/eventpipe-shared-objects.pdb" DESTINATION aotsdk COMPONENT nativeaot)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/eventpipe-shared-objects.GuardCF.pdb" DESTINATION aotsdk COMPONENT nativeaot)
+    # For the container library, we need to produce a compile PDB and install it
+    set_target_properties(dn-containers-no-lto PROPERTIES
+        COMPILE_PDB_NAME "dn-containers"
+        COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/dn-containers.pdb" DESTINATION aotsdk COMPONENT nativeaot)
+endif()
 
 list(APPEND EVENTPIPE_SOURCES
   ${AOT_EVENTPIPE_SHIM_SOURCES}
-  ${AOT_EVENTPIPE_SHIM_HEADERS}
   ${AOT_EVENTPIPE_MANAGED_TO_NATIVE_SOURCES}
   ${AOT_EVENTTRACE_SOURCES}
-  ${SHARED_EVENTPIPE_CONFIG_HEADERS}
   ${GEN_EVENTPIPE_PROVIDER_SOURCES}
   ${GEN_EVENTPIPE_PLAT_AGNOSTIC_SOURCES}
-  ${CONTAINER_SOURCES}
-  ${CONTAINER_HEADERS}
   ${MINIPAL_SOURCES}
 )
 
@@ -253,6 +230,8 @@ list(APPEND AOT_EVENTPIPE_DISABLED_SOURCES
 )
 
 add_library(eventpipe-enabled STATIC ${EVENTPIPE_SOURCES})
+
+target_link_libraries(eventpipe-enabled PRIVATE eventpipe-shared-objects dn-containers-no-lto)
 add_dependencies(eventpipe-enabled aot_eventing_headers)
 if(CLR_CMAKE_TARGET_WIN32)
   add_dependencies(eventpipe-enabled aot_etw_headers)
@@ -263,6 +242,7 @@ add_dependencies(eventpipe-disabled aot_eventing_headers)
 
 if (CLR_CMAKE_TARGET_WIN32)
   add_library(eventpipe-enabled.GuardCF STATIC ${EVENTPIPE_SOURCES})
+  target_link_libraries(eventpipe-enabled.GuardCF PRIVATE eventpipe-shared-objects.GuardCF dn-containers-no-lto)
   add_dependencies(eventpipe-enabled.GuardCF aot_eventing_headers)
   add_dependencies(eventpipe-enabled.GuardCF aot_etw_headers)
   add_library(eventpipe-disabled.GuardCF STATIC ${AOT_EVENTPIPE_DISABLED_SOURCES})
@@ -276,4 +256,4 @@ install_static_library(eventpipe-disabled aotsdk nativeaot)
 if (CLR_CMAKE_TARGET_WIN32)
   install_static_library(eventpipe-enabled.GuardCF aotsdk nativeaot)
   install_static_library(eventpipe-disabled.GuardCF aotsdk nativeaot)
-endif (CLR_CMAKE_TARGET_WIN32)
+endif (CLR_CMAKE_TARGET_WIN32)
diff --git a/src/coreclr/vm/eventing/eventpipe/CMakeLists.txt b/src/coreclr/vm/eventing/eventpipe/CMakeLists.txt
@@ -28,47 +28,6 @@ add_custom_command(OUTPUT ${GEN_EVENTPIPE_SOURCES}
   COMMAND ${GENERATE_COMMAND}
   DEPENDS ${GENERATE_SCRIPT} ${EVENT_MANIFEST} ${EVENT_EXCLUSIONS})
 
-set (CONTAINER_SOURCES "")
-set (CONTAINER_HEADERS "")
-set (EVENTPIPE_SOURCES "")
-set (EVENTPIPE_HEADERS "")
-set (CORECLR_EVENTPIPE_SHIM_SOURCES "")
-set (CORECLR_EVENTPIPE_SHIM_HEADERS "")
-
-set (SHARED_CONTAINERS_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/containers")
-set (SHARED_EVENTPIPE_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/eventpipe")
-set (CORECLR_EVENTPIPE_SHIM_SOURCE_PATH "${CORECLR_EVENTPIPE_SHIM_DIR}")
-
-include (${SHARED_CONTAINERS_SOURCE_PATH}/containers.cmake)
-include (${SHARED_EVENTPIPE_SOURCE_PATH}/eventpipe.cmake)
-
-list(APPEND EVENTPIPE_SOURCES
-  ${SHARED_EVENTPIPE_SOURCES}
-  ${SHARED_DIAGNOSTIC_SERVER_SOURCES}
-)
-
-list(APPEND EVENTPIPE_HEADERS
-  ${SHARED_EVENTPIPE_HEADERS}
-  ${SHARED_DIAGNOSTIC_SERVER_HEADERS}
-)
-
-addprefix(CONTAINER_SOURCES ${SHARED_CONTAINERS_SOURCE_PATH} "${SHARED_CONTAINER_SOURCES}")
-addprefix(CONTAINER_HEADERS ${SHARED_CONTAINERS_SOURCE_PATH} "${SHARED_CONTAINER_HEADERS}")
-
-addprefix(EVENTPIPE_SOURCES ${SHARED_EVENTPIPE_SOURCE_PATH} "${EVENTPIPE_SOURCES}")
-addprefix(EVENTPIPE_HEADERS ${SHARED_EVENTPIPE_SOURCE_PATH} "${EVENTPIPE_HEADERS}")
-
-set_source_files_properties(${SHARED_EVENTPIPE_SOURCE_PATH}/ep-sources.c PROPERTIES COMPILE_DEFINITIONS EP_FORCE_INCLUDE_SOURCE_FILES)
-set_source_files_properties(${SHARED_EVENTPIPE_SOURCE_PATH}/ds-sources.c PROPERTIES COMPILE_DEFINITIONS DS_FORCE_INCLUDE_SOURCE_FILES)
-
-set_source_files_properties(${CONTAINER_SOURCES} PROPERTIES LANGUAGE CXX)
-set_source_files_properties(${EVENTPIPE_SOURCES} PROPERTIES LANGUAGE CXX)
-
-if(CLR_CMAKE_HOST_UNIX)
-    set_source_files_properties(${CONTAINER_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)
-    set_source_files_properties(${EVENTPIPE_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)
-endif(CLR_CMAKE_HOST_UNIX)
-
 list(APPEND CORECLR_EVENTPIPE_SHIM_SOURCES
   ep-rt-coreclr.cpp
 )
@@ -81,28 +40,28 @@ list(APPEND CORECLR_EVENTPIPE_SHIM_HEADERS
   ep-rt-types-coreclr.h
 )
 
-addprefix(CORECLR_EVENTPIPE_SHIM_SOURCES ${CORECLR_EVENTPIPE_SHIM_SOURCE_PATH} "${CORECLR_EVENTPIPE_SHIM_SOURCES}")
-addprefix(CORECLR_EVENTPIPE_SHIM_HEADERS ${CORECLR_EVENTPIPE_SHIM_SOURCE_PATH} "${CORECLR_EVENTPIPE_SHIM_HEADERS}")
-
-
-list(APPEND EVENTPIPE_SOURCES
-  ${CORECLR_EVENTPIPE_SHIM_SOURCES}
-  ${CORECLR_EVENTPIPE_SHIM_HEADERS}
-  ${EVENTPIPE_HEADERS}
-  ${SHARED_EVENTPIPE_CONFIG_HEADERS}
-  ${CONTAINER_SOURCES}
-  ${CONTAINER_HEADERS}
-)
-
 add_library_clr(eventpipe_gen_objs OBJECT ${GEN_EVENTPIPE_SOURCES})
 target_precompile_headers(eventpipe_gen_objs PRIVATE [["common.h"]])
 set_target_properties(eventpipe_gen_objs PROPERTIES LINKER_LANGUAGE CXX)
 add_dependencies(eventpipe_gen_objs eventing_headers)
 
-add_library_clr(eventpipe_objs OBJECT ${EVENTPIPE_SOURCES})
-target_precompile_headers(eventpipe_objs PRIVATE [["common.h"]])
-set_target_properties(eventpipe_objs PROPERTIES LINKER_LANGUAGE CXX)
+add_library_clr(eventpipe_objs OBJECT ${CORECLR_EVENTPIPE_SHIM_SOURCES} ${CORECLR_EVENTPIPE_SHIM_HEADERS})
+set_target_properties(eventpipe_objs PROPERTIES
+    LINKER_LANGUAGE CXX
+    UNITY_BUILD ON
+    UNITY_BUILD_BATCH_SIZE 0
+)
 add_dependencies(eventpipe_objs eventing_headers)
+target_link_libraries(eventpipe_objs PRIVATE dn-diagnosticserver dn-eventpipe)
+
+# The CoreCLR EventPipe runtime is C++, but the EventPipe and DiagnosticServer sources are C.
+# Forcibly override them to build as C++.
+get_property(diagnosticserver_sources TARGET dn-diagnosticserver PROPERTY INTERFACE_SOURCES)
+get_property(eventpipe_sources TARGET dn-eventpipe PROPERTY INTERFACE_SOURCES)
+set_source_files_properties(${diagnosticserver_sources} ${eventpipe_sources} PROPERTIES LANGUAGE CXX)
+
+# Build EventPipe and DiagnosticServer as unity-builds.
+set (SHARED_EVENTPIPE_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/eventpipe")
 
 add_library(eventpipe INTERFACE)
-target_sources(eventpipe INTERFACE $<TARGET_OBJECTS:eventpipe_gen_objs> $<TARGET_OBJECTS:eventpipe_objs>)
+target_sources(eventpipe INTERFACE $<TARGET_OBJECTS:eventpipe_gen_objs> $<TARGET_OBJECTS:eventpipe_objs> $<TARGET_OBJECTS:dn-containers>)
@@ -9,6 +9,9 @@ set(MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME "diagnostics_tracing")
 set(MONO_DEBUGGER_COMPONENT_NAME "debugger")
 set(MONO_MARSHAL_ILGEN_COMPONENT_NAME "marshal-ilgen")
 
+add_subdirectory(${SHARED_CONTAINERS_SOURCE_PATH} containers)
+add_subdirectory(${SHARED_EVENTPIPE_SOURCE_PATH} eventpipe)
+
 # a list of every component.
 set(components "")
 # a list of components needed by the AOT compiler
@@ -70,7 +73,6 @@ include_directories(
 )
 
 set(${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-sources
-  ${container_sources}
   ${eventpipe_sources}
   ${diagnostic_server_sources}
   ${MONO_COMPONENT_PATH}/event_pipe.c
@@ -213,6 +215,29 @@ elseif(AOT_COMPONENTS OR (NOT DISABLE_COMPONENTS AND STATIC_COMPONENTS))
 
 endif()
 
+if (ENABLE_PERFTRACING AND "${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}" IN_LIST components_to_build)
+    # Build EventPipe and DiagnosticServer with the Mono runtime implementation as unity-builds.
+    add_library(eventpipe-mono-objects OBJECT)
+    set_target_properties(
+        eventpipe-mono-objects
+        PROPERTIES
+        UNITY_BUILD ON
+        UNITY_BUILD_BATCH_SIZE 0
+    )
+    target_link_libraries(eventpipe-mono-objects PRIVATE component_base eglib_api dn-eventpipe dn-diagnosticserver dn-diagnosticserver-pal)
+    # Link the diagnostics_tracing component to the EventPipe and DiagnosticServer libraries.
+    if (TARGET ${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-objects)
+        target_sources(${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-objects PRIVATE $<TARGET_OBJECTS:eventpipe-mono-objects> $<TARGET_OBJECTS:dn-containers>)
+        list(APPEND mono-components-objects $<TARGET_OBJECTS:eventpipe-mono-objects> $<TARGET_OBJECTS:dn-containers>)
+    endif()
+    if (TARGET mono-component-${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-static)
+        target_sources(mono-component-${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-static PRIVATE $<TARGET_OBJECTS:eventpipe-mono-objects> $<TARGET_OBJECTS:dn-containers>)
+    endif()
+    if (TARGET mono-component-${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME})
+        target_sources(mono-component-${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME} PRIVATE $<TARGET_OBJECTS:eventpipe-mono-objects> $<TARGET_OBJECTS:dn-containers>)
+    endif()
+endif()
+
 # define a list of mono-components-stubs objects that will be linked into
 # the runtime to be used as fallbacks if the dynamic components are not
 # available or when only static component stubs are requested.