Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change Assembly Version to AssemblyVersion in win_pe #4116

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/packagedcode/win_pe.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def logger_debug(*args):
'Full Version', # rare and used only by Java exe
'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

Expand Down Expand Up @@ -284,7 +284,7 @@ def parse(cls, location, package_only=False):
'Full Version',
'ProductVersion',
'FileVersion',
'Assembly Version',
'AssemblyVersion',
)
release_date = get_first(infos, 'BuildDate')
if release_date:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"ProductVersion": "10.0.10011.16384",
"FileVersion": "10.0.10011.16384",
"Assembly Version": null,
"AssemblyVersion": null,
"BuildDate": null,
"ProductName": "Windows SDK",
"OriginalFilename": "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"ProductVersion": null,
"FileVersion": null,
"Assembly Version": null,
"AssemblyVersion": null,
"BuildDate": null,
"ProductName": null,
"OriginalFilename": null,
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/win_pe/chcp.com.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"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",
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/win_pe/clfs.sys.mui.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"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",
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/win_pe/euc-jp.so.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"ProductVersion": null,
"FileVersion": null,
"Assembly Version": null,
"AssemblyVersion": null,
"BuildDate": null,
"ProductName": null,
"OriginalFilename": null,
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/win_pe/file.exe.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"ProductVersion": "5.03.3414.16721",
"FileVersion": "5.03.3414.16721",
"Assembly Version": null,
"AssemblyVersion": null,
"BuildDate": null,
"ProductName": "File",
"OriginalFilename": "file.exe",
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/win_pe/libiconv2.dll.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"ProductVersion": "1.9.2.1519",
"FileVersion": "1.9.2.1519",
"Assembly Version": null,
"AssemblyVersion": null,
"BuildDate": null,
"ProductName": "LibIconv",
"OriginalFilename": "libiconv2.dll",
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/win_pe/libintl3.dll.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"ProductVersion": "0.14.4.1952",
"FileVersion": "0.14.4.1952",
"Assembly Version": null,
"AssemblyVersion": null,
"BuildDate": null,
"ProductName": "GetText",
"OriginalFilename": "libintl3.dll",
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/win_pe/stdole2.tlb.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"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": "STDOLE2.TLB",
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/win_pe/tbs.sys.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"ProductVersion": "10.0.17763.1697",
"FileVersion": "10.0.17763.1697 (WinBuild.160101.0800)",
"Assembly Version": null,
"AssemblyVersion": null,
"BuildDate": null,
"ProductName": "Microsoft\u00ae Windows\u00ae Operating System",
"OriginalFilename": "TBS.SYS",
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/win_pe/tre4.dll.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"ProductVersion": "0.7.5.3276",
"FileVersion": "0.7.5.3276",
"Assembly Version": null,
"AssemblyVersion": null,
"BuildDate": null,
"ProductName": "Tre",
"OriginalFilename": "tre4.dll",
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/win_pe/zlib1.dll.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Full Version": null,
"ProductVersion": "1.2.3.2532",
"FileVersion": "1.2.3.2532",
"Assembly Version": null,
"AssemblyVersion": null,
"BuildDate": null,
"ProductName": "Zlib",
"OriginalFilename": "zlib1.dll",
Expand Down
Loading