Skip to content

Commit 2dd26dd

Browse files
markplesmarkples
committed
Merge remote-tracking branch 'dotnet/main' into finalize-segments
2 parents 9a96694 + f75057f commit 2dd26dd

File tree

8,103 files changed

+307560
-183619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

8,103 files changed

+307560
-183619
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "8.0.0-prerelease.23307.1",
18+
"version": "8.0.0-prerelease.23431.1",
1919
"commands": [
2020
"xharness"
2121
]
2222
},
2323
"microsoft.visualstudio.slngen.tool": {
24-
"version": "8.5.17",
24+
"version": "10.0.0",
2525
"commands": [
2626
"slngen"
2727
]

‎.devcontainer/libraries/Dockerfile‎ renamed to ‎.devcontainer/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile
22
# For details on dotnet specific container, see: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet
33

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

88
# Set up machine requirements to build the repo and the gh CLI
99
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
1010
&& apt-get -y install --no-install-recommends \
1111
cmake \
12-
llvm-10 \
13-
clang-10 \
12+
llvm \
13+
clang \
1414
build-essential \
15-
python \
15+
python3 \
1616
curl \
1717
git \
18-
lldb-6.0 \
19-
liblldb-6.0-dev \
18+
lldb \
19+
liblldb-dev \
2020
libunwind8 \
2121
libunwind8-dev \
2222
gettext \

‎.devcontainer/devcontainer.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// For format details, see https://aka.ms/devcontainer.json.
2+
{
3+
"name": "Standard configuration",
4+
"build": {
5+
"dockerfile": "Dockerfile",
6+
"args": {
7+
// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
8+
"VARIANT": "6.0-jammy"
9+
}
10+
},
11+
"hostRequirements": {
12+
"cpus": 4,
13+
"memory": "8gb"
14+
},
15+
16+
"features": {
17+
"ghcr.io/devcontainers/features/github-cli:1": {}
18+
},
19+
20+
// Configure tool-specific properties.
21+
"customizations": {
22+
// Configure properties specific to VS Code.
23+
"vscode": {
24+
// Add the IDs of extensions you want installed when the container is created.
25+
"extensions": [
26+
"ms-dotnettools.csharp"
27+
],
28+
"settings": {
29+
// Loading projects on demand is better for larger codebases
30+
"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
31+
"omnisharp.enableRoslynAnalyzers": true,
32+
"omnisharp.enableEditorConfigSupport": true,
33+
"omnisharp.enableAsyncCompletion": true,
34+
"omnisharp.testRunSettings": "${containerWorkspaceFolder}/artifacts/obj/vscode/.runsettings"
35+
}
36+
}
37+
},
38+
39+
// Add the locally installed dotnet to the path to ensure that it is activated
40+
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
41+
"remoteEnv": {
42+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
43+
"DOTNET_MULTILEVEL_LOOKUP": "0"
44+
},
45+
46+
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
47+
"remoteUser": "vscode"
48+
}

‎.devcontainer/libraries/devcontainer.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
// For format details, see https://aka.ms/devcontainer.json.
22
{
3-
"name": "C# (.NET)",
3+
"name": "Libraries/Runtime development (prebuilt)",
44
"build": {
5-
"dockerfile": "Dockerfile",
5+
"dockerfile": "../Dockerfile",
66
"args": {
7-
// Update 'VARIANT' to pick a .NET Core version: 3.1, 6.0
8-
// Append -bullseye or -focal to pin to an OS version.
9-
"VARIANT": "6.0-focal"
7+
// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
8+
"VARIANT": "6.0-jammy"
109
}
1110
},
1211
"hostRequirements": {

‎.devcontainer/scripts/onCreateCommand.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ case "$opt" in
1919
./build.sh mono+libs -os browser -c Release
2020

2121
# install dotnet-serve for running wasm samples
22-
./dotnet.sh tool install dotnet-serve --tool-path ./.dotnet-tools-global
22+
./dotnet.sh tool install dotnet-serve --version 1.10.172 --tool-path ./.dotnet-tools-global
2323
;;
2424
esac
2525

‎.devcontainer/wasm/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile
22
# For details on dotnet specific container, see: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet
33

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

88
# Set up machine requirements to build the repo and the gh CLI
99
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
1010
&& apt-get -y install --no-install-recommends \
1111
cmake \
12-
llvm-10 \
13-
clang-10 \
12+
llvm \
13+
clang \
1414
build-essential \
15-
python \
15+
python3 \
1616
curl \
1717
git \
18-
lldb-6.0 \
19-
liblldb-6.0-dev \
18+
lldb \
19+
liblldb-dev \
2020
libunwind8 \
2121
libunwind8-dev \
2222
gettext \

‎.devcontainer/wasm/devcontainer.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
// For format details, see https://aka.ms/devcontainer.json.
22
{
3-
"name": "C# (.NET)",
3+
"name": "WASM development (prebuilt)",
44
"build": {
55
"dockerfile": "Dockerfile",
66
"args": {
7-
// Update 'VARIANT' to pick a .NET Core version: 3.1, 6.0
8-
// Append -bullseye or -focal to pin to an OS version.
9-
"VARIANT": "6.0-focal"
7+
// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
8+
"VARIANT": "6.0-jammy"
109
}
1110
},
1211
"hostRequirements": {

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
*.png binary
1717
*.gif binary
1818

19+
*.lss text
20+
1921
# Force bash scripts to always use lf line endings so that if a repo is accessed
2022
# in Unix via a file share from Windows, the scripts will work.
2123
*.in text eol=lf

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,15 @@
3939
/src/mono/mono/mini @vargaz @lambdageek @SamMonoRT
4040
/src/mono/mono/mini/*cfgdump* @vargaz
4141
/src/mono/mono/mini/*exceptions* @vargaz @BrzVlad
42-
/src/mono/mono/mini/*llvm* @vargaz
42+
/src/mono/mono/mini/*llvm* @vargaz @fanyang-mono
4343
/src/mono/mono/mini/*ppc* @vargaz
4444
/src/mono/mono/mini/*profiler* @BrzVlad @lambdageek
4545
/src/mono/mono/mini/*riscv* @vargaz @lambdageek
4646
/src/mono/mono/mini/*type-check* @lambdageek
4747
/src/mono/mono/mini/debugger-agent.c @vargaz @thaystg @lambdageek
4848
/src/mono/mono/mini/interp/* @BrzVlad @vargaz @kotlarmilos
4949
/src/mono/mono/mini/interp/*jiterp* @kg
50+
/src/mono/mono/mini/*simd* @fanyang-mono
5051

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

‎.github/fabricbot.json‎

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,15 @@
5959
"vargaz"
6060
]
6161
},
62+
{
63+
"labels": [
64+
"area-Codegen-Intrinsics-mono"
65+
],
66+
"mentionees": [
67+
"SamMonoRT",
68+
"fanyang-mono"
69+
]
70+
},
6271
{
6372
"labels": [
6473
"area-CodeGen-meta-Mono"
@@ -218,7 +227,7 @@
218227
},
219228
{
220229
"labels": [
221-
"area-ILVerification"
230+
"area-Tools-ILVerification"
222231
],
223232
"mentionees": [
224233
"JulieLeeMSFT"
@@ -1029,7 +1038,8 @@
10291038
],
10301039
"mentionees": [
10311040
"steveisok",
1032-
"akoeplinger"
1041+
"akoeplinger",
1042+
"kotlarmilos"
10331043
]
10341044
}
10351045
],
@@ -2130,6 +2140,18 @@
21302140
"label": "area-Tools-ILLink"
21312141
}
21322142
},
2143+
{
2144+
"name": "hasLabel",
2145+
"parameters": {
2146+
"label": "area-Interop-coreclr"
2147+
}
2148+
},
2149+
{
2150+
"name": "hasLabel",
2151+
"parameters": {
2152+
"label": "area-System.Runtime.InteropServices"
2153+
}
2154+
},
21332155
{
21342156
"name": "labelAdded",
21352157
"parameters": {
@@ -2165,6 +2187,18 @@
21652187
"parameters": {
21662188
"label": "area-Tools-ILLink"
21672189
}
2190+
},
2191+
{
2192+
"name": "labelAdded",
2193+
"parameters": {
2194+
"label": "area-Interop-coreclr"
2195+
}
2196+
},
2197+
{
2198+
"name": "labelAdded",
2199+
"parameters": {
2200+
"label": "area-System.Runtime.InteropServices"
2201+
}
21682202
}
21692203
]
21702204
},
@@ -20563,4 +20597,4 @@
2056320597
}
2056420598
}
2056520599
}
20566-
]
20600+
]

0 commit comments

Comments
 (0)