From 6df26e82878eeaeed48b06ecbea9a99570038dfc Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 19 Feb 2019 14:56:07 -0500 Subject: [nuget] Add new versions of System.Net.Http .. to the list of denied assemblies. Added `4.3.4`. Prompted by issue #12603 . --- mcs/tools/xbuild/data/deniedAssembliesList.txt | 1 + mono/metadata/image.c | 2 ++ tools/nuget-hash-extractor/download.sh | 1 + 3 files changed, 4 insertions(+) diff --git a/mcs/tools/xbuild/data/deniedAssembliesList.txt b/mcs/tools/xbuild/data/deniedAssembliesList.txt index 202a5603613..1035b384d29 100644 --- a/mcs/tools/xbuild/data/deniedAssembliesList.txt +++ b/mcs/tools/xbuild/data/deniedAssembliesList.txt @@ -21,6 +21,7 @@ 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.Net.Http.dll,56203551-6937-47C1-9246-346A733913EE,4,1,1,2 +System.Net.Http.dll,084B071E-1637-4B3F-B7CD-6CEF28A6E4AE,4,1,1,3 System.Net.Http.dll,82C79759-CB3C-4EB6-A17C-BDE85AF00A9B,4,2,0,0 System.Net.Http.dll,8E2F55F3-D010-417B-A742-21386EDDD388,4,2,0,0 System.Net.Http.dll,DB06A592-E332-44A1-8B85-20CAB3C3C147,4,2,0,0 diff --git a/mono/metadata/image.c b/mono/metadata/image.c index 05ae9fbd914..cb17ff9e7ed 100644 --- a/mono/metadata/image.c +++ b/mono/metadata/image.c @@ -1184,6 +1184,7 @@ static const IgnoredAssembly ignored_assemblies [] = { IGNORED_ASSEMBLY (0x358C9723, SYS_GLOBALIZATION_EXT, "5FCD54F0-4B97-4259-875D-30E481F02EA2", "4.0.1 net46"), IGNORED_ASSEMBLY (0x39C3575D, SYS_GLOBALIZATION_EXT, "3B30D67C-B16B-47BC-B949-9500B5AAAAFB", "2.1.0-preview1-62414-02 net471"), IGNORED_ASSEMBLY (0x3E21E75A, SYS_TEXT_ENC_CODEPAGES, "67D3A14A-8F55-4C9F-9699-EDD0876369DA", "4.5.0 net461"), + IGNORED_ASSEMBLY (0x420963C4, SYS_NET_HTTP, "084B071E-1637-4B3F-B7CD-6CEF28A6E4AE", "4.3.4 net46"), IGNORED_ASSEMBLY (0x450A096A, SYS_GLOBALIZATION_EXT, "E9FCFF5B-4DE1-4BDC-9CE8-08C640FC78CC", "4.3.0 net46"), IGNORED_ASSEMBLY (0x46A4A1C5, SYS_RT_INTEROP_RUNTIME_INFO, "F13660F8-9D0D-419F-BA4E-315693DD26EA", "4.0.0 net45"), IGNORED_ASSEMBLY (0x472FA630, SYS_NET_HTTP, "09D4A140-061C-4884-9B63-22067E841931", "4.3.2 net46"), @@ -1254,6 +1255,7 @@ static const IgnoredAssemblyVersion ignored_assembly_versions [] = { IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 1, 0), IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 1, 1), IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 1, 2), + IGNORED_ASM_VER (SYS_NET_HTTP, 4, 1, 1, 3), IGNORED_ASM_VER (SYS_NET_HTTP, 4, 2, 0, 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), diff --git a/tools/nuget-hash-extractor/download.sh b/tools/nuget-hash-extractor/download.sh index 205974a58c0..c91331f0f14 100755 --- a/tools/nuget-hash-extractor/download.sh +++ b/tools/nuget-hash-extractor/download.sh @@ -30,6 +30,7 @@ curl -L https://www.nuget.org/api/v2/package/System.IO.Compression/4.1.0 -o nuge curl -L https://www.nuget.org/api/v2/package/System.IO.Compression/4.0.0 -o nugets/system.io.compression.4.0.0.nupkg #System.Net.Http +curl -L https://www.nuget.org/api/v2/package/System.Net.Http/4.3.4 -o nugets/system.net.http.4.3.4.nupkg curl -L https://www.nuget.org/api/v2/package/System.Net.Http/4.3.3 -o nugets/system.net.http.4.3.3.nupkg curl -L https://www.nuget.org/api/v2/package/System.Net.Http/4.3.2 -o nugets/system.net.http.4.3.2.nupkg curl -L https://www.nuget.org/api/v2/package/System.Net.Http/4.3.1 -o nugets/system.net.http.4.3.1.nupkg -- cgit v1.2.3