[vcpkg] Change version field in `baseline.json` (#15633)

* [vcpkg] Change version field in `baseline.json`

* Change name from `version-tag` to `baseline`

* [vcpkg] x-history serializes version scheme

* Update e2e tests

* Update baseline e2e test

5 files changed, 33 insertions, 22 deletions

diff --git a/scripts/e2e_ports/port_versions/baseline.json b/scripts/e2e_ports/port_versions/baseline.json
index 953e8752d..98e63d8b5 100644
--- a/scripts/e2e_ports/port_versions/baseline.json
+++ b/scripts/e2e_ports/port_versions/baseline.json
@@ -1,3 +1,3 @@
 {
-	"vcpkg-internal-e2e-test-port": { "version-string": "1.0.0" }
+	"vcpkg-internal-e2e-test-port": { "baseline": "1.0.0" }
 }
diff --git a/scripts/generateBaseline.py b/scripts/generateBaseline.py
index 55bea6ba2..d70ab369b 100644
--- a/scripts/generateBaseline.py
+++ b/scripts/generateBaseline.py
@@ -11,6 +11,24 @@ PORTS_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../ports')
 VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../port_versions')

 

 

+def get_version_tag(version):

+    if 'version' in version:

+        return version['version']

+    elif 'version-date' in version:

+        return version['version-date']

+    elif 'version-semver' in version:

+        return version['version-semver']

+    elif 'version-string' in version:

+        return version['version-string']

+    sys.exit(1)

+

+

+def get_version_port_version(version):

+    if 'port-version' in version:

+        return version['port-version']

+    return 0

+

+

 def generate_baseline():

     start_time = time.time()

 

@@ -35,18 +53,11 @@ def generate_baseline():
             try:

                 versions_object = json.load(db_file)

                 if versions_object['versions']:

-                    last_version = versions_object['versions'][0] 

-                    version_obj = {}

-                    if 'version' in last_version:

-                        version_obj['version'] = last_version['version']

-                    elif 'version-date' in last_version:

-                        version_obj['version-date'] = last_version['version-date']

-                    elif 'version-semver' in last_version:

-                        version_obj['version-semver'] - last_version['version-semver']

-                    else:

-                        version_obj['version-string'] = last_version['version-string']

-                    version_obj['port-version'] = last_version['port-version']

-                    baseline_entries[port_name] = version_obj

+                    last_version = versions_object['versions'][0]

+                    baseline_entries[port_name] = {

+                        'baseline': get_version_tag(last_version),

+                        'port-version': get_version_port_version(last_version)

+                    }

             except json.JSONDecodeError as e:

                 print(f'Error: Decoding {port_file_path}\n{e}\n')

     baseline_object = {}

diff --git a/scripts/testing/version-files/default-baseline-2/vcpkg.json b/scripts/testing/version-files/default-baseline-2/vcpkg.json
index 1e41002ff..af353c09d 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",
     "version-string": "0",
-    "$x-default-baseline": "cbd5a68012471f820b7cf28d618199b4a4d89c58",
+    "$x-default-baseline": "16002d9c2318dec4c69e02d9af8c0e11dca0d4c6",
     "dependencies": [
         "zlib"
     ]
diff --git a/scripts/testing/version-files/port_versions/baseline.json b/scripts/testing/version-files/port_versions/baseline.json
index bfe49f984..44a4764a1 100644
--- a/scripts/testing/version-files/port_versions/baseline.json
+++ b/scripts/testing/version-files/port_versions/baseline.json
@@ -1,19 +1,19 @@
 {
   "default": {
     "cat": {
-      "version-string": "1.0",
+      "baseline": "1.0",
       "port-version": 0
     },
     "dog": {
-      "version-string": "2001-01-01",
+      "baseline": "2001-01-01",
       "port-version": 0
     },
     "duck": {
-      "version-string": "mallard",
+      "baseline": "mallard",
       "port-version": 0
     },
     "mouse": {
-      "version-string": "1.0.0",
+      "baseline": "1.0.0",
       "port-version": 0
     }
   }
diff --git a/scripts/testing/version-files/port_versions_incomplete/baseline.json b/scripts/testing/version-files/port_versions_incomplete/baseline.json
index aadd634fc..7f27e5b65 100644
--- a/scripts/testing/version-files/port_versions_incomplete/baseline.json
+++ b/scripts/testing/version-files/port_versions_incomplete/baseline.json
@@ -1,19 +1,19 @@
 {
   "default": {
     "cat": {
-      "version-string": "1.0",
+      "baseline": "1.0",
       "port-version": 0
     },
     "dog": {
-      "version-string": "2001-01-01",
+      "baseline": "2001-01-01",
       "port-version": 0
     }, 
     "duck": {
-      "version-string": "mallard",
+      "baseline": "mallard",
       "port-version": 0
     },
     "fish": {
-      "version-string": "1.0.0",
+      "baseline": "1.0.0",
       "port-version": 0
     }
   }