From 84744e30deecf8a02fc77e9332e8054a4c961c2c Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Fri, 4 Dec 2020 10:21:21 +0300 Subject: [PATCH] [Windows] Fix version output for vcpkg (#2142) * change version output for vcpkg * change to short commit id * minor change * minor change * minor change * resolve issue --- images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index adf6bb37..0a1e6999 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -103,7 +103,8 @@ function Get-ChocoVersion { function Get-VcpkgVersion { ($(vcpkg version) | Out-String) -match "version (?\d+\.\d+\.\d+)" | Out-Null $vcpkgVersion = $Matches.Version - return "Vcpkg $vcpkgVersion" + $commitId = git -C "C:\vcpkg" rev-parse --short HEAD + return "Vcpkg $vcpkgVersion (build from master <$commitId>)" } function Get-NPMVersion {