From a73c889be74ece2c6654b580133e0e267e879255 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 21 Oct 2024 13:45:42 -0700 Subject: [PATCH] Update vcpkg-tool to 2024-10-18. (#41650) --- scripts/update-vcpkg-tool-metadata.ps1 | 31 -------------------------- scripts/vcpkg-tool-metadata.txt | 10 ++++----- 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/scripts/update-vcpkg-tool-metadata.ps1 b/scripts/update-vcpkg-tool-metadata.ps1 index aafcc6141c..bc1cce9698 100644 --- a/scripts/update-vcpkg-tool-metadata.ps1 +++ b/scripts/update-vcpkg-tool-metadata.ps1 @@ -5,26 +5,7 @@ Param( [string]$Date ) -function Get-Sha256 { - Param([string]$File) - $content = [System.IO.File]::ReadAllBytes($File) - $shaHasher = $null - [string]$shaHash = '' - try { - $shaHasher = [System.Security.Cryptography.SHA256]::Create() - $hashBytes = $shaHasher.ComputeHash($content) - $shaHash = [System.BitConverter]::ToString($hashBytes).Replace('-', '').ToLowerInvariant() - } finally { - if ($shaHasher -ne $null) { - $shaHasher.Dispose(); - } - } - - return $shaHash -} - [string]$metadata = "VCPKG_TOOL_RELEASE_TAG=$Date`n" -$vsCodeHashes = [ordered]@{} Set-Content -LiteralPath "$PSScriptRoot\vcpkg-tool-metadata.txt" -Value $metadata -NoNewline -Encoding utf8NoBOM & "$PSScriptRoot\bootstrap.ps1" [string]$vcpkg = "$PSScriptRoot\..\vcpkg.exe" @@ -32,7 +13,6 @@ Set-Content -LiteralPath "$PSScriptRoot\vcpkg-tool-metadata.txt" -Value $metadat # Windows arm64 (VS Code only) & $vcpkg x-download "$PSScriptRoot\vcpkg-arm64.exe" ` "--url=https://github.com/microsoft/vcpkg-tool/releases/download/$Date/vcpkg-arm64.exe" --skip-sha512 -$vsCodeHashes["vcpkg-arm64.exe"] = Get-Sha256 "$PSScriptRoot\vcpkg-arm64.exe" # Linux Binaries foreach ($binary in @('macos', 'muslc', 'glibc')) { @@ -41,12 +21,8 @@ foreach ($binary in @('macos', 'muslc', 'glibc')) { "--url=https://github.com/microsoft/vcpkg-tool/releases/download/$Date/vcpkg-$binary" --skip-sha512 $sha512 = & $vcpkg hash "$PSScriptRoot\vcpkg-$binary" $metadata += "VCPKG_$($caps)_SHA=$sha512`n" - $vsCodeHashes["vcpkg-$binary"] = Get-Sha256 "$PSScriptRoot\vcpkg-$binary" } -# Windows x64 (assumed to be host) -$vsCodeHashes["vcpkg.exe"] = Get-Sha256 "$vcpkg" - # Source $sourceName = "$Date.tar.gz" & $vcpkg x-download "$PSScriptRoot\$sourceName" ` @@ -66,10 +42,3 @@ Remove-Item @( Set-Content -LiteralPath "$PSScriptRoot\vcpkg-tool-metadata.txt" -Value $metadata -NoNewline -Encoding utf8NoBOM Write-Host "Metadata Written" -Write-Host "VS Code Block" -$vsCodeOverall = [ordered]@{ - version = $Date; - hashes = $vsCodeHashes; -} - -Write-Host (ConvertTo-Json $vsCodeOverall) diff --git a/scripts/vcpkg-tool-metadata.txt b/scripts/vcpkg-tool-metadata.txt index 43d74622d0..e78b10e3aa 100644 --- a/scripts/vcpkg-tool-metadata.txt +++ b/scripts/vcpkg-tool-metadata.txt @@ -1,5 +1,5 @@ -VCPKG_TOOL_RELEASE_TAG=2024-09-30 -VCPKG_MACOS_SHA=de9f4088783ab34c217121e7529594b56c3909992088290f59fab145be1255957524de0ecbd63ed51d60710212521f64c016f37a679dcec58f73bfbdf56606bc -VCPKG_MUSLC_SHA=d3996b0291b5d42ef0431cc60e500848f8a0c28a0d6608eec28a04eca2594b926f58a1bdb82767fdd68023fae53ca67f41bd25662400592223b8c1b57f6ea10a -VCPKG_GLIBC_SHA=e1ebdacf87bf747be57e345ff40ab41df9c8b88bd4789fde8fe1ecf8af9037ba7c123ff7d2766ae7091a6182445cedc87d01d233fc01490fe17b4e1dde218948 -VCPKG_TOOL_SOURCE_SHA=23bca9955e20fb6c0a4140ee3dea069f654be3fb15ca3e7e5f4d0446592ba1dd4afcee8b9ef9f82e28dfe715b7fe966d9f2a8e412583b7fc5a1993142c378755 +VCPKG_TOOL_RELEASE_TAG=2024-10-18 +VCPKG_MACOS_SHA=50f41ed37fb1772da4f9d4ddf05875b6bf53eb3fbc56f47060cb9dcedacfe9628f1c87d0df49f8cc204c546e07fd89b0f7efe89511e61232503e63684631304f +VCPKG_MUSLC_SHA=008a0263d3e128c50eb682d33f0d337e590c1e6cc5e0f9788d5c534848359e80d1515304f7bc5e15fdf9699b0692fa0e1cf3bfb295f1d011ce0bc380fb4f147a +VCPKG_GLIBC_SHA=47536d30e8ba854bc283776d5be67401e230aca55054ce439f712c2e7b21f5d05b86aa64438252e91390601eefe26710bfc83c5fb154d6737940f334c6c932a0 +VCPKG_TOOL_SOURCE_SHA=35bb6b95746a9c567fb5a5ad6d8d0c637093745c2487f3def6f84b1d3a7ae4753d7e41efde44fd34bc4f9c72e9bbecf1d042cda9542f734728f3f8d94d4f35e7