Patch Tuesday June 2023 + Ubuntu 22.04 (microsoft#32014)

ports/bond/portfile.cmake

@@ -6,7 +6,9 @@ vcpkg_from_github(
     REF  "${VERSION}"
     SHA512 a5475d3f988928fc3d03b69fc34b33ada35bd790138a0f4a733642558c72945e79c5dcde88b656cbc1cafbc3cb2dd4ba28031e09e507d730056876148ef65014
     HEAD_REF master
-    PATCHES fix-install-path.patch skip-grpc-compilation.patch
+    PATCHES
+        fix-install-path.patch
+        skip-grpc-compilation.patch
 )
 
 if (VCPKG_TARGET_IS_WINDOWS)
@@ -31,22 +33,22 @@ else()
     # The build needs a version of the Haskel Tool stack that is newer than some distros ship with.
     # For this reason the message is not guarded by checking to see if the tool is installed.
     message("\nA recent version of Haskell Tool Stack is required to build.\n  For information on how to install see https://docs.haskellstack.org/en/stable/README/\n")
-
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         bond-over-grpc BOND_ENABLE_GRPC
 )
 
+set(ENV{STACK_ROOT} "${CURRENT_BUILDTREES_DIR}/stack")
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DBOND_LIBRARIES_ONLY=TRUE
         -DBOND_GBC_PATH=${FETCHED_GBC_PATH}
         -DBOND_SKIP_GBC_TESTS=TRUE
-        -DBOND_ENABLE_COMM=FALSE
         -DBOND_FIND_RAPIDJSON=TRUE
         -DBOND_STACK_OPTIONS=--allow-different-user
         ${FEATURE_OPTIONS}

ports/bond/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "bond",
   "version": "10.0.0",
