diff --git a/external/cecil/Mono.Cecil/ExportedType.cs b/external/cecil/Mono.Cecil/ExportedType.cs index fcf456fa49..8238a0c6d9 100644 --- a/external/cecil/Mono.Cecil/ExportedType.cs +++ b/external/cecil/Mono.Cecil/ExportedType.cs @@ -45,6 +45,14 @@ namespace Mono.Cecil { return scope; } + set { + if (declaring_type != null) { + declaring_type.Scope = value; + return; + } + + scope = value; + } } public ExportedType DeclaringType { diff --git a/mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs b/mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs index eb920677d0..b9c83ae438 100644 --- a/mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs +++ b/mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs @@ -386,11 +386,13 @@ namespace Mono.Btls void Import (byte[] data) { - // Does it look like PEM? - if ((data.Length > 0) && (data [0] != 0x30)) - x509 = MonoBtlsX509.LoadFromData (data, MonoBtlsX509Format.PEM); - else - x509 = MonoBtlsX509.LoadFromData (data, MonoBtlsX509Format.DER); + if (data != null) { + // Does it look like PEM? + if ((data.Length > 0) && (data [0] != 0x30)) + x509 = MonoBtlsX509.LoadFromData (data, MonoBtlsX509Format.PEM); + else + x509 = MonoBtlsX509.LoadFromData (data, MonoBtlsX509Format.DER); + } } void ImportPkcs12 (byte[] data, string password) diff --git a/mcs/class/lib/monolite/System.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.dll.REMOVED.git-id index 8a9a48ab53..7884d8f2ff 100644 --- a/mcs/class/lib/monolite/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.dll.REMOVED.git-id @@ -1 +1 @@ -1b02069d31f86ebdd8652df6da8516f39b4d9c66 \ No newline at end of file +ab52f34a16be899445ac46f7fa080754b4035145 \ No newline at end of file diff --git a/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs b/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs index 73c89cc799..8ac7358f75 100644 --- a/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs +++ b/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs @@ -165,6 +165,7 @@ namespace Mono.Linker.Steps { if ((td != null) && Annotations.IsMarked (td)) { scope = assembly.MainModule.ImportReference (td).Scope; hash.Add (td, scope); + et.Scope = scope; } } } diff --git a/mono/metadata/image.c b/mono/metadata/image.c index 31a5e1bd5f..0539b3c17d 100644 --- a/mono/metadata/image.c +++ b/mono/metadata/image.c @@ -1052,6 +1052,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 } IgnoredAssemblyNames; typedef struct { @@ -1065,7 +1066,8 @@ const char *ignored_assemblies_names[] = { "System.Globalization.Extensions.dll", "System.IO.Compression.dll", "System.Net.Http.dll", - "System.Text.Encoding.CodePages.dll" + "System.Text.Encoding.CodePages.dll", + "System.Reflection.DispatchProxy.dll", }; #define IGNORED_ASSEMBLY(HASH, NAME, GUID, VER_STR) { .hash = HASH, .assembly_name = NAME, .guid = GUID } @@ -1074,13 +1076,14 @@ static const IgnoredAssembly ignored_assemblies [] = { IGNORED_ASSEMBLY (0x1136045D, SYS_GLOBALIZATION_EXT, "475DBF02-9F68-44F1-8FB5-C9F69F1BD2B1", "4.0.0 net46"), IGNORED_ASSEMBLY (0x358C9723, SYS_GLOBALIZATION_EXT, "5FCD54F0-4B97-4259-875D-30E481F02EA2", "4.0.1 net46"), IGNORED_ASSEMBLY (0x450A096A, SYS_GLOBALIZATION_EXT, "E9FCFF5B-4DE1-4BDC-9CE8-08C640FC78CC", "4.3.0 net46"), - IGNORED_ASSEMBLY (0x7A39EA2D, SYS_IO_COMPRESSION, "C665DC9B-D9E5-4D00-98ED-E4F812F23545", "4.0.0 netcore50"), IGNORED_ASSEMBLY (0x1CBD59A2, SYS_IO_COMPRESSION, "44FCA06C-A510-4B3E-BDBF-D08D697EF65A", "4.1.0 net46"), IGNORED_ASSEMBLY (0x5E393C29, SYS_IO_COMPRESSION, "3A58A219-266B-47C3-8BE8-4E4F394147AB", "4.3.0 net46"), - IGNORED_ASSEMBLY (0x726C7CC1, SYS_NET_HTTP, "7C0B577F-A4FD-47F1-ADF5-EE65B5A04BB5", "4.0.0 netcore50"), IGNORED_ASSEMBLY (0x27726A90, SYS_NET_HTTP, "269B562C-CC15-4736-B1B1-68D4A43CAA98", "4.1.0 net46"), IGNORED_ASSEMBLY (0x10CADA75, SYS_NET_HTTP, "EA2EC6DC-51DD-479C-BFC2-E713FB9E7E47", "4.1.1 net46"), IGNORED_ASSEMBLY (0x8437178B, SYS_NET_HTTP, "C0E04D9C-70CF-48A6-A179-FBFD8CE69FD0", "4.3.0 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"), diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index 14b5878313..c3cc64f041 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -861,7 +861,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.8.0.478/084f912\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.483/ba7f169\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index 14b5878313..c3cc64f041 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -861,7 +861,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.8.0.478/084f912\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.483/ba7f169\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.in.REMOVED.git-id b/mono/mini/Makefile.in.REMOVED.git-id index 2f340bbbdd..ba1bdfbee6 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -602a3b63394a302a8821462b683c750f23d223b6 \ No newline at end of file +9e66f81dfb8f381a6cdc81e9852487bb391c9616 \ No newline at end of file diff --git a/mono/mini/cpu-x86.md b/mono/mini/cpu-x86.md index 4afa31ecd4..c4dd32e773 100644 --- a/mono/mini/cpu-x86.md +++ b/mono/mini/cpu-x86.md @@ -66,7 +66,7 @@ break: len:1 call: dest:a clob:c len:17 tailcall: len:120 clob:c br: len:5 -seq_point: len:24 clob:c +seq_point: len:26 clob:c il_seq_point: len:0 int_beq: len:6 diff --git a/mono/mini/debugger-agent.c.REMOVED.git-id b/mono/mini/debugger-agent.c.REMOVED.git-id index 18107d3070..12b9e36839 100644 --- a/mono/mini/debugger-agent.c.REMOVED.git-id +++ b/mono/mini/debugger-agent.c.REMOVED.git-id @@ -1 +1 @@ -4758c4dcfbe3bc5d33d3541f4cd96367f80f5f92 \ No newline at end of file +f778f59ada713a7c2556d4dbea1ef6473d3650a2 \ No newline at end of file diff --git a/mono/mini/mini-x86.c.REMOVED.git-id b/mono/mini/mini-x86.c.REMOVED.git-id index 74e6ffee02..c38916181a 100644 --- a/mono/mini/mini-x86.c.REMOVED.git-id +++ b/mono/mini/mini-x86.c.REMOVED.git-id @@ -1 +1 @@ -288af652434bf9ffc25e4ad0893d5087409de286 \ No newline at end of file +faf55468579d4a32ea0062d812f4d6728310a475 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index bcd08c2b90..c4b37d6354 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 4.8.0.478/084f912" +#define FULL_VERSION "Stable 4.8.0.483/ba7f169" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index c6ceb700d1..feb8ed33f8 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index f6bd81421b..15a14b3d9b 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -341333543d912ac1d7854c076b51eaeaf5a6045e \ No newline at end of file +b9667b3e71239bc55572c5164c1d3e5a4b05b099 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 5cf8d418ba..f6b4f620ce 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 4e32c76a5e..da00e1139d 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -64399413cefabe7d713646a736fd12a0ce153d17 \ No newline at end of file +fae2eeed149ee7057ac6271c6600bcf980d267ab \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 3c63b5f066..246346a352 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index c25c0a5806..3c012fad95 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -dc41dc95cc6c8f017e35ccaf21389cf476b7bfc0 \ No newline at end of file +06520507928f8b699b9062e095592e8976d85903 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index c8c5331e5d..da259362a9 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mono 4.8.0\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2017-01-31 11:22+0000\n" +"POT-Creation-Date: 2017-02-07 10:58+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 41098ce1c1..e505ef24b3 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index b3c1f41d29..691cef4f39 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -8cca5ae6c122d4eb3b4dd431748f86af1a643218 \ No newline at end of file +4e4126ca221c7efebe3ca9f837dcbfb791824362 \ No newline at end of file