Skip to content

Commit 0c185f0

Browse files
alok1304alok1304
committed
use both Assembly Version and AssemblyVersion
1 parent 51c9005 commit 0c185f0

16 files changed

+17
-0
lines changed

‎src/packagedcode/win_pe.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ def logger_debug(*args):
107107
'Full Version', # rare and used only by Java exe
108108
'ProductVersion', # the actual version
109109
'FileVersion', # another common version
110+
'Assembly Version', # a version common in MSFT, redundant when present with ProductVersion
110111
'AssemblyVersion', # a version common in MSFT, redundant when present with ProductVersion
111112

112113
'BuildDate', # rare but useful when there 2013/02/04-18:07:46 2018-11-10 14:38
@@ -284,6 +285,7 @@ def parse(cls, location, package_only=False):
284285
'Full Version',
285286
'ProductVersion',
286287
'FileVersion',
288+
'Assembly Version',
287289
'AssemblyVersion',
288290
)
289291
release_date = get_first(infos, 'BuildDate')

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": "2.0.0.0",
44
"FileVersion": "2.0.0.0",
5+
"Assembly Version": "2.0.0.0",
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": "Microsoft Enterprise Library for .NET",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": "4.2.1507.0118",
44
"FileVersion": "4.2.1507.0118",
5+
"Assembly Version": "4.2.1507.118",
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": "Moq",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": "10.0.10011.16384",
44
"FileVersion": "10.0.10011.16384",
5+
"Assembly Version": null,
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": "Windows SDK",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": null,
44
"FileVersion": null,
5+
"Assembly Version": null,
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": null,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": "10.0.17763.1",
44
"FileVersion": "10.0.17763.1 (WinBuild.160101.0800)",
5+
"Assembly Version": null,
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": "Microsoft\u00ae Windows\u00ae Operating System",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": "10.0.18362.1256",
44
"FileVersion": "10.0.18362.1256 (WinBuild.160101.0800)",
5+
"Assembly Version": null,
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": "Microsoft\u00ae Windows\u00ae Operating System",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": "10.0.18362.1256",
44
"FileVersion": "10.0.18362.1256 (WinBuild.160101.0800)",
5+
"Assembly Version": null,
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": "Microsoft\u00ae Windows\u00ae Operating System",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": null,
44
"FileVersion": null,
5+
"Assembly Version": null,
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": null,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": "5.03.3414.16721",
44
"FileVersion": "5.03.3414.16721",
5+
"Assembly Version": null,
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": "File",

‎tests/packagedcode/data/win_pe/libiconv2.dll.expected.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": "1.9.2.1519",
44
"FileVersion": "1.9.2.1519",
5+
"Assembly Version": null,
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": "LibIconv",

‎tests/packagedcode/data/win_pe/libintl3.dll.expected.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": "0.14.4.1952",
44
"FileVersion": "0.14.4.1952",
5+
"Assembly Version": null,
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": "GetText",

‎tests/packagedcode/data/win_pe/stdole2.tlb.expected.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": "10.0.18362.1256",
44
"FileVersion": "10.0.18362.1256 (WinBuild.160101.0800)",
5+
"Assembly Version": null,
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": "Microsoft\u00ae Windows\u00ae Operating System",

‎tests/packagedcode/data/win_pe/tbs.sys.expected.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": "10.0.17763.1697",
44
"FileVersion": "10.0.17763.1697 (WinBuild.160101.0800)",
5+
"Assembly Version": null,
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": "Microsoft\u00ae Windows\u00ae Operating System",

‎tests/packagedcode/data/win_pe/tre4.dll.expected.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": "0.7.5.3276",
44
"FileVersion": "0.7.5.3276",
5+
"Assembly Version": null,
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": "Tre",

‎tests/packagedcode/data/win_pe/zlib1.dll.expected.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Full Version": null,
33
"ProductVersion": "1.2.3.2532",
44
"FileVersion": "1.2.3.2532",
5+
"Assembly Version": null,
56
"AssemblyVersion": null,
67
"BuildDate": null,
78
"ProductName": "Zlib",

0 commit comments

Comments
 (0)