Sync BaseTools Branch (version r2321) to EDKII main trunk.

Signed-off-by: lgao4
Reviewed-by: gikidy


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12372 6f19259b-4bc3-4df7-8a09-765794883524

BaseTools/Source/Python/BPDG/BPDG.py

@@ -27,12 +27,13 @@ import encodings.ascii
 from optparse import OptionParser
 from Common import EdkLogger
 from Common.BuildToolError import *
+from Common.BuildVersion import gBUILD_VERSION
 
 import StringTable as st
 import GenVpd
 
 PROJECT_NAME       = st.LBL_BPDG_LONG_UNI
-VERSION            = st.LBL_BPDG_VERSION
+VERSION            = (st.LBL_BPDG_VERSION + " " + gBUILD_VERSION)
 
 ## Tool entrance method
 #