Skip to content

Commit a4ca1df

Browse files
radekdoulikradekdoulik
authored
Merge branch 'main' into pr-enable-skiasharp-tests-again
2 parents e320fd6 + 598d5f7 commit a4ca1df

File tree

321 files changed

+5492
-5481
lines changed

Some content is hidden

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

321 files changed

+5492
-5481
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "10.0.0-prerelease.24524.3",
18+
"version": "10.0.0-prerelease.24524.9",
1919
"commands": [
2020
"xharness"
2121
]

‎.devcontainer/Dockerfile‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
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, 7.0
5-
ARG VARIANT="6.0-jammy"
6-
FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT}
7-
8-
# Set up machine requirements to build the repo and the gh CLI
9-
# Clang-16 up is required but Ubuntu 22.04 comes with clang-14 highest, so add clang-18 sources
10-
RUN apt-get update \
11-
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - \
12-
&& apt-get install software-properties-common -y \
13-
&& add-apt-repository "deb http://apt.llvm.org/$(lsb_release -s -c)/ llvm-toolchain-$(lsb_release -s -c)-18 main" -y \
14-
&& apt-get update \
15-
&& apt-get install clang-18 -y
4+
ARG VARIANT="8.0-noble"
5+
FROM mcr.microsoft.com/devcontainers/dotnet:${VARIANT}
166

177
# Set up machine requirements to build the repo and the gh CLI
188
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
199
&& apt-get -y install --no-install-recommends \
10+
clang \
2011
cmake \
2112
build-essential \
2213
python3 \
2314
curl \
2415
git \
2516
lldb \
17+
llvm \
2618
liblldb-dev \
2719
libunwind8 \
2820
libunwind8-dev \

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
"build": {
55
"dockerfile": "Dockerfile",
66
"args": {
7-
// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
8-
"VARIANT": "6.0-jammy"
7+
"VARIANT": "8.0-noble"
98
}
109
},
1110
"hostRequirements": {

‎.devcontainer/libraries/devcontainer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
"build": {
55
"dockerfile": "../Dockerfile",
66
"args": {
7-
// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
8-
"VARIANT": "6.0-jammy"
7+
"VARIANT": "8.0-noble"
98
}
109
},
1110
"hostRequirements": {

‎.devcontainer/wasm-multiThreaded/Dockerfile‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
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, 7.0
5-
ARG VARIANT="6.0-jammy"
6-
FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT}
7-
8-
# Set up machine requirements to build the repo and the gh CLI
9-
# Clang-16 up is required but Ubuntu 22.04 comes with clang-14 highest, so add clang-18 sources
10-
RUN apt-get update \
11-
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - \
12-
&& apt-get install software-properties-common -y \
13-
&& add-apt-repository "deb http://apt.llvm.org/$(lsb_release -s -c)/ llvm-toolchain-$(lsb_release -s -c)-18 main" -y \
14-
&& apt-get update \
15-
&& apt-get install clang-18 -y
4+
ARG VARIANT="8.0-noble"
5+
FROM mcr.microsoft.com/devcontainers/dotnet:${VARIANT}
166

177
# Set up machine requirements to build the repo and the gh CLI
188
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
199
&& apt-get -y install --no-install-recommends \
10+
clang \
2011
cmake \
2112
build-essential \
2213
python3 \
2314
curl \
2415
git \
2516
lldb \
17+
llvm \
2618
liblldb-dev \
2719
libunwind8 \
2820
libunwind8-dev \
@@ -59,7 +51,7 @@ RUN sudo apt-get install libnss3 -y \
5951
&& apt-get install libgbm-dev -y \
6052
&& apt-get install libpango-1.0-0 -y \
6153
&& apt-get install libcairo2 -y \
62-
&& apt-get install libasound2 -y
54+
&& apt-get install libasound2t64 -y
6355

6456
# install firefox dependencies to run debugger tests:
6557
RUN sudo apt-get install libdbus-glib-1-2 -y \

‎.devcontainer/wasm-multiThreaded/devcontainer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
"build": {
55
"dockerfile": "Dockerfile",
66
"args": {
7-
// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
8-
"VARIANT": "6.0-jammy"
7+
"VARIANT": "8.0-noble"
98
}
109
},
1110
"hostRequirements": {

‎.devcontainer/wasm/Dockerfile‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
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, 7.0
5-
ARG VARIANT="6.0-jammy"
6-
FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT}
7-
8-
# Set up machine requirements to build the repo and the gh CLI
9-
# Clang-16 up is required but Ubuntu 22.04 comes with clang-14 highest, so add clang-18 sources
10-
RUN apt-get update \
11-
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - \
12-
&& apt-get install software-properties-common -y \
13-
&& add-apt-repository "deb http://apt.llvm.org/$(lsb_release -s -c)/ llvm-toolchain-$(lsb_release -s -c)-18 main" -y \
14-
&& apt-get update \
15-
&& apt-get install clang-18 -y
4+
ARG VARIANT="8.0-noble"
5+
FROM mcr.microsoft.com/devcontainers/dotnet:${VARIANT}
166

177
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
188
&& apt-get -y install --no-install-recommends \
9+
clang \
1910
cmake \
2011
build-essential \
2112
python3 \
2213
curl \
2314
git \
2415
lldb \
16+
llvm \
2517
liblldb-dev \
2618
libunwind8 \
2719
libunwind8-dev \
@@ -58,7 +50,7 @@ RUN sudo apt-get install libnss3 -y \
5850
&& apt-get install libgbm-dev -y \
5951
&& apt-get install libpango-1.0-0 -y \
6052
&& apt-get install libcairo2 -y \
61-
&& apt-get install libasound2 -y
53+
&& apt-get install libasound2t64 -y
6254

6355
# install firefox dependencies to run debugger tests:
6456
RUN sudo apt-get install libdbus-glib-1-2 -y \

‎.devcontainer/wasm/devcontainer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
"build": {
55
"dockerfile": "Dockerfile",
66
"args": {
7-
// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
8-
"VARIANT": "6.0-jammy"
7+
"VARIANT": "8.0-noble"
98
}
109
},
1110
"hostRequirements": {

‎.github/policies/resourceManagement.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ configuration:
700700
then:
701701
- mentionUsers:
702702
mentionees:
703-
- directhex
703+
- akoeplinger
704704
- matouskozak
705705
replyTemplate: >-
706706
Tagging subscribers to this area: ${mentionees}

0 commit comments

Comments
 (0)