Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/runtime/.github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,7 @@
/eng/pipelines/**/*wasm* @akoeplinger

# ILLink codeowners
/src/tools/illink/ @marek-safar
/src/tools/illink/src/analyzer/ @radekdoulik
/src/tools/illink/src/ILLink.Tasks/ @sbomer
/src/tools/illink/src/ILLink.RoslynAnalyzer/ @sbomer
/src/tools/illink/src/linker/ @marek-safar @mrvoorhe
/src/tools/illink/test/ @marek-safar @mrvoorhe
/src/tools/illink/ @sbomer

# Obsoletions / Custom Diagnostics

Expand Down
2 changes: 0 additions & 2 deletions src/runtime/.github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1750,7 +1750,6 @@ configuration:
- LakshanF
- sbomer
- joperezr
- marek-safar
replyTemplate: >-
Tagging subscribers to 'linkable-framework': ${mentionees}

Expand All @@ -1768,7 +1767,6 @@ configuration:
mentionees:
- eerhardt
- SamMonoRT
- marek-safar
replyTemplate: >-
Tagging subscribers to 'size-reduction': ${mentionees}

Expand Down
4 changes: 2 additions & 2 deletions src/runtime/.github/prompts/add-new-jit-ee-api.prompt.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
mode: 'agent'
tools: ['fetch', 'codebase', 'runCommands', 'usages', 'search', 'think']
agent: 'agent'
tools: ['web/fetch', 'search/codebase', 'execute/getTerminalOutput', 'execute/runInTerminal', 'read/terminalLastCommand', 'read/terminalSelection', 'search/usages', 'search', 'edit/editFiles', 'think']
description: 'Add a new API to the JIT-VM (aka JIT-EE) interface in the codebase.'
---

Expand Down
4 changes: 2 additions & 2 deletions src/runtime/.github/prompts/docs.prompt.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
mode: 'agent'
tools: ['changes', 'codebase', 'editFiles', 'problems']
agent: 'agent'
tools: ['search/changes', 'search/codebase', 'edit/editFiles', 'read/problems']
description: 'Ensure that C# types are documented with XML comments and follow best practices for documentation.'
---

Expand Down
15 changes: 15 additions & 0 deletions src/runtime/eng/native/configurecompiler.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,21 @@ include(CheckLinkerFlag)
# "configureoptimization.cmake" must be included after CLR_CMAKE_HOST_UNIX has been set.
include(${CMAKE_CURRENT_LIST_DIR}/configureoptimization.cmake)

# Validate tryrun cache version matches current Emscripten version (browser-wasm only)
if(CLR_CMAKE_TARGET_BROWSER AND DEFINED TRYRUN_BROWSER_EMSCRIPTEN_VERSION)
file(READ "${CMAKE_CURRENT_LIST_DIR}/../../src/mono/browser/emscripten-version.txt" CURRENT_EMSCRIPTEN_VERSION)
string(STRIP "${CURRENT_EMSCRIPTEN_VERSION}" CURRENT_EMSCRIPTEN_VERSION)

if(NOT TRYRUN_BROWSER_EMSCRIPTEN_VERSION STREQUAL CURRENT_EMSCRIPTEN_VERSION)
message(WARNING
"Emscripten version mismatch detected!\n"
" Current Emscripten: ${CURRENT_EMSCRIPTEN_VERSION}\n"
" Cached features for: ${TRYRUN_BROWSER_EMSCRIPTEN_VERSION}\n"
" The CMake feature cache (eng/native/tryrun.browser.cmake) may be outdated.\n"
" Consider regenerating the cache - see instructions in eng/native/tryrun.browser.cmake")
endif()
endif()

#-----------------------------------------------------
# Initialize Cmake compiler flags and other variables
#-----------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/runtime/eng/native/gen-buildsys.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ if [[ "$host_arch" == "wasm" ]]; then
fi
export EMSDK_QUIET=1 && source "$EMSDK_PATH"/emsdk_env.sh
cmake_command="emcmake $cmake_command"
# Use WASM-specific tryrun cache to speed up CMake configure
# The -C flag must be early in the command line to be effective
cmake_extra_defines="-C $scriptroot/tryrun.browser.cmake $cmake_extra_defines"
elif [[ "$target_os" == "wasi" ]]; then
if [[ -z "$WASI_SDK_PATH" ]]; then
if [[ -d "$reporoot"/artifacts/wasi-sdk ]]; then
Expand Down
Loading