diff options
| author | ras0219 <robertallenschumacher@gmail.com> | 2020-06-30 14:02:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 14:02:26 -0700 |
| commit | 3f6342db6ded036422886da6ccf8191685dc2ccf (patch) | |
| tree | c1377b8116c1ca8b8ef61fdbf6c8fa6b4dcc1dad /scripts | |
| parent | 1d8f0acc9c3085d18152a3f639077a28109196b6 (diff) | |
| download | vcpkg-3f6342db6ded036422886da6ccf8191685dc2ccf.tar.gz vcpkg-3f6342db6ded036422886da6ccf8191685dc2ccf.zip | |
[vcpkg] Fix `vcpkg export --nuget` regressions (#12174)
* [vcpkg] Upgrade find_acquire_program(NUGET) to 5.5.1. Add partial SHA to temporary download paths to avoid collisions.
* [vcpkg] Fix regression in `vcpkg export --nuget` due to file locking on .vcpkg-root
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 102e9c235..8ec9f4c9b 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -219,12 +219,14 @@ function(vcpkg_find_acquire_program VAR) set(HASH a196e243c53daa1df9d287af658d6d38d6b830b614f2d5704e8c88ffc61f179a533ae71cdb6d0d383d1559d65dacccbaaab270fb2a33aa211e5dba42ff046f97) elseif(VAR MATCHES "NUGET") set(PROGNAME nuget) - set(PATHS "${DOWNLOADS}/tools/nuget") + set(SUBDIR "5.5.1") + set(PATHS "${DOWNLOADS}/tools/nuget/${SUBDIR}") set(BREW_PACKAGE_NAME "nuget") - set(URL "https://dist.nuget.org/win-x86-commandline/v4.8.1/nuget.exe") - set(ARCHIVE "nuget.exe") + set(URL "https://dist.nuget.org/win-x86-commandline/v5.5.1/nuget.exe") + set(_vfa_RENAME "nuget.exe") + set(ARCHIVE "nuget.5.5.1.exe") set(NOEXTRACT ON) - set(HASH 42cb744338af8decc033a75bce5b4c4df28e102bafc45f9a8ba86d7bc010f5b43ebacae80d7b28c4f85ac900eefc2a349620ae65f27f6ca1c21c53b63b92924b) + set(HASH 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619) elseif(VAR MATCHES "MESON") set(PROGNAME meson) set(REQUIRED_INTERPRETER PYTHON3) |