build: Fix MSVC builds while preserving PRs' CMake build (#5934)

* Base commits

Co-Authored-By: David Li <david@david-li.com>

* PIN

---------

Co-authored-by: David Li <david@david-li.com>

.github/workflows/manual-release.yml

@@ -202,11 +202,6 @@ jobs:
           appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-${{ matrix.arch }}-1
           setupOnly: true
           vcpkgDirectory: "${{ runner.workspace }}/b/vcpkg"
-          # We have to use at least this version of vcpkg to include fixes for
-          # various issues we've encountered over time. Keep it in sync with the builtin-baseline
-          # field in vcpkg.json. Caching happens as a post-action which runs at the end of
-          # the whole workflow, after vcpkg install happens during msbuild run.
-          vcpkgGitCommitId: "66444e13a86da7087ee24c342f91801cc6eb9877"
       - name: Install dependencies (windows msvc) (3/3)
         if: runner.os == 'Windows'
         run: |

.github/workflows/msvc-full-features-cmake.yml

@@ -75,11 +75,10 @@ jobs:
       uses: lukka/get-cmake@latest
 
     - name: Install vcpkg
-      uses: lukka/run-vcpkg@v11
+      uses: lukka/run-vcpkg@main
       id: runvcpkg
       with:
         vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-        vcpkgGitCommitId: "66444e13a86da7087ee24c342f91801cc6eb9877"
 
     - name: Integrate vcpkg
       run: |

.github/workflows/release.yml

@@ -225,11 +225,10 @@ jobs:
         uses: lukka/get-cmake@latest
 
       - name: Install vcpkg
-        uses: lukka/run-vcpkg@v11
+        uses: lukka/run-vcpkg@main
         id: runvcpkg
         with:
           vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-          vcpkgGitCommitId: "66444e13a86da7087ee24c342f91801cc6eb9877"
 
       - name: Integrate vcpkg
         if: runner.os == 'Windows'

msvc-full-features/vcpkg.json

@@ -1,22 +1,17 @@
 {
-    "name": "bn-vcpkg-dependencies",
-    "version-string": "experimental",
-    "dependencies": [
-        "sdl2",
-        {
-          "name": "sdl2-image",
-          "features": [ "libjpeg-turbo" ]
-        },
-        {
-          "name": "sdl2-mixer",
-          "features": [ "libflac", "mpg123", "libmodplug" ]
-        },
-        "sdl2-ttf"
-    ],
-    "builtin-baseline": "c9aba300923c8ec0ab190e2bff23085209925c97",
-    "vcpkg-configuration": {
-        "overlay-ports": [
-            "../.github/vcpkg_ports"
-        ]
-    }
+  "name": "bn-vcpkg-dependencies",
+  "version-string": "experimental",
+  "dependencies": [
+    "sdl2",
+    { "name": "sdl2-image", "features": [ "libjpeg-turbo" ] },
+    { "name": "sdl2-mixer", "features": [ "libflac", "mpg123", "libmodplug" ] },
+    "sdl2-ttf"
+  ],
+  "builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
+  "overrides": [
+    { "name": "sdl2-mixer", "version": "2.6.3#1" }
+  ],
+  "vcpkg-configuration": {
+    "overlay-ports": [ "../.github/vcpkg_ports" ]
+  }
 }