From 7e3a1c12594af113fd586332cdb92ca165124bc6 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 13 Dec 2021 13:55:38 -0800 Subject: [PATCH 1/4] Add Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools to VS as requested by https://github.com/microsoft/vcpkg/issues/19554 --- scripts/azure-pipelines/windows/deploy-visual-studio.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 index 0ec5ff7110688c..c8f0196057a231 100644 --- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 +++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 @@ -23,7 +23,8 @@ $Workloads = @( 'Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset', 'Microsoft.VisualStudio.Component.VC.Llvm.Clang', 'Microsoft.VisualStudio.Component.VC.v141.x86.x64', - 'Microsoft.VisualStudio.Component.VC.140' + 'Microsoft.VisualStudio.Component.VC.140', + 'Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools' ) <# From c949e08fe347cb517188cbbddeb40a434ef3e623 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 13 Dec 2021 13:56:21 -0800 Subject: [PATCH 2/4] Cherry pick python changes from https://github.com/microsoft/vcpkg/pull/21912 --- scripts/azure-pipelines/linux/provision-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 4ef7c4ec712e66..3abc8cb0f59c0b 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -34,7 +34,7 @@ APT_PACKAGES="$APT_PACKAGES libxcb-res0-dev" APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-mako" # Additionally required by some packages to install additional python packages -APT_PACKAGES="$APT_PACKAGES python3-pip" +APT_PACKAGES="$APT_PACKAGES python3-pip python3-venv" # Additionally required by qtwebengine APT_PACKAGES="$APT_PACKAGES nodejs" From 0e0e8f929c2138b4f367d355dc5a929b9778a80f Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 13 Dec 2021 14:19:09 -0800 Subject: [PATCH 3/4] Update linux pool. --- scripts/azure-pipelines/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 561d19fe90c44b..02022e732acdee 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -3,7 +3,7 @@ # variables: windows-pool: 'PrWin-2021-11-10' - linux-pool: 'PrLin-2021-11-10' + linux-pool: 'PrLin-2021-12-13' osx-pool: 'PrOsx-2021-07-27' jobs: From 0e34b27fe67966d9e15a6de8060b3e77efb3e7de Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 14 Dec 2021 16:07:18 -0800 Subject: [PATCH 4/4] Update windows pool. --- scripts/azure-pipelines/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 02022e732acdee..300a80a9c01391 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2021-11-10' + windows-pool: 'PrWin-2021-12-14' linux-pool: 'PrLin-2021-12-13' osx-pool: 'PrOsx-2021-07-27'