Skip to content

Commit f46a79a

Browse files
authored
Merge branch 'main' into main
2 parents a5f6ba9 + 00a5ab6 commit f46a79a

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

docker/image/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ RUN apt-get update && \
4040
binutils-multiarch \
4141
clang-$llvm_version \
4242
file \
43+
cpio \
4344
gawk \
4445
git \
4546
jq \

dotnet-prepare

+4
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ function prepare_runtime {
108108
backport 51bf70e94b0c "../runtime-patches/Fix-cmakeargs-in-coreclr-proj.patch 7d562f9d2a42 2811e7c7551c"
109109
# https://github.com/dotnet/runtime/pull/93875
110110
backport 1c80769c0d6e "dc944d57c4f4 3cd64558e864"
111+
# https://github.com/dotnet/runtime/pull/107559
112+
backport ab28e0a0c263 4930e1b44027
113+
# https://github.com/dotnet/runtime/pull/110985
114+
backport a5eced487f63 1613dd360914
111115

112116
if [ -s ../runtime-patches/series ]; then
113117
rm -rf .pc

0 commit comments

Comments
 (0)