diff options
author | Ankit Jain <radical@gmail.com> | 2019-02-19 22:36:06 +0300 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2019-02-23 10:51:03 +0300 |
commit | ae240f1f8e6db26776e41ab80586df06515d837a (patch) | |
tree | 56dd6f36df78f89c25242cfecf04b9d8e17d016a | |
parent | 6df88479c8bd7b95a3cc231071f3c0c580ad9eb7 (diff) |
[nuget] Add new versions of System.Text.Encoding.CodePages ..
.. to the list of denied assemblies. Added:
- `4.5.0`
- `4.5.1`
Fixes issue #12603 .
-rw-r--r-- | mcs/tools/xbuild/data/deniedAssembliesList.txt | 2 | ||||
-rw-r--r-- | mono/metadata/image.c | 3 | ||||
-rwxr-xr-x | tools/nuget-hash-extractor/download.sh | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/mcs/tools/xbuild/data/deniedAssembliesList.txt b/mcs/tools/xbuild/data/deniedAssembliesList.txt index 459a58b890b..202a5603613 100644 --- a/mcs/tools/xbuild/data/deniedAssembliesList.txt +++ b/mcs/tools/xbuild/data/deniedAssembliesList.txt @@ -53,3 +53,5 @@ System.Threading.Overlapped.dll,82D565AC-E41C-4E29-9939-C031C88EDBDD,4,1,0,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.Text.Encoding.CodePages.dll,67D3A14A-8F55-4C9F-9699-EDD0876369DA,4,1,1,0 +System.Text.Encoding.CodePages.dll,D2B4F262-31A4-4E80-9CFB-26A2249A735E,4,1,1,0 diff --git a/mono/metadata/image.c b/mono/metadata/image.c index fc8e1512b67..05ae9fbd914 100644 --- a/mono/metadata/image.c +++ b/mono/metadata/image.c @@ -1183,6 +1183,7 @@ static const IgnoredAssembly ignored_assemblies [] = { IGNORED_ASSEMBLY (0x284ECF63, SYS_THREADING_OVERLAPPED, "E933407E-C846-4413-82C5-09F4BCFA67F1", "2.1.0-preview1-62414-02 net461"), 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 (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"), @@ -1209,6 +1210,7 @@ static const IgnoredAssembly ignored_assemblies [] = { IGNORED_ASSEMBLY (0xA3BFE786, SYS_RT_INTEROP_RUNTIME_INFO, "33D296D9-EE6D-404E-BF9F-432A429FF5DA", "15.5.0-preview-20171027-2 net462"), IGNORED_ASSEMBLY (0xA99E866F, SYS_NET_HTTP, "41ACE450-8F44-455A-97AC-0679E5462071", "2.1.100-preview-62617-01 net471"), IGNORED_ASSEMBLY (0xAA21986B, SYS_THREADING_OVERLAPPED, "9F5D4F09-787A-458A-BA08-553AA71470F1", "4.0.0 net46"), + IGNORED_ASSEMBLY (0xAF2093B8, SYS_TEXT_ENC_CODEPAGES, "D2B4F262-31A4-4E80-9CFB-26A2249A735E", "4.5.1 net461"), IGNORED_ASSEMBLY (0xC69BED92, SYS_IO_COMPRESSION, "33AD8174-7781-46FA-A110-33821CCBE810", "15.5.0-preview-20171027-2 net461"), IGNORED_ASSEMBLY (0xC8D00759, SYS_IO_COMPRESSION, "1332CE2F-1517-4BD7-93FD-7D4BCFBAED66", "2.0.0-preview3-20170622-1 net461"), IGNORED_ASSEMBLY (0xCA951D5B, SYS_RT_INTEROP_RUNTIME_INFO, "1F37581E-4589-4C71-A465-05C6B9AE966E", "2.1.0-preview1-62414-02 net461"), @@ -1259,6 +1261,7 @@ static const IgnoredAssemblyVersion ignored_assembly_versions [] = { 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_TEXT_ENC_CODEPAGES, 4, 1, 1, 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), diff --git a/tools/nuget-hash-extractor/download.sh b/tools/nuget-hash-extractor/download.sh index 52fbfce0699..205974a58c0 100755 --- a/tools/nuget-hash-extractor/download.sh +++ b/tools/nuget-hash-extractor/download.sh @@ -39,6 +39,8 @@ curl -L https://www.nuget.org/api/v2/package/System.Net.Http/4.1.0 -o nugets/sys curl -L https://www.nuget.org/api/v2/package/System.Net.Http/4.0.0 -o nugets/system.net.http.4.0.0.nupkg #System.Text.Encoding.CodePages +curl -L https://www.nuget.org/api/v2/package/System.Text.Encoding.CodePages/4.5.1 -o nugets/system.text.encoding.codepages.4.5.1.nupkg +curl -L https://www.nuget.org/api/v2/package/System.Text.Encoding.CodePages/4.5.0 -o nugets/system.text.encoding.codepages.4.5.0.nupkg curl -L https://www.nuget.org/api/v2/package/System.Text.Encoding.CodePages/4.4.0 -o nugets/system.text.encoding.codepages.4.4.0.nupkg curl -L https://www.nuget.org/api/v2/package/System.Text.Encoding.CodePages/4.3.0 -o nugets/system.text.encoding.codepages.4.3.0.nupkg curl -L https://www.nuget.org/api/v2/package/System.Text.Encoding.CodePages/4.0.1 -o nugets/system.text.encoding.codepages.4.0.1.nupkg |