+  "port-version": 1,
   "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.",
   "homepage": "https://github.com/Microsoft/bond",
   "dependencies": [

scripts/azure-pipelines/azure-pipelines.yml

@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: MIT
 #
 variables:
-  android-pool: 'PrAnd-2023-05-09'
-  linux-pool: 'PrLin-2023-05-09'
-  windows-pool: 'PrWin-2023-05-09'
+  android-pool: 'PrAnd-2023-06-14'
+  linux-pool: 'PrLin-2023-06-14'
+  windows-pool: 'PrWin-2023-06-14'
   osx-pool: 'PrOsx-2022-02-04'
   linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-04-20'
 
@@ -112,4 +112,4 @@ jobs:
     poolName: $(android-pool)
     dockerImage: $(linux-docker-image)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
+    tripletPattern: ${{ parameters.tripletPattern }}

scripts/azure-pipelines/linux/create-image.ps1

@@ -95,8 +95,8 @@ $VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id
 $VM = Set-AzVMSourceImage `
   -VM $VM `
   -PublisherName 'Canonical' `
-  -Offer '0001-com-ubuntu-server-focal' `
-  -Skus '20_04-lts' `
+  -Offer '0001-com-ubuntu-server-jammy' `
+  -Skus '22_04-lts' `
   -Version latest
 
 $VM = Set-AzVMBootDiagnostic -VM $VM -Disable

scripts/azure-pipelines/linux/provision-image.sh

@@ -8,14 +8,13 @@ export DEBIAN_FRONTEND=noninteractive
 # Add apt repos
 
 ## CUDA
-apt-key del 7fa2af80
-wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin
-mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600
-apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub
-add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /"
+wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-ubuntu2204.pin
+mv cuda-ubuntu2204.pin /etc/apt/preferences.d/cuda-repository-pin-600
+apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub
+add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/ /"
 
 ## PowerShell
-wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
+wget -q https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
 dpkg -i packages-microsoft-prod.deb
 rm -f packages-microsoft-prod.deb
 add-apt-repository universe
@@ -72,7 +71,7 @@ APT_PACKAGES="$APT_PACKAGES nodejs"
 APT_PACKAGES="$APT_PACKAGES libwayland-dev"
 
 ## required by all GN projects
-APT_PACKAGES="$APT_PACKAGES python2 python-is-python3"
+APT_PACKAGES="$APT_PACKAGES python-is-python3"
 
 ## required by libctl
 APT_PACKAGES="$APT_PACKAGES guile-2.2-dev"
@@ -89,9 +88,6 @@ APT_PACKAGES="$APT_PACKAGES libxtst-dev"
 ## required by bond
 APT_PACKAGES="$APT_PACKAGES haskell-stack"
 
-## required by duktape
-APT_PACKAGES="$APT_PACKAGES python-yaml"
-
 ## CUDA
 APT_PACKAGES="$APT_PACKAGES cuda-compiler-12-1 cuda-libraries-dev-12-1 cuda-driver-dev-12-1 \
   cuda-cudart-dev-12-1 libcublas-12-1 libcurand-dev-12-1 cuda-nvml-dev-12-1 libcudnn8-dev libnccl2 \
@@ -104,7 +100,7 @@ APT_PACKAGES="$APT_PACKAGES powershell"
 if [[ $(grep microsoft /proc/version) ]]; then
 echo "Skipping install of ADO prerequisites on WSL."
 else
-APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu66"
+APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu70 debsums liblttng-ust1"
 fi
 
 apt-get -y --no-install-recommends install $APT_PACKAGES

scripts/ci.baseline.txt

@@ -84,12 +84,17 @@ blitz:x64-android=fail
 blitz:x64-uwp=fail
 blitz:arm64-windows=fail
 blitz:arm-uwp=fail
+blitz:x64-linux=fail # python2
 boinc:arm-neon-android=fail
 boinc:arm64-android=fail
 boinc:x64-android=fail
 bond:arm-neon-android=fail
+bond:arm-uwp=fail
 bond:arm64-android=fail
+bond:arm64-osx=fail
 bond:x64-android=fail
+bond:x64-osx=fail
+bond:x64-uwp=fail
 # Conflicts with openssl
 boringssl:arm-neon-android=skip
 boringssl:arm64-android=skip
@@ -104,10 +109,6 @@ boringssl:x64-windows=skip
 boringssl:x64-windows-static=skip
 boringssl:x64-windows-static-md=skip
 boringssl:x86-windows=skip
-bond:arm-uwp=fail
-bond:x64-osx=fail
-bond:arm64-osx=fail
-bond:x64-uwp=fail
 botan:arm-neon-android=fail
 botan:arm64-android=fail
 botan:x64-android=fail
@@ -240,8 +241,7 @@ cnats:x64-android=fail
 coin:arm64-windows=fail
 coin:arm-uwp=fail
 coin:x64-uwp=fail
-# coinutils requires autoconf2.71 not yet available in CI
-coinutils:x64-linux=fail
+coin-or-ipopt:x64-linux=fail
 # there is an ICE in VS2022 with colmap in release mode
 colmap:x86-windows=fail
 colmap:x64-windows=fail
@@ -256,12 +256,10 @@ concurrencpp:x64-osx=fail
 constexpr-contracts:arm-neon-android=fail
 constexpr-contracts:arm64-android=fail
 constexpr-contracts:x64-android=fail
-constexpr-contracts:x64-linux=fail
 coroutine:arm-neon-android=fail
 coroutine:arm-uwp=fail
 coroutine:arm64-android=fail
 coroutine:x64-android=fail
-coroutine:x64-linux=fail
 coroutine:x64-uwp=fail
 cpp-ipc:arm-neon-android=fail
 cpp-ipc:arm64-android=fail
@@ -289,9 +287,6 @@ cppslippi:x64-osx=fail
 cppcoro:x64-linux=fail
 cppcoro:arm-uwp=fail
 cppcoro:x64-uwp=fail
-# The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support.
-# This is known to work on x64-linux as of gcc 10.3.0.
-cppgraphqlgen:x64-linux=fail
 cpptoml:arm-neon-android=fail
 cpptoml:arm64-android=fail
 cpptoml:x64-android=fail
@@ -341,8 +336,6 @@ discord-game-sdk:x64-windows-static=fail
 discord-game-sdk:x64-windows-static-md=fail
 discord-rpc:arm-uwp=fail
 discord-rpc:x64-uwp=fail
-# requires g++11
-discordcoreapi:x64-linux=fail
 discount:x64-android=fail
 dlib:arm-uwp=fail
 dlib:x64-uwp=fail
@@ -359,6 +352,7 @@ duktape:arm64-android=fail
 duktape:x64-android=fail
 duktape:x64-osx=skip
 duktape:arm64-osx=skip
+duktape:x64-linux=fail
 
 eastl:arm-uwp=fail
 easyloggingpp:arm-uwp=fail
@@ -633,6 +627,7 @@ jinja2cpplight:x64-android=fail
 jinja2cpplight:x64-uwp=fail
 json-schema-validator:arm-neon-android=fail
 json-schema-validator:arm64-android=fail
+keystone:x64-linux=fail # python2
 kfr:arm64-windows=fail
 kfr:x64-android=fail
 kfr:x64-uwp=fail
@@ -772,6 +767,7 @@ libmysql:arm64-android=fail
 libmysql:x64-android=fail
 libmysql:x86-windows=fail
 libmysql:arm64-windows=fail
+libodb:x64-linux=fail # dynamic exception specifications
 libopensp:arm-neon-android=fail
 libopensp:arm64-android=fail
 libopensp:x64-android=fail
@@ -895,6 +891,7 @@ llvm:arm64-android=fail
 llvm:x64-android=fail
 log4cplus:arm-uwp=fail
 log4cplus:x64-uwp=fail
+log4cpp:x64-linux=fail # dynamic exception specifications
 log4cxx:arm-uwp=fail
 log4cxx:x64-uwp=fail
 loguru:arm-neon-android=fail
@@ -1148,6 +1145,7 @@ openmesh:x64-uwp=fail
 openmpi:arm-neon-android=fail
 openmpi:arm64-android=fail
 openmpi:x64-android=fail
+openmvg:x64-linux=fail
 openscap:arm-neon-android=fail
 openscap:arm64-android=fail
 openscap:x64-android=fail
@@ -1365,13 +1363,9 @@ rsasynccpp:arm64-windows=fail
 rsasynccpp:arm-uwp=fail
 rsasynccpp:x64-linux=fail
 rsasynccpp:x64-osx=fail
-# Requires g++10 but CI compiler only has g++9
-rsm-binary-io:x64-linux=fail
 rsm-bsa:arm-neon-android=fail
 rsm-bsa:arm64-android=fail
 rsm-bsa:x64-android=fail
-# Requires g++10 but CI compiler only has g++9
-rsm-bsa:x64-linux=fail
 rtlsdr:x64-uwp=fail
 rtlsdr:arm64-windows=fail
 rtlsdr:arm-uwp=fail
@@ -1689,6 +1683,7 @@ wpilib:arm64-android=fail
 wpilib:arm64-windows=fail
 wpilib:x64-android=fail
 wpilib:x64-osx=fail
+wpilib:x64-linux=fail
 wincrypt:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599
 x264:arm-neon-android=fail
 x264:arm64-android=fail

scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake

@@ -3,7 +3,7 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 # For each vcpkg_find_acquire_program(NAME).cmake script,
 # there must be a literal call to vcpkg_find_acquire_program(NAME).cmake
 
-set(variables BAZEL BISON FLEX GIT GN NINJA PERL PKGCONFIG PYTHON2 PYTHON3 YASM)
+set(variables BAZEL BISON FLEX GIT GN NINJA PERL PKGCONFIG PYTHON3 YASM)
 vcpkg_find_acquire_program(BAZEL)
 vcpkg_find_acquire_program(BISON)
 vcpkg_find_acquire_program(FLEX)
@@ -12,7 +12,6 @@ vcpkg_find_acquire_program(GN)
 vcpkg_find_acquire_program(NINJA)
 vcpkg_find_acquire_program(PERL)
 vcpkg_find_acquire_program(PKGCONFIG)
-vcpkg_find_acquire_program(PYTHON2)
 vcpkg_find_acquire_program(PYTHON3)
 vcpkg_find_acquire_program(YASM)
 
@@ -28,7 +27,7 @@ if(VCPKG_HOST_IS_LINUX)
 endif()
 
 if(VCPKG_HOST_IS_WINDOWS)
-    list(APPEND variables 7Z ARIA2 CLANG DARK DOXYGEN GASPREPROCESSOR GO GPERF JOM NASM NUGET RUBY SCONS SWIG)
+    list(APPEND variables 7Z ARIA2 CLANG DARK DOXYGEN GASPREPROCESSOR GO GPERF JOM NASM NUGET PYTHON2 RUBY SCONS SWIG)
     vcpkg_find_acquire_program(7Z)
     vcpkg_find_acquire_program(ARIA2)
     vcpkg_find_acquire_program(CLANG)
@@ -40,6 +39,7 @@ if(VCPKG_HOST_IS_WINDOWS)
     vcpkg_find_acquire_program(JOM)
     vcpkg_find_acquire_program(NASM)
     vcpkg_find_acquire_program(NUGET)
+    vcpkg_find_acquire_program(PYTHON2)
     vcpkg_find_acquire_program(RUBY)
     vcpkg_find_acquire_program(SCONS)
     vcpkg_find_acquire_program(SWIG)

versions/b-/bond.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5d9b960403809575097267ac43d1ce18e9b2a7f2",
+      "version": "10.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "5ce8875d8de21ca31d61b521c2e84a974e325436",
       "version": "10.0.0",

versions/baseline.json

@@ -622,7 +622,7 @@
     },
     "bond": {
       "baseline": "10.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boolinq": {
       "baseline": "3.0.4",