Skip to content

Commit

Permalink
Merge pull request #2543 from yowl/merge-apr-24
Browse files Browse the repository at this point in the history
[NativeAOT-LLVM] Merge apr 24
  • Loading branch information
jkotas authored Apr 23, 2024
2 parents 4440d34 + 65f5b4a commit 4a2148f
Show file tree
Hide file tree
Showing 3,570 changed files with 195,624 additions and 146,503 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 10 additions & 0 deletions .CodeQL.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file configures CodeQL runs and TSA bug autofiling. For more information, see:
# https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/codeql/troubleshooting/bugs/generated-library-code
# (Access restricted to Microsoft employees only.)

path_classifiers:
refs:
# The ref/ directories don't contain shipping implementations of code, so they should
# be excluded from analysis. If there is a problem at the API layer, the analysis
# engine will detect the problem in the src/ implementations anyway.
- src/libraries/**/ref/*
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "9.0.0-prerelease.24077.1",
"version": "9.0.0-prerelease.24203.1",
"commands": [
"xharness"
]
Expand Down
3 changes: 2 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
libssl-dev \
libkrb5-dev \
zlib1g-dev \
ninja-build
ninja-build \
tzdata
32 changes: 25 additions & 7 deletions .devcontainer/scripts/onCreateCommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@

set -e

function wasm_common() {
# prebuild for WASM, so it is ready for wasm development
make -C src/mono/browser provision-wasm
export EMSDK_PATH=$PWD/src/mono/browser/emsdk
case "$1" in
wasm)
# Put your common commands for wasm here
./build.sh mono+libs -os browser -c Release
;;
wasm-multithreaded)
# Put your common commands for wasm-multithread here
./build.sh mono+libs -os browser -c Release /p:WasmEnableThreads=true
;;
*)
# install dotnet-serve for running wasm samples
./dotnet.sh tool install dotnet-serve --version 1.10.172 --tool-path ./.dotnet-tools-global
;;
esac
}

opt=$1
case "$opt" in

Expand All @@ -20,15 +40,13 @@ case "$opt" in
;;

wasm)
# prebuild for WASM, so it is ready for wasm development
make -C src/mono/browser provision-wasm
export EMSDK_PATH=$PWD/src/mono/browser/emsdk
./build.sh mono+libs -os browser -c Release
wasm_common $opt
;;

# install dotnet-serve for running wasm samples
./dotnet.sh tool install dotnet-serve --version 1.10.172 --tool-path ./.dotnet-tools-global
wasm-multithreaded)
wasm_common $opt
;;
esac

# save the commit hash of the currently built assemblies, so developers know which version was built
git rev-parse HEAD > ./artifacts/prebuild.sha
git rev-parse HEAD > ./artifacts/prebuild.sha
2 changes: 1 addition & 1 deletion .devcontainer/scripts/postCreateCommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ case "$opt" in
esac

# reset the repo to the commit hash that was used to build the prebuilt Codespace
git reset --hard $(cat ./artifacts/prebuild.sha)
git reset --hard $(cat ./artifacts/prebuild.sha)
60 changes: 60 additions & 0 deletions .devcontainer/wasm-multiThreaded/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile
# For details on dotnet specific container, see: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet

# [Choice] .NET version: 6.0, 7.0
ARG VARIANT="6.0-jammy"
FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT}

# Set up machine requirements to build the repo and the gh CLI
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends \
cmake \
llvm \
clang \
build-essential \
python3 \
curl \
git \
lldb \
liblldb-dev \
libunwind8 \
libunwind8-dev \
gettext \
libicu-dev \
liblttng-ust-dev \
libssl-dev \
libkrb5-dev \
zlib1g-dev \
ninja-build

SHELL ["/bin/bash", "-c"]

# Install LTS npm and node
RUN source /usr/local/share/nvm/nvm.sh && nvm install --lts

# Install V8 Engine
RUN curl -sSL "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/linux/chromium-v8/v8-linux64-rel-10.8.168.zip" -o ./v8.zip \
&& unzip ./v8.zip -d /usr/local/v8 \
&& echo $'#!/usr/bin/env bash\n\
"/usr/local/v8/d8" --snapshot_blob="/usr/local/v8/snapshot_blob.bin" "$@"\n' > /usr/local/bin/v8 \
&& chmod +x /usr/local/bin/v8

# install chromium dependencies to run debugger tests:
RUN sudo apt-get install libnss3 -y \
&& apt-get install libatk1.0-0 -y \
&& apt-get install libatk-bridge2.0-0 -y \
&& apt-get install libcups2 -y \
&& apt-get install libdrm2 -y \
&& apt-get install libxkbcommon-x11-0 -y \
&& apt-get install libxcomposite-dev -y \
&& apt-get install libxdamage1 -y \
&& apt-get install libxrandr2 -y \
&& apt-get install libgbm-dev -y \
&& apt-get install libpango-1.0-0 -y \
&& apt-get install libcairo2 -y \
&& apt-get install libasound2 -y

# install firefox dependencies to run debugger tests:
RUN sudo apt-get install libdbus-glib-1-2 -y \
&& apt-get install libgtk-3-0 -y \
&& apt-get install libx11-xcb-dev -y
66 changes: 66 additions & 0 deletions .devcontainer/wasm-multiThreaded/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
// For format details, see https://aka.ms/devcontainer.json.
{
"name": "WASM multithreaded development (prebuilt)",
"build": {
"dockerfile": "Dockerfile",
"args": {
// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
"VARIANT": "6.0-jammy"
}
},
"hostRequirements": {
"cpus": 4,
"memory": "8gb",
"storage": "40gb"
},

"features": {
"ghcr.io/devcontainers/features/github-cli:1": {}
},

// Configure tool-specific properties.
"customizations": {
// Configure properties specific to VS Code.
"vscode": {
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-dotnettools.csharp"
],
"settings": {
// Loading projects on demand is better for larger codebases
"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
"omnisharp.enableRoslynAnalyzers": true,
"omnisharp.enableEditorConfigSupport": true,
"omnisharp.enableAsyncCompletion": true,
"omnisharp.testRunSettings": "${containerWorkspaceFolder}/artifacts/obj/vscode/.runsettings"
}
}
},

// Use 'onCreateCommand' to run pre-build commands inside the codespace
"onCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/onCreateCommand.sh wasm-multithreaded",

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/postCreateCommand.sh wasm-multithreaded",

// Add the locally installed dotnet to the path to ensure that it is activated
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
// Add the global tools dir to the PATH so that globally installed tools will work
"remoteEnv": {
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}",
"DOTNET_MULTILEVEL_LOOKUP": "0",
// Path to provisioned Emscripten SDK, for rebuilding the wasm runtime
"EMSDK_PATH": "${containerWorkspaceFolder}/src/mono/browser/emsdk",
},

// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode",

// Forward mono samples port
"forwardPorts": [8000],
"portsAttributes": {
"8000": {
"label": "mono wasm samples (8000)",
}
}
}
7 changes: 4 additions & 3 deletions .devcontainer/wasm/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// For format details, see https://aka.ms/devcontainer.json.
{
"name": "WASM development (prebuilt)",
"name": "WASM singlethreaded development (prebuilt)",
"build": {
"dockerfile": "Dockerfile",
"args": {
Expand All @@ -10,7 +10,8 @@
},
"hostRequirements": {
"cpus": 4,
"memory": "8gb"
"memory": "8gb",
"storage": "40gb"
},

"features": {
Expand Down Expand Up @@ -40,7 +41,7 @@
"onCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/onCreateCommand.sh wasm",

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/postCreateCommand.sh",
"postCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/postCreateCommand.sh wasm",

// Add the locally installed dotnet to the path to ensure that it is activated
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
Expand Down
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ dotnet_style_readonly_field = true:suggestion
# Expression-level preferences
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_prefer_collection_expression = when_types_exactly_match
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion
Expand Down
46 changes: 23 additions & 23 deletions .github/CODEOWNERS-stop-notifications
Original file line number Diff line number Diff line change
Expand Up @@ -21,43 +21,43 @@

/src/mono @marek-safar

/src/mono/llvm @vargaz @SamMonoRT
/src/mono/llvm @lambdageek @steveisok

/src/mono/mono/arch @vargaz
/src/mono/mono/eglib @vargaz @lambdageek
/src/mono/mono/arch @lambdageek @steveisok
/src/mono/mono/eglib @lambdageek @steveisok

/src/mono/mono/metadata @vargaz @lambdageek @thaystg
/src/mono/mono/metadata @lambdageek @thaystg
/src/mono/mono/metadata/*-win* @lateralusX @lambdageek
/src/mono/mono/metadata/handle* @lambdageek @vargaz
/src/mono/mono/metadata/monitor* @brzvlad @vargaz
/src/mono/mono/metadata/sgen* @brzvlad @vargaz @lambdageek
/src/mono/mono/metadata/handle* @lambdageek @steveisok
/src/mono/mono/metadata/monitor* @brzvlad @steveisok
/src/mono/mono/metadata/sgen* @brzvlad @lambdageek
/src/mono/mono/metadata/thread* @lateralusX @lambdageek
/src/mono/mono/metadata/w32* @lateralusX @lambdageek

/src/mono/mono/eventpipe @lateralusX @lambdageek

/src/mono/mono/mini @vargaz @lambdageek @SamMonoRT
/src/mono/mono/mini/*cfgdump* @vargaz
/src/mono/mono/mini/*exceptions* @vargaz @BrzVlad
/src/mono/mono/mini/*llvm* @vargaz @fanyang-mono
/src/mono/mono/mini/*ppc* @vargaz
/src/mono/mono/mini @lambdageek @steveisok
/src/mono/mono/mini/*cfgdump* @lambdageek
/src/mono/mono/mini/*exceptions* @BrzVlad
/src/mono/mono/mini/*llvm* @fanyang-mono @steveisok
/src/mono/mono/mini/*ppc* @lambdageek
/src/mono/mono/mini/*profiler* @BrzVlad @lambdageek
/src/mono/mono/mini/*riscv* @vargaz @lambdageek
/src/mono/mono/mini/*type-check* @lambdageek
/src/mono/mono/mini/debugger-agent.c @vargaz @thaystg @lambdageek
/src/mono/mono/mini/interp/* @BrzVlad @vargaz @kotlarmilos
/src/mono/mono/mini/*riscv* @lambdageek @steveisok
/src/mono/mono/mini/*type-check* @lambdageek @steveisok
/src/mono/mono/mini/debugger-agent.c @thaystg @lambdageek
/src/mono/mono/mini/interp/* @BrzVlad @kotlarmilos
/src/mono/mono/mini/interp/*jiterp* @kg
/src/mono/mono/mini/*simd* @fanyang-mono

/src/mono/mono/profiler @BrzVlad @lambdageek
/src/mono/mono/sgen @BrzVlad @lambdageek @SamMonoRT
/src/mono/mono/sgen @BrzVlad @lambdageek

/src/mono/mono/utils @vargaz @lambdageek
/src/mono/mono/utils @lambdageek @steveisok
/src/mono/mono/utils/*-win* @lateralusX @lambdageek
/src/mono/mono/utils/atomic* @vargaz
/src/mono/mono/utils/mono-hwcap* @vargaz
/src/mono/mono/utils/mono-mem* @vargaz
/src/mono/mono/utils/mono-threads* @lambdageek @vargaz
/src/mono/mono/utils/atomic* @lambdageek @steveisok
/src/mono/mono/utils/mono-hwcap* @lambdageek
/src/mono/mono/utils/mono-mem* @lambdageek @steveisok
/src/mono/mono/utils/mono-threads* @lambdageek

/src/mono/dlls @thaystg @lambdageek

Expand Down Expand Up @@ -112,4 +112,4 @@
# Area ownership and repo automation
/docs/area-owners.* @jeffhandley
/docs/issue*.md @jeffhandley
/.github/fabricbot.json @jeffhandley
/.github/policies/ @jeffhandley @mkArtakMSFT
File renamed without changes.
32 changes: 0 additions & 32 deletions .github/ISSUE_TEMPLATE/04_ci_known_issue.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ contact_links:
- name: Issue with WPF
url: https://github.com/dotnet/wpf/issues/new/choose
about: Please open issues relating to WPF in dotnet/wpf.
- name: CI Known Issue Report
url: https://helix.dot.net/BuildAnalysis/CreateKnownIssues
about: Use the helper to create a Known Issue in CI if failures in your runs are unrelated to your change. See [Failure Analysis](https://github.com/dotnet/runtime/blob/main/docs/workflow/ci/failure-analysis.md#what-to-do-if-you-determine-the-failure-is-unrelated) for triage instructions.
Loading

0 comments on commit 4a2148f

Please sign in to comment.