diff --git a/src/coreclr/interpreter/CMakeLists.txt b/src/coreclr/interpreter/CMakeLists.txt index 6725f56d13a812..b7ec8fe1ba6ab2 100644 --- a/src/coreclr/interpreter/CMakeLists.txt +++ b/src/coreclr/interpreter/CMakeLists.txt @@ -34,7 +34,13 @@ else() add_custom_target(clrinterpreter_exports DEPENDS ${EXPORTS_FILE}) endif() -add_library_clr(clrinterpreter_objects OBJECT ${INTERPRETER_SOURCES}) +if(CLR_CMAKE_TARGET_WIN32) + set(INTERPRETER_RESOURCES Native.rc) +endif(CLR_CMAKE_TARGET_WIN32) + +convert_to_absolute_path(INTERPRETER_RESOURCES ${INTERPRETER_RESOURCES}) + +add_library_clr(clrinterpreter_objects OBJECT ${INTERPRETER_SOURCES} ${INTERPRETER_RESOURCES}) if (NOT CMAKE_GENERATOR MATCHES "Visual Studio") set_target_properties(clrinterpreter_objects PROPERTIES EXCLUDE_FROM_ALL $) @@ -46,6 +52,10 @@ else() add_library_clr(clrinterpreter STATIC $ $) endif() +if(CLR_CMAKE_TARGET_WIN32) + target_compile_definitions(clrinterpreter_objects PRIVATE FX_VER_INTERNALNAME_STR=clrinterpreter.dll) +endif(CLR_CMAKE_TARGET_WIN32) + target_include_directories(clrinterpreter INTERFACE "interpreter/inc") if (NOT CMAKE_GENERATOR MATCHES "Visual Studio") diff --git a/src/coreclr/interpreter/Native.rc b/src/coreclr/interpreter/Native.rc new file mode 100644 index 00000000000000..6aaafcddcacd1f --- /dev/null +++ b/src/coreclr/interpreter/Native.rc @@ -0,0 +1,7 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +#define FX_VER_FILEDESCRIPTION_STR ".NET Runtime Just-In-Time Compiler" + +#include +#include diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props index f64d11dfae3551..9a1e7d98c8e10f 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props @@ -22,6 +22,7 @@ +