[vcpkg] Update vcpkg tool version 2021-05-05 (#17689)

* [vcpkg] Update vcpkg tool version 2021-05-05

* [vcpkg] Hotfix bug in Microsoft/vcpkg-tool#34

* [vcpkg-ci] Ignore results from non-target triplets

* [protobuf] Fix regression introduced in #16904

* [vcpkg] Fix bug where 'staticcrt' was ignored

Co-authored-by: Robert Schumacher <ras0219@outlook.com>

11 files changed, 39 insertions, 7 deletions

diff --git a/ports/liblsl/CONTROL b/ports/liblsl/CONTROL
index 708ea67e1..1433bf143 100644
--- a/ports/liblsl/CONTROL
+++ b/ports/liblsl/CONTROL
@@ -1,6 +1,7 @@
 Source: liblsl

 Version: 1.14.0

+Port-Version: 1

 Homepage: https://github.com/sccn/liblsl

 Description: C++ lsl library for multi-modal time-synched data transmission over the local network

-Supports: !(static & staticcrt)

+Supports: !staticcrt

 Build-Depends: pugixml

diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index a86c2d8a0..939e37096 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -88,6 +88,12 @@ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-config.cmake
     "if(protobuf_MODULE_COMPATIBLE)"
     "if(ON)"
 )
+if(NOT protobuf_BUILD_LIBPROTOC)
+    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-module.cmake
+        "_protobuf_find_libraries(Protobuf_PROTOC protoc)"
+        ""
+    )
+endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin)
diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json
index 2224b2465..5808add91 100644
--- a/ports/protobuf/vcpkg.json
+++ b/ports/protobuf/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "protobuf",
   "version-semver": "3.15.8",
+  "port-version": 1,
   "description": "Protocol Buffers - Google's data interchange format",
   "homepage": "https://github.com/protocolbuffers/protobuf",
   "dependencies": [
diff --git a/scripts/azure-pipelines/analyze-test-results.ps1 b/scripts/azure-pipelines/analyze-test-results.ps1
index 5bebe985c..d96069abe 100755
--- a/scripts/azure-pipelines/analyze-test-results.ps1
+++ b/scripts/azure-pipelines/analyze-test-results.ps1
@@ -100,6 +100,10 @@ function build_test_results {
 
     $allTestResults = @{ }
     foreach ( $test in $xmlCollection.test) {
+        if (!$test.name.endswith(":$triplet"))
+        {
+            continue
+        }
         $name = ($test.name -replace ":.*$")
 
         # Reconstruct the original BuildResult enumeration (defined in Build.h)
diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1
index fa80a1a10..34533aef7 100755
--- a/scripts/azure-pipelines/test-modified-ports.ps1
+++ b/scripts/azure-pipelines/test-modified-ports.ps1
@@ -142,7 +142,16 @@ if ($Triplet -in @('x64-uwp', 'arm64-windows', 'arm-uwp', 'x64-windows', 'x64-wi
     .\vcpkg.exe install yasm-tool:x86-windows @commonArgs

 }

 

-& "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs

+if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux'))

+{

+    # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list.

+    # The workaround is to pass the skip list as host-excludes as well.

+    & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs

+}

+else

+{

+    & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs

+}

 & "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults `

     -triplet $Triplet `

     -baselineFile .\scripts\ci.baseline.txt

diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index bd2888072..1b0da1d33 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))
 
 Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found"
 
-& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-02-24-d67989bce1043b98092ac45996a8230a059a2d7e/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
+& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-05-05-9f849c4c43e50d1b16186ae76681c27b0c1be9d9/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
 Write-Host ""
 
 if ($LASTEXITCODE -ne 0)
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 280793423..9a97751d6 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -278,8 +278,8 @@ else
 fi
 
 # Do the build
-vcpkgToolReleaseTag="2021-02-24-d67989bce1043b98092ac45996a8230a059a2d7e"
-vcpkgToolReleaseSha="0b0f2cd40aa92556c28e1dfa9f8356313a859fb6acb6c730821a06bd9d554ab1ea0622da4026ea66fb11b9ed4fda1316cc388067d51ff1f09af85d033fe4323d"
+vcpkgToolReleaseTag="2021-05-05-9f849c4c43e50d1b16186ae76681c27b0c1be9d9"
+vcpkgToolReleaseSha="2b85eb0da65221d207a5023eda0d4da74258d7fb5db9e211718efb2573673daa3fa98a75af4a570595f12467a8f7e7759a3be01b33598a4fb6d4203bf83949ef"
 vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz"
 vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball"
 baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg"
diff --git a/scripts/vcpkg_get_tags.cmake b/scripts/vcpkg_get_tags.cmake
index 749b06e5a..09d938bbd 100644
--- a/scripts/vcpkg_get_tags.cmake
+++ b/scripts/vcpkg_get_tags.cmake
@@ -12,6 +12,7 @@ VCPKG_VISUAL_STUDIO_PATH=${VCPKG_VISUAL_STUDIO_PATH}
 VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}
 VCPKG_BUILD_TYPE=${VCPKG_BUILD_TYPE}
 VCPKG_LIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE}
+VCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}
 e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f")
 
     # Just to enforce the user didn't set it in the triplet file
diff --git a/versions/baseline.json b/versions/baseline.json
index 729cc1c7e..ea3c27fe8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3238,7 +3238,7 @@
     },
     "liblsl": {
       "baseline": "1.14.0",
-      "port-version": 0
+      "port-version": 1
     },
     "liblzma": {
       "baseline": "5.2.5",
@@ -4922,7 +4922,7 @@
     },
     "protobuf": {
       "baseline": "3.15.8",
-      "port-version": 0
+      "port-version": 1
     },
     "protobuf-c": {
       "baseline": "1.3.2-2",
diff --git a/versions/l-/liblsl.json b/versions/l-/liblsl.json
index 66cfc9907..60945ffaf 100644
--- a/versions/l-/liblsl.json
+++ b/versions/l-/liblsl.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "960eac893dd574369d79d40248bd91c38a8c3448",
+      "version-string": "1.14.0",
+      "port-version": 1
+    },
+    {
       "git-tree": "5be8e82edc3261bef4114e428191a4ccc9271892",
       "version-string": "1.14.0",
       "port-version": 0
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index a1b771283..188f13360 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "04dc7ffb4ebb123e734652cdb359ff18dca83ffc",
+      "version-semver": "3.15.8",
+      "port-version": 1
+    },
+    {
       "git-tree": "1ffb8fef5a5ded5a0350fee3550cad324017e89a",
       "version-semver": "3.15.8",
       "port-version": 0