From dbd9a4b35c58c195bbc7d6110e16cd8ab95fcbf3 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Wed, 29 Oct 2025 14:25:14 +0100 Subject: [PATCH 1/4] runtime pack --- eng/Subsets.props | 2 +- src/coreclr/crossgen-corelib.proj | 12 ++++++++++++ .../Microsoft.NETCore.App/Directory.Build.props | 15 +++++++++++++++ .../Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj | 4 ++-- src/native/libs/Common/JavaScript/CMakeLists.txt | 6 ++++-- .../System.Globalization.Native/CMakeLists.txt | 8 ++++++-- .../libs/System.Native.Browser/CMakeLists.txt | 4 +++- src/native/libs/System.Native/CMakeLists.txt | 12 +++++++++--- 8 files changed, 52 insertions(+), 11 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index c6430164c2e0de..4023ffcd8e8743 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -111,7 +111,7 @@ clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools - mono.emsdk+clr.native+clr.corelib+clr.tools+clr.packages+clr.crossarchtools+host.native + mono.emsdk+clr.native+clr.corelib+clr.nativecorelib+clr.tools+clr.packages+clr.crossarchtools+host.native clr.iltools+clr.packages diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj index b95536f174a5b6..037610999ff254 100644 --- a/src/coreclr/crossgen-corelib.proj +++ b/src/coreclr/crossgen-corelib.proj @@ -96,10 +96,22 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj index b5f4838ce48e20..dba66ed7018cc8 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj @@ -22,8 +22,8 @@ true - - false + + false false true true diff --git a/src/native/libs/Common/JavaScript/CMakeLists.txt b/src/native/libs/Common/JavaScript/CMakeLists.txt index 6f67600771e4ff..50abe741ce69bf 100644 --- a/src/native/libs/Common/JavaScript/CMakeLists.txt +++ b/src/native/libs/Common/JavaScript/CMakeLists.txt @@ -124,5 +124,7 @@ add_custom_target(System.Native.Browser-NpmInstall DEPENDS ${NPM_INSTALL_OUTPUTS} ) -install(FILES ${ROLLUP_OUTPUTS} DESTINATION sharedFramework COMPONENT runtime) -install(FILES "${CLR_SRC_NATIVE_DIR}/package.json" DESTINATION sharedFramework COMPONENT runtime) \ No newline at end of file +if (NOT CORERUN_LIBS_ONLY) + install(FILES ${ROLLUP_OUTPUTS} DESTINATION sharedFramework COMPONENT runtime) + install(FILES "${CLR_SRC_NATIVE_DIR}/package.json" DESTINATION sharedFramework COMPONENT runtime) +endif() diff --git a/src/native/libs/System.Globalization.Native/CMakeLists.txt b/src/native/libs/System.Globalization.Native/CMakeLists.txt index 6cb15aa0b9dce1..72952c259c44b5 100644 --- a/src/native/libs/System.Globalization.Native/CMakeLists.txt +++ b/src/native/libs/System.Globalization.Native/CMakeLists.txt @@ -196,7 +196,9 @@ endif() install (TARGETS System.Globalization.Native-Static DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs) if(CLR_CMAKE_HOST_ANDROID OR CLR_CMAKE_HOST_IOS OR CLR_CMAKE_HOST_TVOS OR CLR_CMAKE_HOST_MACCATALYST OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI) - install (TARGETS System.Globalization.Native-Static DESTINATION sharedFramework COMPONENT runtime) + if (NOT CORERUN_LIBS_ONLY) + install (TARGETS System.Globalization.Native-Static DESTINATION sharedFramework COMPONENT runtime) + endif() endif() if(NOT CLR_CMAKE_TARGET_WIN32 AND NOT CLR_CMAKE_TARGET_APPLE AND NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_LINUX_MUSL AND NOT CLR_CMAKE_TARGET_HAIKU) @@ -231,5 +233,7 @@ if((CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI) AND DEFINED CMAKE_ICU_DIR "${CMAKE_ICU_DIR}/lib/libicudata.a" ) install(FILES ${ICU_DATA_AND_LIB_FILES} DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs) - install(FILES ${ICU_DATA_AND_LIB_FILES} DESTINATION sharedFramework COMPONENT runtime) + if (NOT CORERUN_LIBS_ONLY) + install(FILES ${ICU_DATA_AND_LIB_FILES} DESTINATION sharedFramework COMPONENT runtime) + endif() endif() diff --git a/src/native/libs/System.Native.Browser/CMakeLists.txt b/src/native/libs/System.Native.Browser/CMakeLists.txt index 22725542b36f14..054ff74dd4cd25 100644 --- a/src/native/libs/System.Native.Browser/CMakeLists.txt +++ b/src/native/libs/System.Native.Browser/CMakeLists.txt @@ -12,7 +12,9 @@ add_library(System.Native.Browser-Static ) set_target_properties(System.Native.Browser-Static PROPERTIES OUTPUT_NAME System.Native.Browser CLEAN_DIRECT_OUTPUT 1) install(TARGETS System.Native.Browser-Static DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs) -install(TARGETS System.Native.Browser-Static DESTINATION sharedFramework COMPONENT runtime) +if (NOT CORERUN_LIBS_ONLY) + install(TARGETS System.Native.Browser-Static DESTINATION sharedFramework COMPONENT runtime) +endif() add_subdirectory(../Common/JavaScript common-js) add_dependencies(System.Native.Browser-Static System.Native.Browser-Rollup) diff --git a/src/native/libs/System.Native/CMakeLists.txt b/src/native/libs/System.Native/CMakeLists.txt index 31f9c21b3f73e7..7d647cb4805805 100644 --- a/src/native/libs/System.Native/CMakeLists.txt +++ b/src/native/libs/System.Native/CMakeLists.txt @@ -149,7 +149,9 @@ set_target_properties(System.Native-Static PROPERTIES OUTPUT_NAME System.Native install (TARGETS System.Native-Static DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs) if(CLR_CMAKE_HOST_ANDROID OR CLR_CMAKE_HOST_IOS OR CLR_CMAKE_HOST_TVOS OR CLR_CMAKE_HOST_MACCATALYST OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI) - install (TARGETS System.Native-Static DESTINATION sharedFramework COMPONENT runtime) + if (NOT CORERUN_LIBS_ONLY) + install (TARGETS System.Native-Static DESTINATION sharedFramework COMPONENT runtime) + endif() endif() if (CLR_CMAKE_TARGET_ARCH_WASM AND DEFINED CMAKE_TZD_DIR) @@ -164,11 +166,15 @@ if (CLR_CMAKE_TARGET_ARCH_WASM AND DEFINED CMAKE_TZD_DIR) target_compile_definitions(System.Native.TimeZoneData PRIVATE TZ_DATA_ENABLED) target_include_directories(System.Native.TimeZoneData PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/inc") install(TARGETS System.Native.TimeZoneData DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs) - install(TARGETS System.Native.TimeZoneData DESTINATION sharedFramework COMPONENT runtime) + if (NOT CORERUN_LIBS_ONLY) + install(TARGETS System.Native.TimeZoneData DESTINATION sharedFramework COMPONENT runtime) + endif() # Also add a stub to support InvariantTimezone. add_library(System.Native.TimeZoneData.Invariant STATIC pal_datetime_time_zone_data.c) add_dependencies(System.Native-Static System.Native.TimeZoneData.Invariant) install(TARGETS System.Native.TimeZoneData.Invariant DESTINATION ${STATIC_LIB_DESTINATION} COMPONENT libs) - install(TARGETS System.Native.TimeZoneData.Invariant DESTINATION sharedFramework COMPONENT runtime) + if (NOT CORERUN_LIBS_ONLY) + install(TARGETS System.Native.TimeZoneData.Invariant DESTINATION sharedFramework COMPONENT runtime) + endif() endif () From f85581c3cfd04d4af5e3728de14d7dcd64b64eec Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Thu, 30 Oct 2025 14:11:07 +0100 Subject: [PATCH 2/4] wip --- eng/pipelines/runtime.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 4b8806316afe4d..49f71621948372 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -111,7 +111,7 @@ extends: - browser_wasm_win jobParameters: nameSuffix: AllSubsets_CoreCLR - buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release + buildArgs: -s clr+libs+packs -c $(_BuildConfig) -lc Release timeoutInMinutes: 120 postBuildSteps: - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests.yml From 3d164c73993f028fa43ab9578e868185d84db05c Mon Sep 17 00:00:00 2001 From: Pavel Savara Date: Sun, 2 Nov 2025 20:00:47 +0100 Subject: [PATCH 3/4] Update src/coreclr/crossgen-corelib.proj Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/coreclr/crossgen-corelib.proj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj index 037610999ff254..c30a458f5bdbfa 100644 --- a/src/coreclr/crossgen-corelib.proj +++ b/src/coreclr/crossgen-corelib.proj @@ -106,7 +106,6 @@ - Date: Sun, 2 Nov 2025 20:05:06 +0100 Subject: [PATCH 4/4] feedback --- .../Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj index dba66ed7018cc8..69d97018166e70 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj @@ -22,8 +22,10 @@ true - - false + + false + + false false true true