Merge remote-tracking branch 'origin/main' into connor4312/msrustup

build/azure-pipelines/linux/cli-build-linux.yml

@@ -25,10 +25,27 @@ steps:
   - bash: |
       set -e
       sudo apt-get update
-      sudo apt-get install -yq build-essential cmake curl file git graphviz musl-dev musl-tools linux-libc-dev pkgconf unzip xutils-dev
+      sudo apt-get install -yq build-essential curl file git graphviz musl-dev musl-tools linux-libc-dev pkgconf zip unzip xutils-dev ninja-build
       sudo ln -s "/usr/bin/g++" "/usr/bin/musl-g++" || echo "link exists"
     displayName: Install build dependencies
 
+  # the cmake version on the 20.04 repo is too old for vcpkg
+  - bash: |
+      set -e
+      sudo apt remove --auto-remove cmake -y
+      curl -L https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-aarch64.sh -o $(Build.ArtifactStagingDirectory)/cmake.sh
+      cd $(Build.ArtifactStagingDirectory) && echo "f5aaa0ad735554cdf10401311cf47858f822537e5f80b05bc8aa282d6e9dbb5d4d235c77d1299904a1156dec6d4000defc74ae891a43c1b2101367554b241ba1  cmake.sh" | sha512sum -c
+      sudo mkdir /opt/cmake && sudo sh $(Build.ArtifactStagingDirectory)/cmake.sh --skip-license --prefix=/opt/cmake
+      sudo ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
+    displayName: Update cmake
+    condition: and(succeeded(), eq(variables.VCPKG_FORCE_SYSTEM_BINARIES, '1'))
+
+  - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}:
+    - bash: |
+        set -e
+        sudo apt-get install -yq gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf binutils-arm-linux-gnueabihf
+      displayName: Install cross compilation toolchains
+
   - template: ../vcpkg-install-posix.yml
     parameters:
       targets: