mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.8.0.483

Browse Source 
Former-commit-id: dea8c53844337fa8b7535e16c76a043c3f09ea30
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2017-02-07 11:16:48 +00:00
parent c135664484
commit f38a7b4f5b
21 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
external/cecil/Mono.Cecil/ExportedType.cs vendored
View File

@ -45,6 +45,14 @@ namespace Mono.Cecil {
return scope;
}
set {
if (declaring_type != null) {
declaring_type.Scope = value;
return;
}
scope = value;
}
}
public ExportedType DeclaringType {

12
mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs
View File

@ -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)

2
mcs/class/lib/monolite/System.dll.REMOVED.git-id
View File

@ -1 +1 @@
1b02069d31f86ebdd8652df6da8516f39b4d9c66
ab52f34a16be899445ac46f7fa080754b4035145

1
mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs
View File

@ -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;
}
}
}

9
mono/metadata/image.c
View File

@ -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"),

2
mono/mini/Makefile.am
View File

@ -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:

2
mono/mini/Makefile.am.in
View File

@ -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:

2
mono/mini/Makefile.in.REMOVED.git-id
View File

@ -1 +1 @@
602a3b63394a302a8821462b683c750f23d223b6
9e66f81dfb8f381a6cdc81e9852487bb391c9616

2
mono/mini/cpu-x86.md
View File

@ -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

2
mono/mini/debugger-agent.c.REMOVED.git-id
View File

@ -1 +1 @@
4758c4dcfbe3bc5d33d3541f4cd96367f80f5f92
f778f59ada713a7c2556d4dbea1ef6473d3650a2

2
mono/mini/mini-x86.c.REMOVED.git-id
View File

@ -1 +1 @@
288af652434bf9ffc25e4ad0893d5087409de286
faf55468579d4a32ea0062d812f4d6728310a475

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "Stable 4.8.0.478/084f912"
#define FULL_VERSION "Stable 4.8.0.483/ba7f169"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
341333543d912ac1d7854c076b51eaeaf5a6045e
b9667b3e71239bc55572c5164c1d3e5a4b05b099

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
64399413cefabe7d713646a736fd12a0ce153d17
fae2eeed149ee7057ac6271c6600bcf980d267ab

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
dc41dc95cc6c8f017e35ccaf21389cf476b7bfc0
06520507928f8b699b9062e095592e8976d85903

2
po/mcs/mcs.pot
View File

@ -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"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
8cca5ae6c122d4eb3b4dd431748f86af1a643218
4e4126ca221c7efebe3ca9f837dcbfb791824362