Patch Tuesday September 2023 + arm-uwp=>arm64-uwp (#33759)

Co-authored-by: Leander Schulten <Leander.Schulten@rwth-aachen.de>

scripts/Get-Changelog.ps1

@@ -414,7 +414,7 @@ vcpkg ($($StartDate.ToString('yyyy.MM.dd')) - $((($EndDate).AddSeconds(-1)).ToSt
 |x64-windows-static-md|NUM|
 |x64-uwp|NUM|
 |arm64-windows|NUM|
-|arm-uwp|NUM|
+|arm64-uwp|NUM|
 |**x64-osx**|NUM|
 |**x64-linux**|NUM|
 

scripts/azure-pipelines/android/create-docker-image.ps1

@@ -16,6 +16,8 @@ $registry = Get-AzContainerRegistry -ResourceGroupName $ResourceGroupName -Name
 Connect-AzContainerRegistry -Name $registry.Name
 
 $imageName = "vcpkg-android"
+Push-Location $PSScriptRoot
+try {
     docker build . -t $imageName
     
     $remote = [string]::Format('andcontainerregistry.azurecr.io/{0}:{1}', $imageName, $Date)
@@ -28,5 +30,8 @@ docker rmi --force $remote $imageName
     
     # pulls and runs ...
     docker logout
+} finally {
+    Pop-Location
+}
 
 Write-Host "Remote: $remote"

scripts/azure-pipelines/azure-pipelines.yml

@@ -4,9 +4,9 @@
 variables:
   android-pool: 'PrAnd-1ES-Pool'
   linux-pool: 'PrLin-1ES-Pool'
-  windows-pool: 'PrWin-2023-08-09'
+  windows-pool: 'PrWin-2023-09-13'
   osx-pool: 'PrOsx-2023-09-11'
-  linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-04-20'
+  linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-09-13'
 
 parameters:
   - name: vcpkgToolSha
@@ -69,8 +69,8 @@ jobs:
 
 - template: windows/azure-pipelines.yml
   parameters:
-    triplet: arm-uwp
-    jobName: arm_uwp
+    triplet: arm64-uwp
+    jobName: arm64_uwp
     poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}

scripts/azure-pipelines/windows/deploy-visual-studio.ps1

@@ -9,15 +9,13 @@ $VisualStudioBootstrapperUrl = 'https://aka.ms/vs/17/release/vs_enterprise.exe'
 $Workloads = @(
   'Microsoft.VisualStudio.Workload.NativeDesktop',
   'Microsoft.VisualStudio.Workload.Universal',
+  'Microsoft.VisualStudio.Component.UWP.VC.ARM64',
   'Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
-  'Microsoft.VisualStudio.Component.VC.Tools.ARM',
   'Microsoft.VisualStudio.Component.VC.Tools.ARM64',
   'Microsoft.VisualStudio.Component.VC.ASAN',
   'Microsoft.VisualStudio.Component.VC.ATL',
   'Microsoft.VisualStudio.Component.VC.ATLMFC',
-  'Microsoft.VisualStudio.Component.VC.ATL.ARM',
   'Microsoft.VisualStudio.Component.VC.ATL.ARM64',
-  'Microsoft.VisualStudio.Component.VC.MFC.ARM',
   'Microsoft.VisualStudio.Component.VC.MFC.ARM64',
   "Microsoft.VisualStudio.Component.Windows11SDK.22621",
   "Microsoft.VisualStudio.Component.Windows10SDK.20348",

scripts/ci.baseline.txt

@@ -24,7 +24,7 @@
 ##    arm64-android
 ##    arm64-windows
 ##    arm-neon-android
-##    arm-uwp
+##    arm64-uwp
 ##    x64-android
 ##    x64-linux
 ##    x64-osx
@@ -83,7 +83,7 @@ boinc:arm-neon-android=fail
 boinc:arm64-android=fail
 boinc:x64-android=fail
 bond:arm-neon-android=fail
-bond:arm-uwp=fail
+bond:arm64-uwp=fail
 bond:arm64-android=fail
 bond:arm64-osx=fail
 bond:x64-android=fail
@@ -93,7 +93,7 @@ bond:x64-uwp=fail
 boringssl:arm-neon-android=skip
 boringssl:arm64-android=skip
 boringssl:arm64-windows=skip
-boringssl:arm-uwp=skip
+boringssl:arm64-uwp=skip
 boringssl:x64-android=skip
 boringssl:x64-linux=skip
 boringssl:x64-osx=skip
@@ -112,7 +112,7 @@ c4core:arm-neon-android=fail
 c4core:arm64-android=fail
 c4core:x64-android=fail
 caf:arm-neon-android=fail
-caf:arm-uwp=fail
+caf:arm64-uwp=fail
 caf:arm64-android=fail
 caf:x64-android=fail
 caf:x64-uwp=fail
@@ -126,17 +126,17 @@ c-dbg-macro:x64-windows-static=skip
 c-dbg-macro:x64-windows-static-md=skip
 c-dbg-macro:x64-uwp=skip
 c-dbg-macro:arm64-windows=skip
-c-dbg-macro:arm-uwp=skip
+c-dbg-macro:arm64-uwp=skip
 c-dbg-macro:x64-osx=skip
 c-dbg-macro:arm64-osx=skip
 c-dbg-macro:x64-linux=skip
 
-casclib:arm-uwp=fail
+casclib:arm64-uwp=fail
 casclib:x64-uwp=fail
 catch-classic:arm-neon-android=skip
 catch-classic:arm64-android=skip
 catch-classic:arm64-windows      = skip
-catch-classic:arm-uwp            = skip
+catch-classic:arm64-uwp            = skip
 catch-classic:x64-android=skip
 catch-classic:x64-linux          = skip
 catch-classic:x64-osx            = skip
@@ -147,14 +147,14 @@ catch-classic:x64-windows-static = skip
 catch-classic:x64-windows-static-md=skip
 catch-classic:x86-windows        = skip
 cctag:x64-windows-static-md=fail
-cello:arm-uwp=fail
+cello:arm64-uwp=fail
 cello:x64-uwp=fail
-cfitsio:arm-uwp=fail
+cfitsio:arm64-uwp=fail
 cfitsio:x64-uwp=fail
 chakracore:x64-linux=skip
 # DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy)
 charls:arm64-windows=skip
-charls:arm-uwp=skip
+charls:arm64-uwp=skip
 charls:x64-linux=skip
 charls:x64-osx=skip
 charls:x64-uwp=skip
@@ -166,7 +166,7 @@ charls:x86-windows=skip
 chartdir:arm-neon-android=fail
 chartdir:arm64-android=fail
 chartdir:arm64-windows=skip
-chartdir:arm-uwp=skip
+chartdir:arm64-uwp=skip
 chartdir:x64-android=fail
 chartdir:x64-uwp=skip
 chartdir:x64-windows-static=skip
@@ -197,7 +197,7 @@ clapack:x64-windows-static-md=skip
 clapack:x64-windows=skip
 clapack:x86-windows=skip
 lapack-reference:arm64-windows=skip
-lapack-reference:arm-uwp=skip
+lapack-reference:arm64-uwp=skip
 lapack-reference:x64-uwp=skip
 
 clblas:arm-neon-android=fail
@@ -212,7 +212,7 @@ clockutils:x64-android=fail
 clockutils:x64-linux=fail
 clrng:arm-neon-android=fail
 cmcstl2:arm64-windows      = skip
-cmcstl2:arm-uwp            = skip
+cmcstl2:arm64-uwp            = skip
 cmcstl2:x64-linux          = skip
 cmcstl2:x64-osx            = skip
 cmcstl2:x64-uwp            = skip
@@ -243,7 +243,7 @@ cppgraphqlgen:x64-android=fail
 cppmicroservices:arm-neon-android=fail
 cppmicroservices:arm64-android=fail
 cppmicroservices:arm64-windows=fail
-cppmicroservices:arm-uwp=fail
+cppmicroservices:arm64-uwp=fail
 cppmicroservices:x64-android=fail
 cppmicroservices:x64-uwp=fail
 # Requires full C++20 support, currently absent from CI for these triplets.
@@ -275,7 +275,7 @@ dbg-macro:arm-neon-android=fail
 dbg-macro:arm64-android=fail
 dbg-macro:x64-android=fail
 # Since pipeline cannot automatically install dbghelp dependency, skip this detection
-dbghelp:arm-uwp=skip
+dbghelp:arm64-uwp=skip
 dbghelp:arm64-windows=skip
 dbghelp:x64-uwp=skip
 dbghelp:x64-windows-static=skip
@@ -295,10 +295,10 @@ dimcli:x64-windows-static=fail
 directxsdk:x86-windows=skip
 directxsdk:x64-windows=skip
 directxsdk:x64-windows-static-md=skip
-discord-rpc:arm-uwp=fail
+discord-rpc:arm64-uwp=fail
 discord-rpc:x64-uwp=fail
 discount:x64-android=fail
-dlib:arm-uwp=fail
+dlib:arm64-uwp=fail
 dlib:x64-uwp=fail
 drogon:arm-neon-android=fail
 drogon:arm64-android=fail
@@ -313,7 +313,6 @@ duktape:x64-osx=skip
 duktape:arm64-osx=skip
 duktape:x64-linux=fail
 
-eastl:arm-uwp=fail
 eathread:x64-android=fail
 elfio:arm-neon-android=fail
 elfio:arm64-android=fail
@@ -324,14 +323,14 @@ elfutils:arm64-android=fail
 elfutils:x64-android=fail
 elfutils:x64-osx=fail
 elfutils:arm64-osx=fail
-epsilon:arm-uwp=fail
+epsilon:arm64-uwp=fail
 epsilon:x64-uwp=fail
 evpp:arm-neon-android=fail
 evpp:arm64-android=fail
 evpp:x64-android=fail
 faiss:arm64-windows=fail
 fastrtps:arm-neon-android=fail
-fastrtps:arm-uwp=fail
+fastrtps:arm64-uwp=fail
 fastrtps:arm64-android=fail
 fastrtps:x64-android=fail
 fastrtps:x64-uwp=fail
@@ -351,7 +350,7 @@ fltk:arm64-android=fail
 fltk:x64-android=fail
 # fluidlite conflicts with fluidsynth; we test fluidsynth rather than fluidlite because
 # fluidlite has no dependencies and thus is less likely to be broken by another package.
-fluidlite:arm-uwp=skip
+fluidlite:arm64-uwp=skip
 fluidlite:arm64-windows=skip
 fluidlite:x64-linux=skip
 fluidlite:x64-osx=skip
@@ -364,17 +363,17 @@ fluidlite:x86-windows=skip
 fmem:arm-neon-android=fail
 fmem:arm64-android=fail
 fmem:x64-android=fail
-fmi4cpp:arm-uwp=fail
+fmi4cpp:arm64-uwp=fail
 fmi4cpp:x64-uwp=fail
 folly:arm64-android=fail
 folly:x64-android=fail
 fontconfig:x64-uwp=fail
-fontconfig:arm-uwp=fail
+fontconfig:arm64-uwp=fail
 foonathan-memory:arm64-windows=fail
-foonathan-memory:arm-uwp=fail
+foonathan-memory:arm64-uwp=fail
 foonathan-memory:x64-uwp=fail
 freeglut:arm-neon-android=fail
-freeglut:arm-uwp=fail
+freeglut:arm64-uwp=fail
 freeglut:arm64-android=fail
 freeglut:x64-android=fail
 freeglut:x64-uwp=fail
@@ -391,10 +390,11 @@ ftgl:arm-neon-android=fail
 ftgl:arm64-android=fail
 ftgl:x64-android=fail
 ftgl:x64-uwp=fail
-ftgl:arm-uwp=fail
+ftgl:arm64-uwp=fail
 fuzzylite:arm-neon-android=fail
 fuzzylite:arm64-android=fail
 fuzzylite:x64-android=fail
+g2o:arm64-uwp=fail
 g3log:arm-neon-android=fail
 g3log:arm64-android=fail
 g3log:x64-android=fail
@@ -421,7 +421,7 @@ gherkin-c:arm64-android=fail
 gherkin-c:x64-android=fail
 # Conflicts with libevent
 gherkin-c:arm64-windows         = skip
-gherkin-c:arm-uwp               = skip
+gherkin-c:arm64-uwp               = skip
 gherkin-c:x64-linux             = skip
 gherkin-c:x64-osx               = skip
 gherkin-c:x64-uwp               = skip
@@ -436,13 +436,13 @@ glew:arm-neon-android=fail
 glew:arm64-android=fail
 glew:x64-android=fail
 glfw3:arm-neon-android=fail
-glfw3:arm-uwp=fail
+glfw3:arm64-uwp=fail
 glfw3:arm64-android=fail
 glfw3:x64-android=fail
 glfw3:x64-uwp=fail
 glibmm:x64-windows-static-md=fail
 glibmm:x64-windows-static=fail
-graphicsmagick:arm-uwp=fail
+graphicsmagick:arm64-uwp=fail
 graphicsmagick:x64-uwp=fail
 # graphicsmagick non-uwp trigger an ICE in VS 2022 17.3 https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1557251
 graphicsmagick:arm-neon-android=fail
@@ -494,7 +494,7 @@ ignition-common1:x64-linux=fail
 ignition-msgs1:arm-neon-android=fail
 ignition-msgs1:arm64-android=fail
 ignition-msgs1:arm64-windows=fail
-ignition-msgs1:arm-uwp=fail
+ignition-msgs1:arm64-uwp=fail
 ignition-msgs1:x64-android=fail
 ignition-msgs1:x64-uwp=fail
 ignition-msgs5:x64-android=fail
@@ -505,7 +505,7 @@ ignition-tools:arm-neon-android=fail
 ignition-tools:arm64-android=fail
 ignition-tools:x64-android=fail
 ijg-libjpeg:arm-neon-android=fail
-ijg-libjpeg:arm-uwp            = skip
+ijg-libjpeg:arm64-uwp            = skip
 ijg-libjpeg:arm64-android=fail
 ijg-libjpeg:arm64-osx          = skip
 ijg-libjpeg:arm64-windows      = skip
@@ -528,7 +528,7 @@ jaeger-client-cpp:x64-android=fail
 jemalloc:arm-neon-android=fail
 jemalloc:arm64-android=fail
 jemalloc:arm64-windows=fail
-jemalloc:arm-uwp=fail
+jemalloc:arm64-uwp=fail
 jemalloc:x64-android=fail
 jemalloc:x64-uwp=fail
 jinja2cpplight:arm-neon-android=fail
@@ -549,7 +549,7 @@ lcm:arm-neon-android=fail
 lcm:arm64-android=fail
 lcm:x64-android=fail
 leptonica:x64-uwp=fail
-leptonica:arm-uwp=fail
+leptonica:arm64-uwp=fail
 libaiff:x64-linux=fail
 libbson:arm-neon-android=fail
 libbson:arm64-android=fail
@@ -585,21 +585,21 @@ libhdfs3:arm64-osx=fail
 libidn2:arm-neon-android=fail
 libidn2:arm64-android=fail
 libidn2:x64-android=fail
-# 120 min build time for libjxl arm-uwp-rel, reason unknown
-libjxl:arm-uwp=skip
-liblemon:arm-uwp=fail
+# 120 min build time for libjxl arm64-uwp-rel, reason unknown
+libjxl:arm64-uwp=skip
+liblemon:arm64-uwp=fail
 liblemon:x64-uwp=fail
 liblo:arm-neon-android=fail
-liblo:arm-uwp=fail
+liblo:arm64-uwp=fail
 liblo:arm64-android=fail
 liblo:x64-android=fail
 liblo:x64-uwp=fail
 libmagic:x64-uwp=fail
-libmagic:arm-uwp=fail
+libmagic:arm64-uwp=fail
 libmariadb:arm-neon-android=fail
 libmariadb:arm64-android=fail
 libmariadb:arm64-windows      = skip
-libmariadb:arm-uwp            = skip
+libmariadb:arm64-uwp            = skip
 libmariadb:x64-android=fail
 libmariadb:x64-linux          = skip
 libmariadb:x64-osx            = skip
@@ -630,7 +630,7 @@ libosip2:arm64-android=fail
 libosip2:x64-android=fail
 libp7client:x64-android=fail
 libpng-apng:arm64-windows      = skip
-libpng-apng:arm-uwp            = skip
+libpng-apng:arm64-uwp            = skip
 libpng-apng:x64-linux          = skip
 libpng-apng:x64-osx            = skip
 libpng-apng:x64-uwp            = skip
@@ -640,7 +640,7 @@ libpng-apng:x64-windows-static-md=skip
 libpng-apng:x86-windows        = skip
 # The developer of libqcow does not offer stable release archives
 libqcow:arm-neon-android=skip
-libqcow:arm-uwp=skip
+libqcow:arm64-uwp=skip
 libqcow:arm64-android=skip
 libqcow:x64-android=skip
 libqcow:x64-uwp=skip
@@ -653,7 +653,7 @@ libqcow:x86-windows=skip
 libqcow:arm64-windows=skip
 # Conflicts with openssl
 libressl:arm64-windows=skip
-libressl:arm-uwp=skip
+libressl:arm64-uwp=skip
 libressl:x64-linux=skip
 libressl:x64-osx=skip
 libressl:x64-uwp=skip
@@ -662,7 +662,7 @@ libressl:x64-windows-static=skip
 libressl:x64-windows-static-md=skip
 libressl:x86-windows=skip
 libsoundio:arm64-windows=fail
-libspatialite:arm-uwp=fail
+libspatialite:arm64-uwp=fail
 libspatialite:x64-uwp=fail
 libtar:arm-neon-android=fail
 libtar:arm64-android=fail
@@ -673,14 +673,14 @@ libtins:arm-neon-android=fail
 libtins:arm64-android=fail
 libtins:x64-android=fail
 libtomcrypt:arm64-windows=fail
-libtomcrypt:arm-uwp=fail
+libtomcrypt:arm64-uwp=fail
 libtorch:x64-osx=fail
 libusb:arm-neon-android=fail
 libusb:arm64-android=fail
 libusb:x64-android=fail
-libusb-win32:arm-uwp=fail
+libusb-win32:arm64-uwp=fail
 libusb-win32:x64-uwp=fail
-libuv:arm-uwp=fail
+libuv:arm64-uwp=fail
 libuv:x64-uwp=fail
 #Skip detection to avoid upstream remove older releases
 libvmdk:x86-windows=skip
@@ -699,11 +699,11 @@ libxaw:x64-windows-static=skip
 # clang-cl ICEd
 libxt:arm64-windows=fail
 libzen:arm-neon-android=fail
-linenoise-ng:arm-uwp=fail
+linenoise-ng:arm64-uwp=fail
 linenoise-ng:x64-uwp=fail
 linenoise-ng:x64-windows-static-md=fail
 live555:arm-neon-android=fail
-live555:arm-uwp=fail
+live555:arm64-uwp=fail
 live555:arm64-android=fail
 live555:x64-android=fail
 live555:x64-osx=fail
@@ -715,13 +715,13 @@ llgl:x64-android=fail
 llvm:arm-neon-android=fail
 llvm:arm64-android=fail
 llvm:x64-android=fail
-log4cplus:arm-uwp=fail
+log4cplus:arm64-uwp=fail
 log4cplus:x64-uwp=fail
 log4cpp:x64-linux=fail # dynamic exception specifications
 loguru:arm-neon-android=fail
 loguru:arm64-android=fail
 loguru:x64-android=fail
-luafilesystem:arm-uwp=fail
+luafilesystem:arm64-uwp=fail
 luafilesystem:x64-uwp=fail
 magnum:arm-neon-android=fail
 magnum:arm64-android=fail
@@ -731,7 +731,7 @@ mchehab-zbar:arm-neon-android=fail
 mchehab-zbar:arm64-android=fail
 mchehab-zbar:x64-android=fail
 mecab:arm64-windows      = skip
-mecab:arm-uwp            = skip
+mecab:arm64-uwp            = skip
 mecab:x64-linux          = skip
 mecab:x64-uwp            = skip
 mecab:x64-windows        = skip
@@ -758,7 +758,7 @@ minio-cpp:arm-neon-android=fail
 miniply:arm-neon-android=fail
 # Conflicts with signalrclient
 microsoft-signalr:arm64-windows=skip
-microsoft-signalr:arm-uwp=skip
+microsoft-signalr:arm64-uwp=skip
 microsoft-signalr:x64-linux=skip
 microsoft-signalr:x64-osx=skip
 microsoft-signalr:arm64-osx=skip
@@ -788,7 +788,7 @@ ms-gdkx:x64-windows-static-md=fail
 ms-gltf:arm-neon-android=fail
 ms-gltf:arm64-android=fail
 ms-gltf:x64-android=fail
-ms-quic:arm-uwp=fail
+ms-quic:arm64-uwp=fail
 ms-quic:arm64-windows=fail
 ms-quic:x64-uwp=fail
 ms-quic:x64-windows-static-md=fail
@@ -796,7 +796,7 @@ ms-quic:x64-windows=fail
 ms-quic:x86-windows=fail
 monkeys-audio:arm64-windows=fail
 monkeys-audio:x64-windows-static=fail
-moos-core:arm-uwp=fail
+moos-core:arm64-uwp=fail
 moos-core:x64-uwp=fail
 moos-core:x64-windows-static=fail
 moos-essential:arm64-windows=fail
@@ -805,7 +805,7 @@ moos-essential:x64-windows=fail
 moos-essential:x86-windows=fail
 # Conflicts with libjpeg-turbo
 mozjpeg:arm64-windows      = skip
-mozjpeg:arm-uwp            = skip
+mozjpeg:arm64-uwp            = skip
 mozjpeg:x64-linux          = skip
 mozjpeg:x64-osx            = skip
 mozjpeg:arm64-osx          = skip
@@ -829,13 +829,13 @@ mysql-connector-cpp:arm-neon-android=fail
 mysql-connector-cpp:arm64-android=fail
 mysql-connector-cpp:x64-android=fail
 nana:arm-neon-android=fail
-nana:arm-uwp=fail
+nana:arm64-uwp=fail
 nana:arm64-android=fail
 nana:x64-android=fail
 nana:x64-linux=fail
 nana:x64-osx=fail
 nana:x64-uwp=fail
-nanodbc:arm-uwp=fail
+nanodbc:arm64-uwp=fail
 nanodbc:x64-uwp=fail
 nanodbc:x64-linux=skip
 netcdf-cxx4:x64-windows-static-md=fail
@@ -844,25 +844,25 @@ ngspice:x64-windows-static=fail
 nmap:arm-neon-android=fail
 nmap:arm64-android=fail
 nmap:x64-android=fail
-nng:arm-uwp=fail
+nng:arm64-uwp=fail
 nng:x64-uwp=fail
 nrf-ble-driver:arm-neon-android=fail
 nrf-ble-driver:arm64-android=fail
 nrf-ble-driver:x64-android=fail
 nvtt:x64-android=fail
 oatpp-libressl:x64-android=fail
-octomap:arm-uwp=fail
+octomap:arm64-uwp=fail
 octomap:x64-uwp=fail
 ode:arm64-windows=fail
-ode:arm-uwp=fail
+ode:arm64-uwp=fail
 ode:x64-uwp=fail
-offscale-libetcd-cpp:arm-uwp=fail
+offscale-libetcd-cpp:arm64-uwp=fail
 offscale-libetcd-cpp:x64-uwp=fail
 ogdf:arm64-android=fail
 ogre:arm64-osx=fail
 # Conflicts with ogre
 ogre-next:arm64-windows      = skip
-ogre-next:arm-uwp            = skip
+ogre-next:arm64-uwp            = skip
 ogre-next:x64-osx            = skip
 ogre-next:arm64-osx          = skip
 ogre-next:x64-linux          = skip
@@ -897,12 +897,12 @@ openblas:arm64-android=fail
 openblas:x64-android=fail
 # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP.
 opencc:x64-android=fail
-opencsg:arm-uwp=fail
+opencsg:arm64-uwp=fail
 opencsg:x64-uwp=fail
 opencv2:arm-neon-android=fail
 opencv2:arm64-android=fail
 opencv2:arm64-windows         = skip
-opencv2:arm-uwp               = skip
+opencv2:arm64-uwp               = skip
 opencv2:x64-android=fail
 opencv2:x64-linux             = skip
 opencv2:x64-osx               = skip
@@ -912,7 +912,7 @@ opencv2:x64-windows-static    = skip
 opencv2:x64-windows-static-md = skip
 opencv2:x86-windows           = skip
 opencv3:arm64-windows         = skip
-opencv3:arm-uwp               = skip
+opencv3:arm64-uwp               = skip
 opencv3:x64-linux             = skip
 opencv3:x64-osx               = skip
 opencv3:x64-uwp               = skip
@@ -929,7 +929,7 @@ openldap:arm64-android=fail
 openldap:x64-android=fail
 openmama:x64-windows-static-md=fail
 openmesh:arm64-windows=fail
-openmesh:arm-uwp=fail
+openmesh:arm64-uwp=fail
 openmesh:x64-uwp=fail
 openmpi:arm-neon-android=fail
 openmpi:arm64-android=fail
@@ -952,7 +952,7 @@ openvpn3:x64-osx=fail
 openvpn3:arm64-osx=fail
 openvr:x64-windows-static=fail
 optional-bare:arm64-windows      = skip
-optional-bare:arm-uwp            = skip
+optional-bare:arm64-uwp            = skip
 optional-bare:x64-linux          = skip
 optional-bare:x64-osx            = skip
 optional-bare:x64-uwp            = skip
@@ -966,20 +966,20 @@ optional-lite:x64-android=fail
 orc:arm-neon-android=fail
 orc:arm64-android=fail
 orc:x64-android=fail
-paho-mqtt:arm-uwp=fail
+paho-mqtt:arm64-uwp=fail
 paho-mqtt:x64-uwp=fail
 pcl:arm-neon-android=fail
 pcl:arm64-android=fail
 pcl:x64-android=fail
 pixman:arm-neon-android=fail
 pixman:arm64-android=fail
-platform-folders:arm-uwp=fail
+platform-folders:arm64-uwp=fail
 platform-folders:x64-uwp=fail
 plib:arm-neon-android=fail
 plib:arm64-android=fail
 plib:x64-android=fail
 plplot:arm64-windows=fail
-plplot:arm-uwp=fail
+plplot:arm64-uwp=fail
 plplot:x64-uwp=fail
 pmdk:x64-android=fail
 pmdk:x64-linux=fail
@@ -988,7 +988,6 @@ pmdk:x64-uwp=fail
 pmdk:x64-windows-static=fail
 popsift:x64-windows-static-md=fail
 popsift:x64-linux=fail # segfaults :(
-portable-snippets:arm-uwp=fail
 ptex:arm-neon-android=fail
 ptex:arm64-android=fail
 ptex:x64-android=fail
@@ -1002,7 +1001,7 @@ python3:x64-android=fail
 qbittorrent:x64-osx=fail
 qbittorrent:x64-linux=fail
 qpid-proton:arm-neon-android=fail
-qpid-proton:arm-uwp=fail
+qpid-proton:arm64-uwp=fail
 qpid-proton:arm64-android=fail
 qpid-proton:x64-android=fail
 qpid-proton:x64-uwp=fail
@@ -1044,7 +1043,7 @@ rabit:x64-android=fail
 range-v3-vs2015:arm-neon-android=fail
 range-v3-vs2015:arm64-android=fail
 range-v3-vs2015:arm64-windows      = skip
-range-v3-vs2015:arm-uwp            = skip
+range-v3-vs2015:arm64-uwp            = skip
 range-v3-vs2015:x64-android=fail
 range-v3-vs2015:x64-linux          = skip
 range-v3-vs2015:x64-osx            = skip
@@ -1058,7 +1057,7 @@ range-v3:arm-neon-android=fail
 range-v3:arm64-android=fail
 range-v3:x64-android=fail
 rapidstring:arm64-windows=fail
-rapidstring:arm-uwp=fail
+rapidstring:arm64-uwp=fail
 rapidstring:x64-linux=fail
 rapidstring:x64-uwp=fail
 rapidstring:x64-windows=fail
@@ -1071,7 +1070,7 @@ rbdl-orb:x64-windows=skip
 rbdl-orb:x64-windows-static=skip
 rbdl-orb:x64-windows-static-md=skip
 rbdl-orb:x64-uwp=skip
-rbdl-orb:arm-uwp=skip
+rbdl-orb:arm64-uwp=skip
 rbdl-orb:arm64-windows=skip
 rbdl-orb:x64-linux=skip
 rbdl-orb:x64-osx=skip
@@ -1079,7 +1078,7 @@ rbdl:arm-neon-android=fail
 rbdl:arm64-android=fail
 rbdl:x64-android=fail
 realsense2:arm64-windows=fail
-realsense2:arm-uwp=fail
+realsense2:arm64-uwp=fail
 realsense2:x64-uwp=fail
 replxx:arm-neon-android=fail
 replxx:arm64-android=fail
@@ -1088,7 +1087,7 @@ rest-rpc:arm-neon-android=fail
 rest-rpc:arm64-android=fail
 rest-rpc:x64-android=fail
 restbed:arm-neon-android=fail
-restbed:arm-uwp=fail
+restbed:arm64-uwp=fail
 restbed:arm64-android=fail
 restbed:x64-uwp=fail
 # file conflicts with msgpack
@@ -1097,14 +1096,14 @@ rest-rpc:x64-windows=skip
 rest-rpc:x64-windows-static=skip
 rest-rpc:x64-windows-static-md=skip
 rest-rpc:x64-uwp=skip
-rest-rpc:arm-uwp=skip
+rest-rpc:arm64-uwp=skip
 rest-rpc:arm64-windows=skip
 rest-rpc:x64-linux=skip
 rest-rpc:x64-osx=skip
 rest-rpc:arm64-osx=skip
 rhash:arm64-windows=fail
 rpclib:arm64-windows=fail
-rpclib:arm-uwp=fail
+rpclib:arm64-uwp=fail
 rpclib:x64-uwp=fail
 #The website of rply http://w3.impa.br/~diego/software/rply cannot be accessed
 rply:x86-windows=skip
@@ -1130,7 +1129,7 @@ scintilla:x64-android=fail
 sciter:arm-neon-android=fail
 sciter:arm64-android=fail
 sciter:arm64-windows=skip
-sciter:arm-uwp=skip
+sciter:arm64-uwp=skip
 sciter:x64-android=fail
 sciter:x64-linux=skip
 sciter:x64-osx=skip
@@ -1140,7 +1139,7 @@ sciter:x64-windows=skip
 sciter:x64-windows-static=skip
 sciter:x64-windows-static-md=skip
 sciter:x86-windows=skip
-scnlib:arm-uwp=fail
+scnlib:arm64-uwp=fail
 scnlib:x64-uwp=fail
 sdformat10:x64-windows-static-md=fail
 sdformat6:x64-windows-static-md=fail
@@ -1148,7 +1147,7 @@ sdformat9:x64-windows-static-md=fail
 sdl1:arm-neon-android=fail
 sdl1:arm64-android=fail
 sdl1:x64-android=fail
-sdl2-net:arm-uwp=fail
+sdl2-net:arm64-uwp=fail
 sdl2-net:x64-uwp=fail
 sentencepiece:arm-neon-android=fail
 sentencepiece:arm64-android=fail
@@ -1164,7 +1163,7 @@ shiva-sfml:arm64-osx=fail
 shiva-sfml:x86-windows=fail
 shiva-sfml:x64-windows=fail
 shogun:arm64-windows      = skip
-shogun:arm-uwp            = skip
+shogun:arm64-uwp            = skip
 shogun:x64-osx            = skip
 shogun:x64-uwp            = skip
 shogun:x64-windows        = skip
@@ -1175,7 +1174,7 @@ signalrclient:arm-neon-android=fail
 signalrclient:arm64-android=fail
 signalrclient:x64-android=fail
 signalrclient:x64-uwp=fail
-signalrclient:arm-uwp=fail
+signalrclient:arm64-uwp=fail
 simbody:arm64-windows=fail
 simd:arm-neon-android=fail
 simd:arm64-android=fail
@@ -1204,7 +1203,7 @@ soil:x64-android=fail
 solid3:arm64-android=fail
 spaceland:arm64-android=fail
 spaceland:arm64-windows=fail
-spaceland:arm-uwp=fail
+spaceland:arm64-uwp=fail
 spaceland:x64-android=fail
 spaceland:x64-uwp=fail
 spatialite-tools:arm-neon-android=fail
@@ -1222,13 +1221,13 @@ spscqueue:x64-android=fail
 status-code:arm-neon-android=fail
 status-code:arm64-android=fail
 status-code:x64-android=fail
-stormlib:arm-uwp=fail
+stormlib:arm64-uwp=fail
 stormlib:x64-uwp=fail
 stx:arm-neon-android=fail
 stx:arm64-android=fail
 stx:x64-android=fail
 stxxl:arm-neon-android=fail
-stxxl:arm-uwp=fail
+stxxl:arm64-uwp=fail
 stxxl:x64-uwp=fail
 # upstream issue https://github.com/stxxl/stxxl/issues/99
 stxxl:x86-windows=skip
@@ -1236,7 +1235,7 @@ stxxl:x64-windows=skip
 stxxl:x64-windows-static=skip
 stxxl:x64-windows-static-md=skip
 systemc:arm64-windows=fail
-systemc:arm-uwp=fail
+systemc:arm64-uwp=fail
 systemc:x64-uwp=fail
 teemo:x64-android=fail
 
@@ -1260,9 +1259,9 @@ tensorflow-cc:arm-osx=skip
 thorvg:arm-neon-android=fail
 thorvg:arm64-android=fail
 thorvg:x64-android=fail
-tidy-html5:arm-uwp=fail
+tidy-html5:arm64-uwp=fail
 tidy-html5:x64-uwp=fail
-tiny-process-library:arm-uwp=fail
+tiny-process-library:arm64-uwp=fail
 tiny-process-library:x64-uwp=fail
 tinycthread:arm-neon-android=fail
 tinycthread:arm64-android=fail
@@ -1276,7 +1275,7 @@ tmxlite:x64-android=fail
 torch-th:arm-neon-android=fail
 torch-th:arm64-android=fail
 torch-th:arm64-windows=fail
-torch-th:arm-uwp=fail
+torch-th:arm64-uwp=fail
 torch-th:x64-android=fail
 torch-th:x64-uwp=fail
 torch-th:x64-windows-static=fail
@@ -1290,12 +1289,12 @@ unicorn:x64-windows-static-md=fail
 unittest-cpp:arm-neon-android=fail
 unittest-cpp:arm64-android=fail
 unittest-cpp:arm64-windows=fail
-unittest-cpp:arm-uwp=fail
+unittest-cpp:arm64-uwp=fail
 unittest-cpp:x64-android=fail
 unittest-cpp:x64-uwp=fail
 # USD has set official policy that they will not update to be compatible with TBB in the near term (https://github.com/PixarAnimationStudios/USD/issues/1600)
 usd:arm64-windows=skip
-usd:arm-uwp=skip
+usd:arm64-uwp=skip
 usd:x64-uwp=skip
 usd:x64-windows=skip
 usd:x64-windows-static=skip
@@ -1331,7 +1330,7 @@ vulkan:x86-windows=fail
 vxl:arm-neon-android=skip
 vxl:arm64-android=skip
 vxl:arm64-windows      = skip
-vxl:arm-uwp            = skip
+vxl:arm64-uwp            = skip
 vxl:x64-android=fail
 vxl:x64-linux          = skip
 vxl:x64-osx            = skip
@@ -1346,7 +1345,7 @@ wasmedge:x64-android=fail
 wavpack:arm-neon-android=fail
 wavpack:x64-android=fail
 winpcap:arm64-windows      = skip
-winpcap:arm-uwp            = skip
+winpcap:arm64-uwp            = skip
 winpcap:x64-uwp            = skip
 winpcap:x64-windows        = skip
 winpcap:x64-windows-static = skip
@@ -1356,7 +1355,7 @@ wordnet:arm-neon-android=fail
 wordnet:arm64-android=fail
 wordnet:x64-android=fail
 workflow:arm-neon-android=fail
-workflow:arm-uwp=fail
+workflow:arm64-uwp=fail
 workflow:arm64-android=fail
 workflow:x64-android=fail
 workflow:x64-uwp=fail
@@ -1374,9 +1373,9 @@ xbitmaps:arm-neon-android=fail
 xbitmaps:arm64-android=fail
 xbitmaps:x64-android=fail
 xbitmaps:x64-osx=skip
-xmlsec:arm-uwp=fail
+xmlsec:arm64-uwp=fail
 xmlsec:x64-uwp=fail
-yara:arm-uwp=fail
+yara:arm64-uwp=fail
 yara:x64-uwp=fail
 zeroc-ice:arm-neon-android=fail
 zeroc-ice:arm64-android=fail
@@ -1393,7 +1392,7 @@ cmake:x64-windows-static-md=pass
 cmake:arm64-windows=pass
 cmake:x64-linux=pass
 cmake:x64-osx=pass
-cmake-user:arm-uwp=pass
+cmake-user:arm64-uwp=pass
 cmake-user:arm64-windows=pass
 cmake-user:x64-linux=pass
 cmake-user:x64-osx=pass
@@ -1419,7 +1418,7 @@ vcpkg-ci-boost:x64-windows-static-md=pass
 vcpkg-ci-boost:x64-windows-static=pass
 vcpkg-ci-boost:x64-windows=pass
 vcpkg-ci-boost:x86-windows=pass
-vcpkg-ci-ffmpeg:arm-uwp=pass
+vcpkg-ci-ffmpeg:arm64-uwp=pass
 vcpkg-ci-ffmpeg:arm64-windows=pass
 vcpkg-ci-ffmpeg:x64-linux=pass
 vcpkg-ci-ffmpeg:x64-uwp=pass
@@ -1448,7 +1447,7 @@ vcpkg-ci-mathgl:x64-windows=pass
 vcpkg-ci-mathgl:x64-windows-static=pass
 vcpkg-ci-mathgl:x64-windows-static-md=pass
 vcpkg-ci-mathgl:x86-windows=pass
-vcpkg-ci-opencv:arm-uwp=pass
+vcpkg-ci-opencv:arm64-uwp=pass
 vcpkg-ci-opencv:arm64-windows=pass
 vcpkg-ci-opencv:x64-linux=pass
 vcpkg-ci-opencv:x64-uwp=pass