diff --git a/externals/depot_tools b/externals/depot_tools index f44f219157..ecad42cb6a 160000 --- a/externals/depot_tools +++ b/externals/depot_tools @@ -1 +1 @@ -Subproject commit f44f219157806286070c06d4e46909f51013f379 +Subproject commit ecad42cb6a9b53bbe98f9a06d37dbfbaf7129881 diff --git a/externals/skia b/externals/skia index e9d4ecc80e..c16e913577 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit e9d4ecc80e680cffd5595e56c8709a6231c79045 +Subproject commit c16e913577083761d847146db7a04b8d3b3bf755 diff --git a/scripts/Docker/debian/amd64/Dockerfile b/scripts/Docker/debian/amd64/Dockerfile index 561574e468..4b7a51144e 100644 --- a/scripts/Docker/debian/amd64/Dockerfile +++ b/scripts/Docker/debian/amd64/Dockerfile @@ -1,7 +1,7 @@ # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 8.0 | * ] -FROM amd64/debian:10 +FROM amd64/debian:11 # Install the required packages RUN apt-get update \ diff --git a/scripts/Docker/debian/arm64v8/Dockerfile b/scripts/Docker/debian/arm64v8/Dockerfile index 51f7ba72fd..5a43b8592c 100644 --- a/scripts/Docker/debian/arm64v8/Dockerfile +++ b/scripts/Docker/debian/arm64v8/Dockerfile @@ -1,7 +1,7 @@ # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 8.0 | * ] -FROM arm64v8/debian:10 +FROM arm64v8/debian:11 # Install the required packages RUN apt-get update \ diff --git a/scripts/Docker/debian/clang-cross/Dockerfile b/scripts/Docker/debian/clang-cross/Dockerfile index bf64a0fd53..fefaa6d40b 100644 --- a/scripts/Docker/debian/clang-cross/Dockerfile +++ b/scripts/Docker/debian/clang-cross/Dockerfile @@ -7,16 +7,16 @@ # FONTCONFIG_VERSION - the exact version of libfontconfig1 to use [ 2.13.1-2 | * ] ARG IMAGE_ARCH=amd64 -FROM ${IMAGE_ARCH}/debian:10 +FROM ${IMAGE_ARCH}/debian:11 # Install the required packages RUN apt-get update \ && apt-get install -y \ - curl python3 git clang-13 ninja-build \ + curl python3 git clang-13 ninja-build xz-utils \ && rm -rf /var/lib/apt/lists/* # Install the cross-compilation GCC toolchain -ARG TOOLCHAIN_VERSION=8 +ARG TOOLCHAIN_VERSION=9 ARG TOOLCHAIN_ARCH=arm-linux-gnueabihf ARG TOOLCHAIN_ARCH_SHORT=armhf RUN apt-get update \ diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index f1bf049891..4796fc2419 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -17,7 +17,7 @@ variables: VISUAL_STUDIO_VERSION: '' DOTNET_VERSION: '8.0.304' DOTNET_VERSION_PREVIEW: '' - DOTNET_WORKLOAD_SOURCE: '' + DOTNET_WORKLOAD_SOURCE: 'https://github.com/dotnet/maui/releases/download/8.0.82/8.0.82.json' DOTNET_WORKLOAD_TIZEN: '8.0.149' CONFIGURATION: 'Release' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true