[mono] Update ignored assemblies list to include System.ValueTuple
authorMarek Safar <marek.safar@gmail.com>
Mon, 30 Jan 2017 16:40:32 +0000 (17:40 +0100)
committerMarek Safar <marek.safar@gmail.com>
Mon, 30 Jan 2017 16:47:29 +0000 (17:47 +0100)
mono/metadata/image.c
tools/nuget-hash-extractor/download.sh
tools/nuget-hash-extractor/nuget-hash-extractor.cs

index 86ae4a2a00c68fdc5305a70409a5b92ff1d6dc40..504b64294e0c053a002d038563ab131cbfc487e9 100644 (file)
@@ -1098,6 +1098,7 @@ typedef enum {
        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_VALUE_TUPLE = 6, //System.ValueTuple
 } IgnoredAssemblyNames;
 
 typedef struct {
@@ -1113,6 +1114,7 @@ const char *ignored_assemblies_names[] = {
        "System.Net.Http.dll",
        "System.Text.Encoding.CodePages.dll",
        "System.Reflection.DispatchProxy.dll",
+       "System.ValueTuple.dll"
 };
 
 #define IGNORED_ASSEMBLY(HASH, NAME, GUID, VER_STR)    { .hash = HASH, .assembly_name = NAME, .guid = GUID }
@@ -1133,6 +1135,7 @@ 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 (0x75B4B041, SYS_VALUE_TUPLE, "F81A4140-A898-4E2B-B6E9-55CE78C273EC", "4.3.0 netstandard1.0"),
 };
 
 /*
index 7ebd03996bd06a1b7b104e6391cadaad96274028..f79ee5f351c058841e6f5b8c40d509aad0858dda 100755 (executable)
@@ -30,4 +30,7 @@ wget https://www.nuget.org/api/v2/package/System.Reflection.DispatchProxy/4.3.0
 wget https://www.nuget.org/api/v2/package/System.Reflection.DispatchProxy/4.0.1 -O nugets/system.reflection.dispatchproxy.4.0.1.nupkg
 wget https://www.nuget.org/api/v2/package/System.Reflection.DispatchProxy/4.0.0 -O nugets/system.reflection.dispatchproxy.4.0.0.nupkg
 
+#System.ValueTuple
+wget https://www.nuget.org/api/v2/package/System.ValueTuple/4.3.0 -O nugets/system.valuetuple.4.3.0.nupkg
+
 #System.Security.Cryptography.OpenSsl when .net 4.6.2 + 1 is out
\ No newline at end of file
index b1fd6cf401de330583fd0de919574e9beccba118..9a69cc80b971dcc891314fca9aac36d337f7f94a 100644 (file)
@@ -72,6 +72,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.ValueTuple.dll": return "SYS_VALUE_TUPLE";
                default: throw new Exception ($"No idea what to do with {name}");
                }
        }