From 6223a90aa034622c6fd0b536f0190623e83f3bc5 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Wed, 16 Aug 2017 13:15:41 +0200 Subject: [PATCH] Update list of denied assemblies --- mcs/tools/xbuild/data/deniedAssembliesList.txt | 4 +--- mono/metadata/image.c | 13 +++---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/mcs/tools/xbuild/data/deniedAssembliesList.txt b/mcs/tools/xbuild/data/deniedAssembliesList.txt index 7b653e1723c..95122c25716 100644 --- a/mcs/tools/xbuild/data/deniedAssembliesList.txt +++ b/mcs/tools/xbuild/data/deniedAssembliesList.txt @@ -8,13 +8,11 @@ System.Net.Http.dll,EA2EC6DC-51DD-479C-BFC2-E713FB9E7E47,4,1,0,1 System.Net.Http.dll,C0E04D9C-70CF-48A6-A179-FBFD8CE69FD0,4,1,1,0 System.Net.Http.dll,817F01C3-4011-477D-890A-98232B85553D,4,1,1,0 System.Net.Http.dll,09D4A140-061C-4884-9B63-22067E841931,4,1,1,1 -System.Reflection.DispatchProxy.dll,E40AFEB4-CABE-4124-8412-B46AB79C92FD,4,0,0,0 -System.Reflection.DispatchProxy.dll,2A69F0AD-B86B-40F2-8E4C-5B671E47479F,4,0,1,0 -System.Reflection.DispatchProxy.dll,D4E8D2DB-BD65-4168-99EA-D2C1BDEBF9CC,4,0,2,0 System.Runtime.InteropServices.RuntimeInformation.dll,F13660F8-9D0D-419F-BA4E-315693DD26EA,4,0,0,0 System.Runtime.InteropServices.RuntimeInformation.dll,DD91439F-3167-478E-BD2C-BF9C036A1395,4,0,1,0 System.Text.Encoding.CodePages.dll,C142254F-DEB5-46A7-AE43-6F10320D1D1F,4,0,1,0 System.Text.Encoding.CodePages.dll,FD178CD4-EF4F-44D5-9C3F-812B1E25126B,4,0,2,0 +System.Text.Encoding.CodePages.dll,F5CCCBEC-E1AD-4DBB-9B44-9B42C86B94B8,4,1,0,0 System.Threading.Overlapped.dll,9F5D4F09-787A-458A-BA08-553AA71470F1,4,0,0,0 System.Threading.Overlapped.dll,FCBD003B-2BB4-4940-BAEF-63AF520C2336,4,0,1,0 System.Threading.Overlapped.dll,87697E71-D192-4F0B-BAD4-02BBC7793005,4,0,2,0 diff --git a/mono/metadata/image.c b/mono/metadata/image.c index 5c952efa4ac..3f4dd249c6d 100644 --- a/mono/metadata/image.c +++ b/mono/metadata/image.c @@ -1126,8 +1126,7 @@ typedef enum { SYS_IO_COMPRESSION = 2, //System.IO.Compression SYS_NET_HTTP = 3, //System.Net.Http SYS_TEXT_ENC_CODEPAGES = 4, //System.Text.Encoding.CodePages - SYS_REF_DISP_PROXY = 5, //System.Reflection.DispatchProxy - SYS_THREADING_OVERLAPPED = 6, //System.Threading.Overlapped + SYS_THREADING_OVERLAPPED = 5, //System.Threading.Overlapped } IgnoredAssemblyNames; typedef struct { @@ -1147,7 +1146,6 @@ const char *ignored_assemblies_file_names[] = { "System.IO.Compression.dll", "System.Net.Http.dll", "System.Text.Encoding.CodePages.dll", - "System.Reflection.DispatchProxy.dll", "System.Threading.Overlapped.dll" }; @@ -1164,13 +1162,11 @@ static const IgnoredAssembly ignored_assemblies [] = { IGNORED_ASSEMBLY (0x8437178B, SYS_NET_HTTP, "C0E04D9C-70CF-48A6-A179-FBFD8CE69FD0", "4.3.0 net46"), IGNORED_ASSEMBLY (0xFAFDA422, SYS_NET_HTTP, "817F01C3-4011-477D-890A-98232B85553D", "4.3.1 net46"), IGNORED_ASSEMBLY (0x472FA630, SYS_NET_HTTP, "09D4A140-061C-4884-9B63-22067E841931", "4.3.2 net46"), - IGNORED_ASSEMBLY (0x4A15555E, SYS_REF_DISP_PROXY, "E40AFEB4-CABE-4124-8412-B46AB79C92FD", "4.0.0 net46"), - IGNORED_ASSEMBLY (0xD20D9783, SYS_REF_DISP_PROXY, "2A69F0AD-B86B-40F2-8E4C-5B671E47479F", "4.0.1 netstandard1.3"), - IGNORED_ASSEMBLY (0xA33A7E68, SYS_REF_DISP_PROXY, "D4E8D2DB-BD65-4168-99EA-D2C1BDEBF9CC", "4.3.0 netstandard1.3"), IGNORED_ASSEMBLY (0x46A4A1C5, SYS_RT_INTEROP_RUNTIME_INFO, "F13660F8-9D0D-419F-BA4E-315693DD26EA", "4.0.0 net45"), 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 (0xF6D18A2E, SYS_TEXT_ENC_CODEPAGES, "F5CCCBEC-E1AD-4DBB-9B44-9B42C86B94B8", "4.4.0 net461"), 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") @@ -1183,7 +1179,6 @@ const char *ignored_assemblies_names[] = { "System.IO.Compression", "System.Net.Http", "System.Text.Encoding.CodePages", - "System.Reflection.DispatchProxy", "System.Threading.Overlapped" }; @@ -1199,13 +1194,11 @@ static const IgnoredAssemblyVersion ignored_assembly_versions [] = { IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 0, 1), IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 1, 0), IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 1, 1), - IGNORED_ASM_VER (SYS_REF_DISP_PROXY, 4, 0, 0, 0), - IGNORED_ASM_VER (SYS_REF_DISP_PROXY, 4, 0, 1, 0), - IGNORED_ASM_VER (SYS_REF_DISP_PROXY, 4, 0, 2, 0), IGNORED_ASM_VER (SYS_RT_INTEROP_RUNTIME_INFO, 4, 0, 0, 0), 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_TEXT_ENC_CODEPAGES, 4, 1, 0, 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), -- 2.25.1