Fixed version export in spdx module. (#1400)

microsoft · May 14, 2024 · 03a25db · 03a25db
1 parent 6081c15
commit 03a25db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/vcpkg-test/spdx.cpp b/src/vcpkg-test/spdx.cpp
@@ -43,7 +43,7 @@ TEST_CASE ("spdx maximum serialization", "[spdx]")
   "name": "zlib:arm-uwp@1.0#5 ABIHASH",
   "creationInfo": {
     "creators": [
-      "Tool: vcpkg-unknownhash"
+      "Tool: vcpkg-2999-12-31-unknownhash"
     ],
     "created": "now"
   },
@@ -197,7 +197,7 @@ TEST_CASE ("spdx minimum serialization", "[spdx]")
   "name": "zlib:arm-uwp@1.0 deadbeef",
   "creationInfo": {
     "creators": [
-      "Tool: vcpkg-unknownhash"
+      "Tool: vcpkg-2999-12-31-unknownhash"
     ],
     "created": "now+1"
   },
@@ -338,7 +338,7 @@ TEST_CASE ("spdx concat resources", "[spdx]")
   "name": "zlib:arm-uwp@1.0 deadbeef",
   "creationInfo": {
     "creators": [
-      "Tool: vcpkg-unknownhash"
+      "Tool: vcpkg-2999-12-31-unknownhash"
     ],
     "created": "now+1"
   },

diff --git a/src/vcpkg/spdx.cpp b/src/vcpkg/spdx.cpp
@@ -160,7 +160,7 @@ std::string vcpkg::create_spdx_sbom(const InstallPlanAction& action,
     {
         auto& cinfo = doc.insert(SpdxCreationInfo, Json::Object());
         auto& creators = cinfo.insert(JsonIdCreators, Json::Array());
-        creators.push_back(Strings::concat("Tool: vcpkg-", VCPKG_VERSION_AS_STRING));
+        creators.push_back(Strings::concat("Tool: vcpkg-", VCPKG_BASE_VERSION_AS_STRING, '-', VCPKG_VERSION_AS_STRING));
         cinfo.insert(JsonIdCreated, std::move(created_time));
     }