From 4f8fb510ba03f195a49f6353b97fabf5bb20d450 Mon Sep 17 00:00:00 2001
From: ras0219 <533828+ras0219@users.noreply.github.com>
Date: Fri, 15 Jan 2021 12:35:48 -0800
Subject: [vcpkg] Add initial versioning documentation (#15565)

* [vcpkg] Improve efficiency and tests of versioning

* [vcpkg] Add initial versioning documentation and rename x-default-baseline to builtin-baseline

* [vcpkg] Enable metrics for builtin-baseline & overrides

* [vcpkg] Address PR comments

* [vcpkg] Add support for  syntax in version>=

* [vcpkg] Remove port-version from dependency syntax

* [vcpkg] Address CR comment

* [vcpkg] Minor docs fixup
---
 .../testing/version-files/default-baseline-1/vcpkg.json    |  2 +-
 .../testing/version-files/default-baseline-2/vcpkg.json    |  4 ++--
 .../without-default-baseline-2/port_versions/z-/zlib.json  | 14 ++++++++++++++
 .../version-files/without-default-baseline-2/vcpkg.json    |  7 +++++++
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 scripts/testing/version-files/without-default-baseline-2/port_versions/z-/zlib.json
 create mode 100644 scripts/testing/version-files/without-default-baseline-2/vcpkg.json

(limited to 'scripts/testing')

diff --git a/scripts/testing/version-files/default-baseline-1/vcpkg.json b/scripts/testing/version-files/default-baseline-1/vcpkg.json
index f6d902393..51e65c82c 100644
--- a/scripts/testing/version-files/default-baseline-1/vcpkg.json
+++ b/scripts/testing/version-files/default-baseline-1/vcpkg.json
@@ -1,7 +1,7 @@
 {
     "name": "default-baseline-test",
     "version-string": "0",
-    "$x-default-baseline": "fca18ba3572f8aebe3b8158c359db62a7e26134e",
+    "builtin-baseline": "fca18ba3572f8aebe3b8158c359db62a7e26134e",
     "dependencies": [
         "zlib"
     ]
diff --git a/scripts/testing/version-files/default-baseline-2/vcpkg.json b/scripts/testing/version-files/default-baseline-2/vcpkg.json
index af353c09d..f540ccba0 100644
--- a/scripts/testing/version-files/default-baseline-2/vcpkg.json
+++ b/scripts/testing/version-files/default-baseline-2/vcpkg.json
@@ -1,7 +1,7 @@
 {
-    "name": "default-baseline-test",
+    "name": "default-baseline-test-2",
     "version-string": "0",
-    "$x-default-baseline": "16002d9c2318dec4c69e02d9af8c0e11dca0d4c6",
+    "builtin-baseline": "16002d9c2318dec4c69e02d9af8c0e11dca0d4c6",
     "dependencies": [
         "zlib"
     ]
diff --git a/scripts/testing/version-files/without-default-baseline-2/port_versions/z-/zlib.json b/scripts/testing/version-files/without-default-baseline-2/port_versions/z-/zlib.json
new file mode 100644
index 000000000..f5ee7cb9d
--- /dev/null
+++ b/scripts/testing/version-files/without-default-baseline-2/port_versions/z-/zlib.json
@@ -0,0 +1,14 @@
+{
+    "versions": [
+        {
+            "git-tree": "7bb2b2f3783303a4dd41163553fe4cc103dc9262",
+            "version-string": "1.2.11",
+            "port-version": 9
+        },
+        {
+            "git-tree": "4927735fa9baca564ebddf6e6880de344b20d7a8",
+            "version-string": "1.2.11",
+            "port-version": 8
+        }
+    ]
+}
\ No newline at end of file
diff --git a/scripts/testing/version-files/without-default-baseline-2/vcpkg.json b/scripts/testing/version-files/without-default-baseline-2/vcpkg.json
new file mode 100644
index 000000000..839418fb7
--- /dev/null
+++ b/scripts/testing/version-files/without-default-baseline-2/vcpkg.json
@@ -0,0 +1,7 @@
+{
+    "name": "without-default-baseline-test-2",
+    "version-string": "0",
+    "dependencies": [
+        "zlib"
+    ]
+}
\ No newline at end of file
-- 
cgit v1.2.3