[runtime] Blacklist System.Threading.Overlapped nugets

diff --git a/mono/metadata/image.c b/mono/metadata/image.c
index f9c455b653ae2cba48774ba7f3b28b90762fc2f8..d332affbdc66640fac7613d2df802c77cac67150 100644 (file)
--- a/mono/metadata/image.c
+++ b/mono/metadata/image.c
@@ -1123,6 +1123,7 @@ typedef enum {
        SYS_TEXT_ENC_CODEPAGES = 4, //System.Text.Encoding.CodePages
        SYS_REF_DISP_PROXY = 5, //System.Reflection.DispatchProxy
        SYS_VALUE_TUPLE = 6, //System.ValueTuple
+       SYS_THREADING_OVERLAPPED = 7, //System.Threading.Overlapped
 } IgnoredAssemblyNames;
 
 typedef struct {
@@ -1143,6 +1144,7 @@ const char *ignored_assemblies_file_names[] = {
        "System.Net.Http.dll",
        "System.Text.Encoding.CodePages.dll",
        "System.Reflection.DispatchProxy.dll",
+       "System.Threading.Overlapped.dll",
        "System.ValueTuple.dll"
 };
 
@@ -1165,6 +1167,9 @@ static const IgnoredAssembly ignored_assemblies [] = {
        IGNORED_ASSEMBLY (0xD07383BB, SYS_RT_INTEROP_RUNTIME_INFO, "DD91439F-3167-478E-BD2C-BF9C036A1395", "4.3.0 net45"),
        IGNORED_ASSEMBLY (0x911D9EC3, SYS_TEXT_ENC_CODEPAGES, "C142254F-DEB5-46A7-AE43-6F10320D1D1F", "4.0.1 net46"),
        IGNORED_ASSEMBLY (0xFA686A38, SYS_TEXT_ENC_CODEPAGES, "FD178CD4-EF4F-44D5-9C3F-812B1E25126B", "4.3.0 net46"),
+       IGNORED_ASSEMBLY (0xAA21986B, SYS_THREADING_OVERLAPPED, "9F5D4F09-787A-458A-BA08-553AA71470F1", "4.0.0 net46"),
+       IGNORED_ASSEMBLY (0x7D927C2A, SYS_THREADING_OVERLAPPED, "FCBD003B-2BB4-4940-BAEF-63AF520C2336", "4.0.1 net46"),
+       IGNORED_ASSEMBLY (0x6FE03EE2, SYS_THREADING_OVERLAPPED, "87697E71-D192-4F0B-BAD4-02BBC7793005", "4.3.0 net46"),
        IGNORED_ASSEMBLY (0x75B4B041, SYS_VALUE_TUPLE, "F81A4140-A898-4E2B-B6E9-55CE78C273EC", "4.3.0 netstandard1.0"),
 };
 
@@ -1176,6 +1181,7 @@ const char *ignored_assemblies_names[] = {
        "System.Net.Http",
        "System.Text.Encoding.CodePages",
        "System.Reflection.DispatchProxy",
+       "System.Threading.Overlapped",
        "System.ValueTuple"
 };
 
@@ -1197,6 +1203,9 @@ static const IgnoredAssemblyVersion ignored_assembly_versions [] = {
        IGNORED_ASM_VER (SYS_RT_INTEROP_RUNTIME_INFO, 4, 0, 1, 0),
        IGNORED_ASM_VER (SYS_TEXT_ENC_CODEPAGES, 4, 0, 1, 0),
        IGNORED_ASM_VER (SYS_TEXT_ENC_CODEPAGES, 4, 0, 2, 0),
+       IGNORED_ASM_VER (SYS_THREADING_OVERLAPPED, 4, 0, 0, 0),
+       IGNORED_ASM_VER (SYS_THREADING_OVERLAPPED, 4, 0, 1, 0),
+       IGNORED_ASM_VER (SYS_THREADING_OVERLAPPED, 4, 0, 2, 0),
        IGNORED_ASM_VER (SYS_VALUE_TUPLE, 4, 0, 1, 0),
 };
 

diff --git a/tools/nuget-hash-extractor/Makefile b/tools/nuget-hash-extractor/Makefile
index 371aca44bbfd05a69f6cf936406bda325d4b17c5..05b30f25975919693cfcac349c3fad47f9c08492 100644 (file)
--- a/tools/nuget-hash-extractor/Makefile
+++ b/tools/nuget-hash-extractor/Makefile
@@ -10,13 +10,16 @@ nuget-hash-extractor.exe: $(SOURCES)
 
 download: .download_stamp_file
 
-run: nuget-hash-extractor.exe .download_stamp_file
-       mono nuget-hash-extractor.exe nugets
+run: download nuget-hash-extractor.exe exec-ver exec-asm
 
-run-asm: nuget-hash-extractor.exe .download_stamp_file
+run-asm: download nuget-hash-extractor.exe exec-asm
+
+exec-asm:
        mono nuget-hash-extractor.exe nugets asm
 
-run-ver: nuget-hash-extractor.exe .download_stamp_file
+run-ver: download nuget-hash-extractor.exe exec-ver
+
+exec-ver:
        mono nuget-hash-extractor.exe nugets ver
 
 .PHONY: download run

diff --git a/tools/nuget-hash-extractor/download.sh b/tools/nuget-hash-extractor/download.sh
index f74d8179ef19ae60f6669cccf3c125b13b000f4e..783e463bc8b818d22c04d58f7d9ad58d823df9af 100755 (executable)
--- a/tools/nuget-hash-extractor/download.sh
+++ b/tools/nuget-hash-extractor/download.sh
@@ -34,6 +34,11 @@ wget https://www.nuget.org/api/v2/package/System.Reflection.DispatchProxy/4.0.0
 #System.ValueTuple
 wget https://www.nuget.org/api/v2/package/System.ValueTuple/4.3.0 -O nugets/system.valuetuple.4.3.0.nupkg
 
+#System.Threading.Overlapped
+wget https://www.nuget.org/api/v2/package/System.Threading.Overlapped/4.3.0 -O nugets/system.threading.overlapped.4.3.0.nupkg
+wget https://www.nuget.org/api/v2/package/System.Threading.Overlapped/4.0.1 -O nugets/system.threading.overlapped.4.0.1.nupkg
+wget https://www.nuget.org/api/v2/package/System.Threading.Overlapped/4.0.0 -O nugets/system.threading.overlapped.4.0.0.nupkg
+
 #System.Security.Cryptography.OpenSsl when .net 4.6.2 + 1 is out
 
 touch .download_stamp_file

diff --git a/tools/nuget-hash-extractor/nuget-hash-extractor.cs b/tools/nuget-hash-extractor/nuget-hash-extractor.cs
index 96b4b7c8c91e9ca0e010acfca6062e81327a92c6..df3304b2c4e179a67e5fab99e54f38d6b580089e 100644 (file)
--- a/tools/nuget-hash-extractor/nuget-hash-extractor.cs
+++ b/tools/nuget-hash-extractor/nuget-hash-extractor.cs
@@ -82,6 +82,7 @@ class DoParse : MarshalByRefObject {
                case "System.Net.Http.dll": return "SYS_NET_HTTP";
                case "System.Text.Encoding.CodePages.dll": return "SYS_TEXT_ENC_CODEPAGES";
                case "System.Reflection.DispatchProxy.dll": return "SYS_REF_DISP_PROXY";
+               case "System.Threading.Overlapped.dll": return "SYS_THREADING_OVERLAPPED";
                case "System.ValueTuple.dll": return "SYS_VALUE_TUPLE";
                default: throw new Exception ($"No idea what to do with {name}");
                }