use both AssemblyVersion and Assembly Version

Reference: #3790
Signed-off-by: Alok Kumar <[email protected]>

Author: alok1304

src/packagedcode/win_pe.py

@@ -108,6 +108,7 @@ def logger_debug(*args):
     'ProductVersion',  # the actual version
     'FileVersion',  # another common version
     'Assembly Version',  # a version common in MSFT, redundant when present with ProductVersion
+    'AssemblyVersion',  # a version common in MSFT, redundant when present with ProductVersion
 
     'BuildDate',  # rare but useful when there 2013/02/04-18:07:46 2018-11-10 14:38
 
@@ -285,6 +286,7 @@ def parse(cls, location, package_only=False):
             'ProductVersion',
             'FileVersion',
             'Assembly Version',
+            'AssemblyVersion',
         )
         release_date = get_first(infos, 'BuildDate')
         if release_date:

tests/packagedcode/data/win_pe/Microsoft.Practices.EnterpriseLibrary.Caching.dll.expected.json

@@ -3,6 +3,7 @@
   "ProductVersion": "2.0.0.0",
   "FileVersion": "2.0.0.0",
   "Assembly Version": "2.0.0.0",
+  "AssemblyVersion": null,
   "BuildDate": null,
   "ProductName": "Microsoft Enterprise Library for .NET",
   "OriginalFilename": "Microsoft.Practices.EnterpriseLibrary.Caching.dll",

tests/packagedcode/data/win_pe/Moq.Silverlight.dll.expected.json

@@ -3,6 +3,7 @@
   "ProductVersion": "4.2.1507.0118",
   "FileVersion": "4.2.1507.0118",
   "Assembly Version": "4.2.1507.118",
+  "AssemblyVersion": null,
   "BuildDate": null,
   "ProductName": "Moq",
   "OriginalFilename": "Moq.Silverlight.dll",

tests/packagedcode/data/win_pe/Windows.AI.winmd.expected.json

@@ -3,6 +3,7 @@
   "ProductVersion": "10.0.10011.16384",
   "FileVersion": "10.0.10011.16384",
   "Assembly Version": null,
+  "AssemblyVersion": null,
   "BuildDate": null,
   "ProductName": "Windows SDK",
   "OriginalFilename": "",

tests/packagedcode/data/win_pe/_ctypes_test.pyd.expected.json

@@ -3,6 +3,7 @@
   "ProductVersion": null,
   "FileVersion": null,
   "Assembly Version": null,
+  "AssemblyVersion": null,
   "BuildDate": null,
   "ProductName": null,
   "OriginalFilename": null,

tests/packagedcode/data/win_pe/chcp.com.expected.json

@@ -3,6 +3,7 @@
   "ProductVersion": "10.0.17763.1",
   "FileVersion": "10.0.17763.1 (WinBuild.160101.0800)",
   "Assembly Version": null,
+  "AssemblyVersion": null,
   "BuildDate": null,
   "ProductName": "Microsoft\u00ae Windows\u00ae Operating System",
   "OriginalFilename": "CHCP.COM",

tests/packagedcode/data/win_pe/clfs.sys.mui.expected.json

@@ -3,6 +3,7 @@
   "ProductVersion": "10.0.18362.1256",
   "FileVersion": "10.0.18362.1256 (WinBuild.160101.0800)",
   "Assembly Version": null,
+  "AssemblyVersion": null,
   "BuildDate": null,
   "ProductName": "Microsoft\u00ae Windows\u00ae Operating System",
   "OriginalFilename": "Clfs.Sys.MUI",

tests/packagedcode/data/win_pe/crypt32.dll.mun.expected.json

@@ -3,6 +3,7 @@
   "ProductVersion": "10.0.18362.1256",
   "FileVersion": "10.0.18362.1256 (WinBuild.160101.0800)",
   "Assembly Version": null,
+  "AssemblyVersion": null,
   "BuildDate": null,
   "ProductName": "Microsoft\u00ae Windows\u00ae Operating System",
   "OriginalFilename": "CRYPT32.DLL",

tests/packagedcode/data/win_pe/euc-jp.so.expected.json

@@ -3,6 +3,7 @@
   "ProductVersion": null,
   "FileVersion": null,
   "Assembly Version": null,
+  "AssemblyVersion": null,
   "BuildDate": null,
   "ProductName": null,
   "OriginalFilename": null,

tests/packagedcode/data/win_pe/file.exe.expected.json

@@ -3,6 +3,7 @@
   "ProductVersion": "5.03.3414.16721",
   "FileVersion": "5.03.3414.16721",
   "Assembly Version": null,
+  "AssemblyVersion": null,
   "BuildDate": null,
   "ProductName": "File",
   "OriginalFilename": "file.exe",