[expat] Fix build failure. (#28368)

* [expat] Fix unset version variable. * version stuff * [expat] Use `vcpkg_minimum_required()`. * version stuff * [expat] address comments from cr * version junk
microsoft · Dec 19, 2022 · cafd285 · cafd285
1 parent fe6e7f7
commit cafd285
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake
@@ -1,7 +1,10 @@
+vcpkg_minimum_required(VERSION 2022-10-12)
+string(REPLACE "." "_" REF "R_${VERSION}")
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libexpat/libexpat
-    REF R_2_5_0
+    REF "${REF}"
     SHA512 779f0d0f3f2d8b33db0fd044864ab5ab1a40f20501f792fe90ad0d18de536c4765c3749f120e21fec11a0e6c89af1dc576d1fe261c871ca44a594f7b61fd1d9e
     HEAD_REF master
 )

diff --git a/ports/expat/vcpkg.json b/ports/expat/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "expat",
   "version": "2.5.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "XML parser library written in C",
   "homepage": "https://github.com/libexpat/libexpat",
   "license": "MIT",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2206,7 +2206,7 @@
     },
     "expat": {
       "baseline": "2.5.0",
-      "port-version": 1
+      "port-version": 2
     },
     "expected-lite": {
       "baseline": "0.6.2",

diff --git a/versions/e-/expat.json b/versions/e-/expat.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fcad5bc870991726ccb6cc02760d2a5422257bbd",
+      "version": "2.5.0",
+      "port-version": 2
+    },
     {
       "git-tree": "5da852ba8ea975e8f950bf766129724327232861",
       "version": "2.5.0",