From f7853d02396c7de95921df020be3ee7e9eeb8e9b Mon Sep 17 00:00:00 2001
From: RobbieNeko <30732426+RobbieNeko@users.noreply.github.com>
Date: Thu, 16 Jan 2025 19:46:57 -0500
Subject: [PATCH 1/2] Base commits

Co-Authored-By: David Li <david@david-li.com>
---
 .github/workflows/manual-release.yml          |  5 ---
 .../workflows/msvc-full-features-cmake.yml    |  3 +-
 .github/workflows/release.yml                 |  3 +-
 msvc-full-features/vcpkg.json                 | 32 +++++++------------
 4 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml
index 2453bb8aadf5..a7299df90087 100644
--- a/.github/workflows/manual-release.yml
+++ b/.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: |
diff --git a/.github/workflows/msvc-full-features-cmake.yml b/.github/workflows/msvc-full-features-cmake.yml
index 606fb245989b..7f775d15e4cc 100644
--- a/.github/workflows/msvc-full-features-cmake.yml
+++ b/.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: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0ebeea94f11e..7b2233fba645 100644
--- a/.github/workflows/release.yml
+++ b/.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'
diff --git a/msvc-full-features/vcpkg.json b/msvc-full-features/vcpkg.json
index da73cbcffe94..803419b6f914 100644
--- a/msvc-full-features/vcpkg.json
+++ b/msvc-full-features/vcpkg.json
@@ -1,22 +1,14 @@
 {
-    "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",
+  "vcpkg-configuration": {
+    "overlay-ports": [ "../.github/vcpkg_ports" ]
+  }
 }

From 2966e3e98ad21da3000be357eb36d7d82bbf9c60 Mon Sep 17 00:00:00 2001
From: RobbieNeko <30732426+RobbieNeko@users.noreply.github.com>
Date: Thu, 16 Jan 2025 21:36:38 -0500
Subject: [PATCH 2/2] PIN

---
 msvc-full-features/vcpkg.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/msvc-full-features/vcpkg.json b/msvc-full-features/vcpkg.json
index 803419b6f914..be8cd446f70e 100644
--- a/msvc-full-features/vcpkg.json
+++ b/msvc-full-features/vcpkg.json
@@ -8,6 +8,9 @@
     "sdl2-ttf"
   ],
   "builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
+  "overrides": [
+    { "name": "sdl2-mixer", "version": "2.6.3#1" }
+  ],
   "vcpkg-configuration": {
     "overlay-ports": [ "../.github/vcpkg_ports" ]
   }