Skip to content

Commit

Permalink
Merge pull request #6 from bflattened/merge-main
Browse files Browse the repository at this point in the history
Merge from dotnet/runtime
  • Loading branch information
MichalStrehovsky authored Feb 28, 2022
2 parents f88fb05 + 4fbb90f commit 7e18635
Show file tree
Hide file tree
Showing 1,862 changed files with 33,570 additions and 35,593 deletions.
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.22114.1",
"version": "1.0.0-prerelease.22121.1",
"commands": [
"xharness"
]
},
"microsoft.visualstudio.slngen.tool": {
"version": "6.3.0",
"version": "8.1.6",
"commands": [
"slngen"
]
Expand Down
17 changes: 16 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,19 @@ RUN curl -sSL "https://netcorenativeassets.blob.core.windows.net/resource-packag
&& 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
&& 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
2 changes: 2 additions & 0 deletions .gh-original/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@

/src/mono/dlls @thaystg @lambdageek

/src/native/public/mono @marek-safar @lambdageek

# Obsoletions / Custom Diagnostics

/docs/project/list-of-diagnostics.md @jeffhandley
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Loading

0 comments on commit 7e18635

Please sign in to comment.