Upgrade msvcr140 and vcpkg dependencies (#4872)

confluentinc · Nov 29, 2024 · 6f1b949 · 6f1b949
1 parent 41604e5
commit 6f1b949
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -304,20 +304,13 @@ blocks:
       prologue:
         commands:
           # install vcpkg in the parent directory.
-          - pwd
           - cd ..
           # Setup vcpkg
           - "& .\\librdkafka\\win32\\setup-vcpkg.ps1"
           - cd librdkafka
           - ..\vcpkg\vcpkg integrate install
           # Install required packages.
           - ..\vcpkg\vcpkg --feature-flags=versions install --triplet $Env:triplet
-          - cd ..
-          - pwd
-          - ls vcpkg/
-          - echo $Env:VCPKG_ROOT
-          - pwd
-          - cd librdkafka
       epilogue:
         commands:
           - Get-ChildItem . -include *.dll -recurse

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@ librdkafka v2.6.1 is a maintenance release:
 * Fix to remove fetch queue messages that blocked the destroy of rdkafka
   instances (#4724)
 * Upgrade Linux dependencies: OpenSSL 3.0.15, CURL 8.10.1 (#4875).
+* Upgrade Windows dependencies: MSVC runtime to 14.40.338160.0,
+  zstd 1.5.6, zlib 1.3.1, OpenSSL 3.3.2, CURL 8.10.1 (#4872).
 
 
 ## Fixes

diff --git a/packaging/nuget/common/p-common__plat-windows__arch-win32__bldtype-Release/msvcr140.zip b/packaging/nuget/common/p-common__plat-windows__arch-win32__bldtype-Release/msvcr140.zip
diff --git a/packaging/nuget/common/p-common__plat-windows__arch-x64__bldtype-Release/msvcr140.zip b/packaging/nuget/common/p-common__plat-windows__arch-x64__bldtype-Release/msvcr140.zip
diff --git a/vcpkg.json b/vcpkg.json
@@ -4,19 +4,19 @@
     "dependencies": [
         {
             "name": "zstd",
-            "version>=": "1.5.5#2"
+            "version>=": "1.5.6#0"
         },
         {
             "name": "zlib",
-            "version>=": "1.3"
+            "version>=": "1.3.1#0"
         },
         {
             "name": "openssl",
-            "version>=": "3.0.8"
+            "version>=": "3.3.2#1"
         },
         {
             "name": "curl",
-            "version>=": "8.4.0"
+            "version>=": "8.10.1#0"
         }
     ],
     "builtin-baseline": "56765209ec0e92c58a5fd91aa09c46a16d660026"

diff --git a/win32/setup-vcpkg.ps1 b/win32/setup-vcpkg.ps1
@@ -5,7 +5,7 @@ if (!(Test-Path -Path vcpkg/.git)) {
 }
 
 cd vcpkg
-git checkout 2023.11.20
+git checkout 2024.09.30
 cd ..
 
 .\vcpkg\bootstrap-vcpkg.bat