Merge

.config/dotnet-tools.json

@@ -3,25 +3,25 @@
   "isRoot": true,
   "tools": {
     "coverlet.console": {
-      "version": "1.7.2",
+      "version": "3.1.2",
       "commands": [
         "coverlet"
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "4.5.8",
+      "version": "5.0.2",
       "commands": [
         "reportgenerator"
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "1.0.0-prerelease.21561.1",
+      "version": "1.0.0-prerelease.22375.5",
       "commands": [
         "xharness"
       ]
     },
     "microsoft.visualstudio.slngen.tool": {
-      "version": "6.3.0",
+      "version": "8.1.6",
       "commands": [
         "slngen"
       ]

.devcontainer/Dockerfile

@@ -1,12 +1,48 @@
 # 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: 5.0, 3.1, 2.1
-ARG VARIANT="5.0"
+# [Choice] .NET version: 6.0, 5.0, 3.1, 2.1
+ARG VARIANT="6.0-focal"
 FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
 
-# Set up machine requirements to build the repo
+# Setup the gh (GitHub) CLI signing key.
+RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
+    chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg && \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+
+# 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-9 clang-9 \
+    && apt-get -y install --no-install-recommends cmake llvm-10 clang-10 \
         build-essential python curl git lldb-6.0 liblldb-6.0-dev \
         libunwind8 libunwind8-dev gettext libicu-dev liblttng-ust-dev \
-        libssl-dev libnuma-dev libkrb5-dev zlib1g-dev ninja-build
+        libssl-dev libnuma-dev libkrb5-dev zlib1g-dev ninja-build \
+        gh
+
+# Install V8 Engine
+SHELL ["/bin/bash", "-c"]
+
+RUN curl -sSL "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/linux/chromium-v8/v8-linux64-rel-8.5.183.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

.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
 	"name": "C# (.NET)",
 	"build": {
 		"dockerfile": "Dockerfile",
-		"args": { 
+		"args": {
 			// Update 'VARIANT' to pick a .NET Core version: 2.1, 3.1, 5.0
 			"VARIANT": "5.0",
 		}
@@ -32,11 +32,22 @@
 
 	// 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:${containerEnv:PATH}",
-		"DOTNET_MULTILEVEL_LOOKUP": "0"
+		"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/wasm/emsdk",
 	},
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode"
+	"remoteUser": "vscode",
+
+	// Forward mono samples port
+	"forwardPorts": [8000],
+	"portsAttributes": {
+		"8000": {
+			"label": "mono wasm samples (8000)",
+		}
+	}
 }

.devcontainer/scripts/onCreateCommand.sh

@@ -7,5 +7,13 @@ set -e
 # restore libs tests so that the project is ready to be loaded by OmniSharp
 ./build.sh libs.tests -restore
 
+# prebuild for WASM, so it is ready for wasm development
+make -C src/mono/wasm provision-wasm
+export EMSDK_PATH=$PWD/src/mono/wasm/emsdk
+./build.sh mono+libs -os Browser -c release
+
+# install dotnet-serve for running wasm samples
+./dotnet.sh tool install dotnet-serve --tool-path ./.dotnet-tools-global
+
 # save the commit hash of the currently built assemblies, so developers know which version was built
 git rev-parse HEAD > ./artifacts/prebuild.sha

.editorconfig

@@ -12,11 +12,8 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 
-[project.json]
-indent_size = 2
-
 # Generated code
-[*{_AssemblyInfo.cs,.notsupported.cs}]
+[*{_AssemblyInfo.cs,.notsupported.cs,AsmOffsets.cs}]
 generated_code = true
 
 # C# files

.gitattributes

@@ -75,3 +75,4 @@ src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/revcomp-
 src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/revcomp-input25000.txt text eol=lf
 src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/knucleotide-input.txt text eol=lf
 src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/knucleotide-input-big.txt text eol=lf
+src/mono/wasm/runtime/dotnet.d.ts text eol=lf

.github/CODEOWNERS

@@ -10,14 +10,18 @@
 /src/coreclr/inc/corinfo.h @dotnet/jit-contrib
 /src/coreclr/inc/corjit.h @dotnet/jit-contrib
 /src/coreclr/jit/ @dotnet/jit-contrib
+/src/coreclr/nativeaot @MichalStrehovsky
 /src/coreclr/tools/Common @dotnet/crossgen-contrib @MichalStrehovsky
 /src/coreclr/tools/aot @dotnet/crossgen-contrib
+/src/coreclr/tools/aot/ILCompiler.Compiler @MichalStrehovsky
+/src/coreclr/tools/aot/ILCompiler.RyuJit @MichalStrehovsky
+/src/coreclr/tools/aot/ILCompiler.MetadataTransform @MichalStrehovsky
 
 # Mono Code Owners
 
 /src/mono @marek-safar
 
-/src/mono/llvm @vargaz @SamMonoRT @imhameed @EgorBo
+/src/mono/llvm @vargaz @SamMonoRT
 
 /src/mono/mono/arch @vargaz
 /src/mono/mono/eglib @vargaz @lambdageek
@@ -30,13 +34,15 @@
 /src/mono/mono/metadata/thread* @lateralusX @lambdageek
 /src/mono/mono/metadata/w32* @lateralusX @lambdageek
 
-/src/mono/mono/mini @vargaz @lambdageek @SamMonoRT @imhameed
+/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 @imhameed
-/src/mono/mono/mini/*llvm* @vargaz @imhameed @EgorBo
+/src/mono/mono/mini/*exceptions* @vargaz @BrzVlad
+/src/mono/mono/mini/*llvm* @vargaz
 /src/mono/mono/mini/*ppc* @vargaz
 /src/mono/mono/mini/*profiler* @BrzVlad @lambdageek
-/src/mono/mono/mini/*riscv* @alexrp
+/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
@@ -49,12 +55,33 @@
 /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-merp* @lambdageek @naricc @imhameed
-/src/mono/mono/utils/mono-state* @lambdageek
 /src/mono/mono/utils/mono-threads* @lambdageek @vargaz
 
 /src/mono/dlls @thaystg @lambdageek
 
+/src/native/public/mono @marek-safar @lambdageek
+
+/src/libraries/sendtohelix-wasm.targets @radical
+/src/mono/wasm @lewing @pavelsavara
+/src/mono/wasm/debugger @thaystg @radical
+/src/mono/wasm/build @radical
+/src/mono/sample/wasm @lewing @pavelsavara
+/src/libraries/System.Runtime.InteropServices.JavaScript @lewing @pavelsavara
+
+/src/mono/nuget/*WebAssembly*/ @lewing @radical
+/src/mono/nuget/*MonoTargets*/ @lewing @radical
+/src/mono/nuget/*BrowserDebugHost*/ @lewing @radical
+/src/mono/nuget/*Workload.Mono.Toolchain*/ @lewing @radical
+/src/mono/nuget/*MonoAOTCompiler*/ @lewing @radical
+
+/src/tests/BuildWasmApps/ @radical
+/src/tasks/WasmAppBuilder/ @radical
+/src/tasks/WorkloadBuildTasks/ @radical
+/src/tasks/AotCompilerTask/ @radical
+/src/tasks/WasmBuildTasks/ @radical
+
+/eng/pipelines/**/*wasm* @radical
+
 # Obsoletions / Custom Diagnostics
 
 /docs/project/list-of-diagnostics.md                @jeffhandley

.github/ISSUE_TEMPLATE/02_api_proposal.yml

@@ -25,34 +25,33 @@ body:
         You may find the [Framework Design Guidelines](https://github.com/dotnet/runtime/blob/main/docs/coding-guidelines/framework-design-guidelines-digest.md) helpful.
       placeholder: API declaration (no method bodies)
       value: |
-        ```C#
-        namespace System.Collections.Generic
+        ```csharp
+        namespace System.Collections.Generic;
+
+        public class MyFancyCollection<T> : IEnumerable<T>
         {
-            public class MyFancyCollection<T> : IEnumerable<T>
-            {
-                public void Fancy(T item);
-            }
+            public void Fancy(T item);
         }
-        ```     
+        ```
     validations:
       required: true
   - type: textarea
     id: api-usage
     attributes:
       label: API Usage
       description: |
-        Please provide code examples that highlight how the proposed API additions are meant to be consumed. This will help suggest whether the API has the right shape to be functional, performant and useable.
+        Please provide code examples that highlight how the proposed API additions are meant to be consumed. This will help suggest whether the API has the right shape to be functional, performant and usable.
       placeholder: API usage
       value: |
-        ```C#
+        ```csharp
         // Fancy the value
         var c = new MyFancyCollection<int>();
         c.Fancy(42);
 
         // Getting the values out
         foreach (var v in c)
             Console.WriteLine(v);
-        ```     
+        ```
     validations:
       required: true
   - type: textarea

.github/PULL_REQUEST_TEMPLATE/servicing_pull_request_template.md

@@ -21,3 +21,8 @@ main PR <!-- Link to PR if any that fixed this in the main branch. -->
 # Risk
 
 <!-- Please assess the risk of taking this fix. Provide details backing up your assessment. -->
+
+# Package authoring signed off?
+
+
+IMPORTANT: If this change touches code that ships in a NuGet package, please make certain that you have added any necessary [package authoring](https://github.com/dotnet/runtime/blob/main/docs/project/library-servicing.md) and gotten it explicitly reviewed.