From 51c900552a8a0808d20ffaa0cf6d3006ac5eb655 Mon Sep 17 00:00:00 2001 From: Alok Kumar Date: Thu, 23 Jan 2025 21:05:29 +0530 Subject: [PATCH] change Assembly Version to AssemblyVersion Reference: https://github.com/aboutcode-org/scancode-toolkit/issues/3790 Signed-off-by: Alok Kumar --- src/packagedcode/win_pe.py | 4 ++-- ...soft.Practices.EnterpriseLibrary.Caching.dll.expected.json | 2 +- .../data/win_pe/Moq.Silverlight.dll.expected.json | 2 +- tests/packagedcode/data/win_pe/Windows.AI.winmd.expected.json | 2 +- tests/packagedcode/data/win_pe/_ctypes_test.pyd.expected.json | 2 +- tests/packagedcode/data/win_pe/chcp.com.expected.json | 2 +- tests/packagedcode/data/win_pe/clfs.sys.mui.expected.json | 2 +- tests/packagedcode/data/win_pe/crypt32.dll.mun.expected.json | 2 +- tests/packagedcode/data/win_pe/euc-jp.so.expected.json | 2 +- tests/packagedcode/data/win_pe/file.exe.expected.json | 2 +- tests/packagedcode/data/win_pe/libiconv2.dll.expected.json | 2 +- tests/packagedcode/data/win_pe/libintl3.dll.expected.json | 2 +- tests/packagedcode/data/win_pe/stdole2.tlb.expected.json | 2 +- tests/packagedcode/data/win_pe/tbs.sys.expected.json | 2 +- tests/packagedcode/data/win_pe/tre4.dll.expected.json | 2 +- tests/packagedcode/data/win_pe/zlib1.dll.expected.json | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/packagedcode/win_pe.py b/src/packagedcode/win_pe.py index ce040eaedfe..5eea4969122 100644 --- a/src/packagedcode/win_pe.py +++ b/src/packagedcode/win_pe.py @@ -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 @@ -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: diff --git a/tests/packagedcode/data/win_pe/Microsoft.Practices.EnterpriseLibrary.Caching.dll.expected.json b/tests/packagedcode/data/win_pe/Microsoft.Practices.EnterpriseLibrary.Caching.dll.expected.json index c54cfd4a90d..ed01182918f 100644 --- a/tests/packagedcode/data/win_pe/Microsoft.Practices.EnterpriseLibrary.Caching.dll.expected.json +++ b/tests/packagedcode/data/win_pe/Microsoft.Practices.EnterpriseLibrary.Caching.dll.expected.json @@ -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", diff --git a/tests/packagedcode/data/win_pe/Moq.Silverlight.dll.expected.json b/tests/packagedcode/data/win_pe/Moq.Silverlight.dll.expected.json index 996b6b9c0ba..86fff6eab0b 100644 --- a/tests/packagedcode/data/win_pe/Moq.Silverlight.dll.expected.json +++ b/tests/packagedcode/data/win_pe/Moq.Silverlight.dll.expected.json @@ -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", diff --git a/tests/packagedcode/data/win_pe/Windows.AI.winmd.expected.json b/tests/packagedcode/data/win_pe/Windows.AI.winmd.expected.json index a7a86d981b2..61077310df9 100644 --- a/tests/packagedcode/data/win_pe/Windows.AI.winmd.expected.json +++ b/tests/packagedcode/data/win_pe/Windows.AI.winmd.expected.json @@ -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": "", diff --git a/tests/packagedcode/data/win_pe/_ctypes_test.pyd.expected.json b/tests/packagedcode/data/win_pe/_ctypes_test.pyd.expected.json index bd7cdbb0ff2..78d2500d876 100644 --- a/tests/packagedcode/data/win_pe/_ctypes_test.pyd.expected.json +++ b/tests/packagedcode/data/win_pe/_ctypes_test.pyd.expected.json @@ -2,7 +2,7 @@ "Full Version": null, "ProductVersion": null, "FileVersion": null, - "Assembly Version": null, + "AssemblyVersion": null, "BuildDate": null, "ProductName": null, "OriginalFilename": null, diff --git a/tests/packagedcode/data/win_pe/chcp.com.expected.json b/tests/packagedcode/data/win_pe/chcp.com.expected.json index f32b310f048..a9c50c8d2d9 100644 --- a/tests/packagedcode/data/win_pe/chcp.com.expected.json +++ b/tests/packagedcode/data/win_pe/chcp.com.expected.json @@ -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", diff --git a/tests/packagedcode/data/win_pe/clfs.sys.mui.expected.json b/tests/packagedcode/data/win_pe/clfs.sys.mui.expected.json index f4c972a0396..ea959b56786 100644 --- a/tests/packagedcode/data/win_pe/clfs.sys.mui.expected.json +++ b/tests/packagedcode/data/win_pe/clfs.sys.mui.expected.json @@ -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", diff --git a/tests/packagedcode/data/win_pe/crypt32.dll.mun.expected.json b/tests/packagedcode/data/win_pe/crypt32.dll.mun.expected.json index d4eea7da1d6..4c85879a055 100644 --- a/tests/packagedcode/data/win_pe/crypt32.dll.mun.expected.json +++ b/tests/packagedcode/data/win_pe/crypt32.dll.mun.expected.json @@ -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", diff --git a/tests/packagedcode/data/win_pe/euc-jp.so.expected.json b/tests/packagedcode/data/win_pe/euc-jp.so.expected.json index bd7cdbb0ff2..78d2500d876 100644 --- a/tests/packagedcode/data/win_pe/euc-jp.so.expected.json +++ b/tests/packagedcode/data/win_pe/euc-jp.so.expected.json @@ -2,7 +2,7 @@ "Full Version": null, "ProductVersion": null, "FileVersion": null, - "Assembly Version": null, + "AssemblyVersion": null, "BuildDate": null, "ProductName": null, "OriginalFilename": null, diff --git a/tests/packagedcode/data/win_pe/file.exe.expected.json b/tests/packagedcode/data/win_pe/file.exe.expected.json index 1eb171d9749..524e7123f6f 100644 --- a/tests/packagedcode/data/win_pe/file.exe.expected.json +++ b/tests/packagedcode/data/win_pe/file.exe.expected.json @@ -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", diff --git a/tests/packagedcode/data/win_pe/libiconv2.dll.expected.json b/tests/packagedcode/data/win_pe/libiconv2.dll.expected.json index 9ac7a5dcea6..0278478c95c 100644 --- a/tests/packagedcode/data/win_pe/libiconv2.dll.expected.json +++ b/tests/packagedcode/data/win_pe/libiconv2.dll.expected.json @@ -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", diff --git a/tests/packagedcode/data/win_pe/libintl3.dll.expected.json b/tests/packagedcode/data/win_pe/libintl3.dll.expected.json index c2e81d04a2e..38a5b8e2cf3 100644 --- a/tests/packagedcode/data/win_pe/libintl3.dll.expected.json +++ b/tests/packagedcode/data/win_pe/libintl3.dll.expected.json @@ -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", diff --git a/tests/packagedcode/data/win_pe/stdole2.tlb.expected.json b/tests/packagedcode/data/win_pe/stdole2.tlb.expected.json index c80f73252c1..b3b07221c90 100644 --- a/tests/packagedcode/data/win_pe/stdole2.tlb.expected.json +++ b/tests/packagedcode/data/win_pe/stdole2.tlb.expected.json @@ -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", diff --git a/tests/packagedcode/data/win_pe/tbs.sys.expected.json b/tests/packagedcode/data/win_pe/tbs.sys.expected.json index 247a8632e0d..90e0d80f28e 100644 --- a/tests/packagedcode/data/win_pe/tbs.sys.expected.json +++ b/tests/packagedcode/data/win_pe/tbs.sys.expected.json @@ -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", diff --git a/tests/packagedcode/data/win_pe/tre4.dll.expected.json b/tests/packagedcode/data/win_pe/tre4.dll.expected.json index 0377b71b7d4..7a1b05cb109 100644 --- a/tests/packagedcode/data/win_pe/tre4.dll.expected.json +++ b/tests/packagedcode/data/win_pe/tre4.dll.expected.json @@ -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", diff --git a/tests/packagedcode/data/win_pe/zlib1.dll.expected.json b/tests/packagedcode/data/win_pe/zlib1.dll.expected.json index f0327fd6b95..ccba7101b8f 100644 --- a/tests/packagedcode/data/win_pe/zlib1.dll.expected.json +++ b/tests/packagedcode/data/win_pe/zlib1.dll.expected.json @@ -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",