Imported Upstream version 5.0.1.1
Former-commit-id: ffd3a248ace900b177db27aa87e5c702a9bc7322
This commit is contained in:
parent
9cc54951a2
commit
4bdbaf4a88
@ -1 +1 @@
|
||||
842bd0c99a63529d11a45b65a4788407bb7f14b9
|
||||
54cea42c8c6bfe077b1977bc3905769ad937e124
|
@ -1 +1 @@
|
||||
7631f31003484344dec75a864d26cb06d71338b2
|
||||
3ac346edc244dc2c78aa095b77807d043420bd49
|
@ -73,7 +73,7 @@ namespace System.IO.Compression
|
||||
}
|
||||
|
||||
public override IAsyncResult BeginRead(byte[] array, int offset, int count, AsyncCallback asyncCallback, object asyncState) =>
|
||||
TaskToApm.Begin(WriteAsync(array, offset, count, CancellationToken.None), asyncCallback, asyncState);
|
||||
TaskToApm.Begin(ReadAsync(array, offset, count, CancellationToken.None), asyncCallback, asyncState);
|
||||
|
||||
public override int EndRead(IAsyncResult asyncResult) =>
|
||||
TaskToApm.End<int>(asyncResult);
|
||||
|
@ -34,11 +34,11 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.0.0.0";
|
||||
public const string MonoVersion = "5.0.1.1";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
public const int MonoCorlibVersion = 1050000000;
|
||||
public const int MonoCorlibVersion = 1050001000;
|
||||
|
||||
#if MOBILE
|
||||
// Versions of .NET Framework for Silverlight 4.0
|
||||
|
@ -1 +0,0 @@
|
||||
57dc7c8710eff65e001422fa45f6a6dbd2bfd72d
|
@ -1 +0,0 @@
|
||||
828fda966378b61781182e4f32e294e601e77cbb
|
@ -1 +0,0 @@
|
||||
0263a50f2563d4cbe8a965a0ab14325a0cb9ac67
|
@ -1 +0,0 @@
|
||||
9140637cf6c1aaf8f2d6248e669fe5f9cd6c7a6b
|
@ -1 +0,0 @@
|
||||
215823960c76ebda8def72ae00467821f3710a94
|
@ -1 +0,0 @@
|
||||
809f32ad5e07a59159c963ad49ed2a2d6d1d7f4f
|
@ -1 +0,0 @@
|
||||
320d4a5e541cb9f48bd256bfb8f3f98ddbcbc1d6
|
@ -0,0 +1 @@
|
||||
8941aa7c243dc332e45664e102f069a7773c65ad
|
@ -0,0 +1 @@
|
||||
4e4482f3c6428fd7c673a247cb524c457e737e12
|
Binary file not shown.
@ -0,0 +1 @@
|
||||
9ea5e947656534c3b851f2999d1d0ebdb2f23afa
|
@ -0,0 +1 @@
|
||||
a1b21928f356f2289a10701ed85fb8e4ffbe8727
|
@ -0,0 +1 @@
|
||||
cbe6b854c413bb68fe42f25da8ab27097f1ee2e0
|
1
mcs/class/lib/monolite/1050001000/mcs.exe.REMOVED.git-id
Normal file
1
mcs/class/lib/monolite/1050001000/mcs.exe.REMOVED.git-id
Normal file
@ -0,0 +1 @@
|
||||
233ed8ea90cf630fd057f3007cdfdcd9705a16ef
|
@ -0,0 +1 @@
|
||||
b93d17e8fdae04e06131e6245cbfc0b168a7345f
|
@ -28,7 +28,7 @@ namespace Pdb2Mdb {
|
||||
|
||||
public static void Convert (string filename)
|
||||
{
|
||||
var asm = AssemblyDefinition.ReadAssembly (filename);
|
||||
using (var asm = AssemblyDefinition.ReadAssembly (filename)) {
|
||||
|
||||
var pdb = asm.Name.Name + ".pdb";
|
||||
pdb = Path.Combine (Path.GetDirectoryName (filename), pdb);
|
||||
@ -44,6 +44,7 @@ namespace Pdb2Mdb {
|
||||
Converter.Convert (asm, funcs, new MonoSymbolWriter (filename));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static bool IsPortablePdb (FileStream stream)
|
||||
{
|
||||
|
@ -93,16 +93,10 @@ install-pcl-targets:
|
||||
done
|
||||
|
||||
install-web-targets:
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v9.0/WebApplications
|
||||
$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v9.0/WebApplications
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v10.0/WebApplications
|
||||
$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v10.0/WebApplications
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v11.0/WebApplications
|
||||
$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v11.0/WebApplications
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v12.0/WebApplications
|
||||
$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v12.0/WebApplications
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v14.0/WebApplications
|
||||
$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v14.0/WebApplications
|
||||
for VERSION in v9.0 v10.0 v11.0 v12.0 v14.0 v15.0; do \
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/$$VERSION/WebApplications; \
|
||||
$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/$$VERSION/WebApplications; \
|
||||
done
|
||||
|
||||
NUGET_BUILDTASKS_REPO_DIR=$(topdir)/../external/nuget-buildtasks
|
||||
|
||||
|
@ -1 +1 @@
|
||||
5e597cadd4c3564aa2f2b50a6135f9798d726bbd
|
||||
a99091700d3ceaf606120aaa2e0ec655b0df75e9
|
@ -1114,8 +1114,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
|
||||
SYS_VALUE_TUPLE = 6, //System.ValueTuple
|
||||
SYS_REF_DISP_PROXY = 5 //System.Reflection.DispatchProxy
|
||||
} IgnoredAssemblyNames;
|
||||
|
||||
typedef struct {
|
||||
@ -1136,7 +1135,6 @@ const char *ignored_assemblies_file_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 }
|
||||
@ -1158,7 +1156,6 @@ 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"),
|
||||
};
|
||||
|
||||
|
||||
@ -1168,8 +1165,7 @@ const char *ignored_assemblies_names[] = {
|
||||
"System.IO.Compression",
|
||||
"System.Net.Http",
|
||||
"System.Text.Encoding.CodePages",
|
||||
"System.Reflection.DispatchProxy",
|
||||
"System.ValueTuple"
|
||||
"System.Reflection.DispatchProxy"
|
||||
};
|
||||
|
||||
#define IGNORED_ASM_VER(NAME, MAJOR, MINOR, BUILD, REVISION) { .assembly_name = NAME, .major = MAJOR, .minor = MINOR, .build = BUILD, .revision = REVISION }
|
||||
@ -1189,8 +1185,7 @@ static const IgnoredAssemblyVersion ignored_assembly_versions [] = {
|
||||
IGNORED_ASM_VER (SYS_RT_INTEROP_RUNTIME_INFO, 4, 0, 0, 0),
|
||||
IGNORED_ASM_VER (SYS_RT_INTEROP_RUNTIME_INFO, 4, 0, 1, 0),
|
||||
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_VALUE_TUPLE, 4, 0, 1, 0),
|
||||
IGNORED_ASM_VER (SYS_TEXT_ENC_CODEPAGES, 4, 0, 2, 0)
|
||||
};
|
||||
|
||||
gboolean
|
||||
|
@ -1882,10 +1882,12 @@ _mono_reflection_get_type_from_info (MonoTypeNameParse *info, MonoImage *image,
|
||||
static MonoType*
|
||||
mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoTypeNameParse *info, gboolean ignorecase, MonoError *error)
|
||||
{
|
||||
HANDLE_FUNCTION_ENTER ();
|
||||
MonoClass *klass;
|
||||
GList *mod;
|
||||
int modval;
|
||||
gboolean bounded = FALSE;
|
||||
MonoType* type = NULL;
|
||||
|
||||
mono_error_init (error);
|
||||
if (!image)
|
||||
@ -1900,7 +1902,7 @@ mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoT
|
||||
klass = mono_class_from_name_checked (image, info->name_space, info->name, error);
|
||||
|
||||
if (!klass)
|
||||
return NULL;
|
||||
goto leave;
|
||||
|
||||
for (mod = info->nested; mod; mod = mod->next) {
|
||||
gpointer iter = NULL;
|
||||
@ -1960,7 +1962,7 @@ mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoT
|
||||
break;
|
||||
}
|
||||
if (!klass)
|
||||
return NULL;
|
||||
goto leave;
|
||||
|
||||
if (info->type_arguments) {
|
||||
MonoType **type_args = g_new0 (MonoType *, info->type_arguments->len);
|
||||
@ -1974,20 +1976,20 @@ mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoT
|
||||
type_args [i] = _mono_reflection_get_type_from_info (subinfo, rootimage, ignorecase, error);
|
||||
if (!type_args [i]) {
|
||||
g_free (type_args);
|
||||
return NULL;
|
||||
goto leave;
|
||||
}
|
||||
}
|
||||
|
||||
the_type = mono_type_get_object_handle (mono_domain_get (), &klass->byval_arg, error);
|
||||
if (!is_ok (error) || MONO_HANDLE_IS_NULL (the_type))
|
||||
return NULL;
|
||||
goto leave;
|
||||
|
||||
instance = mono_reflection_bind_generic_parameters (
|
||||
the_type, info->type_arguments->len, type_args, error);
|
||||
|
||||
g_free (type_args);
|
||||
if (!instance)
|
||||
return NULL;
|
||||
goto leave;
|
||||
|
||||
klass = mono_class_from_mono_type (instance);
|
||||
}
|
||||
@ -1995,7 +1997,8 @@ mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoT
|
||||
for (mod = info->modifiers; mod; mod = mod->next) {
|
||||
modval = GPOINTER_TO_UINT (mod->data);
|
||||
if (!modval) { /* byref: must be last modifier */
|
||||
return &klass->this_arg;
|
||||
type = &klass->this_arg;
|
||||
goto leave;
|
||||
} else if (modval == -1) {
|
||||
klass = mono_ptr_class_get (&klass->byval_arg);
|
||||
} else if (modval == -2) {
|
||||
@ -2005,7 +2008,10 @@ mono_reflection_get_type_internal (MonoImage *rootimage, MonoImage* image, MonoT
|
||||
}
|
||||
}
|
||||
|
||||
return &klass->byval_arg;
|
||||
type = &klass->byval_arg;
|
||||
|
||||
leave:
|
||||
HANDLE_FUNCTION_RETURN_VAL (type);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -770,6 +770,7 @@ guint32
|
||||
mono_dynimage_encode_typedef_or_ref_full (MonoDynamicImage *assembly, MonoType *type, gboolean try_typespec)
|
||||
{
|
||||
MONO_REQ_GC_UNSAFE_MODE;
|
||||
HANDLE_FUNCTION_ENTER ();
|
||||
|
||||
MonoDynamicTable *table;
|
||||
guint32 *values;
|
||||
@ -778,10 +779,10 @@ mono_dynimage_encode_typedef_or_ref_full (MonoDynamicImage *assembly, MonoType *
|
||||
|
||||
/* if the type requires a typespec, we must try that first*/
|
||||
if (try_typespec && (token = create_typespec (assembly, type)))
|
||||
return token;
|
||||
goto leave;
|
||||
token = GPOINTER_TO_UINT (g_hash_table_lookup (assembly->typeref, type));
|
||||
if (token)
|
||||
return token;
|
||||
goto leave;
|
||||
klass = mono_class_from_mono_type (type);
|
||||
|
||||
MonoReflectionTypeBuilderHandle tb = MONO_HANDLE_CAST (MonoReflectionTypeBuilder, mono_class_get_ref_info (klass));
|
||||
@ -792,7 +793,7 @@ mono_dynimage_encode_typedef_or_ref_full (MonoDynamicImage *assembly, MonoType *
|
||||
(type->type != MONO_TYPE_MVAR)) {
|
||||
token = MONO_TYPEDEFORREF_TYPEDEF | (MONO_HANDLE_GETVAL (tb, table_idx) << MONO_TYPEDEFORREF_BITS);
|
||||
mono_dynamic_image_register_token (assembly, token, MONO_HANDLE_CAST (MonoObject, tb));
|
||||
return token;
|
||||
goto leave;
|
||||
}
|
||||
|
||||
if (klass->nested_in) {
|
||||
@ -815,7 +816,8 @@ mono_dynimage_encode_typedef_or_ref_full (MonoDynamicImage *assembly, MonoType *
|
||||
g_hash_table_insert (assembly->typeref, type, GUINT_TO_POINTER(token));
|
||||
table->next_idx ++;
|
||||
mono_dynamic_image_register_token (assembly, token, MONO_HANDLE_CAST (MonoObject, tb));
|
||||
return token;
|
||||
leave:
|
||||
HANDLE_FUNCTION_RETURN_VAL (token);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -878,7 +878,7 @@ EXTRA_DIST = TestDriver.cs \
|
||||
Makefile.am.in
|
||||
|
||||
version.h: Makefile
|
||||
echo "#define FULL_VERSION \"Stable 5.0.0.100/9667aa6\"" > version.h
|
||||
echo "#define FULL_VERSION \"2017-02/5077205\"" > version.h
|
||||
|
||||
# Utility target for patching libtool to speed up linking
|
||||
patch-libtool:
|
||||
|
@ -878,7 +878,7 @@ EXTRA_DIST = TestDriver.cs \
|
||||
Makefile.am.in
|
||||
|
||||
version.h: Makefile
|
||||
echo "#define FULL_VERSION \"Stable 5.0.0.100/9667aa6\"" > version.h
|
||||
echo "#define FULL_VERSION \"2017-02/5077205\"" > version.h
|
||||
|
||||
# Utility target for patching libtool to speed up linking
|
||||
patch-libtool:
|
||||
|
@ -1 +1 @@
|
||||
66f0ba10fffc18d1a1795891c93bd0215029648d
|
||||
ad294261302cdc341ab12ee3c294521e59ca1caa
|
@ -1 +1 @@
|
||||
1269d5d5c7c122af0ba55d290199ef934422fa52
|
||||
949d4f5b27201115697b2d5f274b99facb326c8d
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "Stable 5.0.0.100/9667aa6"
|
||||
#define FULL_VERSION "2017-02/5077205"
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
3089bb97fe1d4a69f524f176791f1b6ee6cf2019
|
||||
70a24589a3373f232fec5cf21fa6a31fd24ff8c1
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
15401895df38271eec5257a5fb249eac88abc566
|
||||
9d25177e0735ca66d9a34e618117d87685247bba
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
3b15d5428b6e609836cff776dcf081b9b3ff27e4
|
||||
fac746c2f69f736f303c1e5f632fb9db9a434aa1
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.0.0\n"
|
||||
"Project-Id-Version: mono 5.0.1.1\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2017-05-11 09:30+0000\n"
|
||||
"POT-Creation-Date: 2017-05-24 10:40+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
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
bc28821a824c253df2dcde1420bd66daee30b49a
|
||||
c455dba7a6ecbeb43ad3ef9577dec90d87e9b0e4
|
@ -658,6 +658,7 @@ main (int argc, char *argv [])
|
||||
mono_perfcounters_init ();
|
||||
#endif
|
||||
mono_counters_init ();
|
||||
mono_tls_init_runtime_keys ();
|
||||
mono_metadata_init ();
|
||||
mono_images_init ();
|
||||
mono_assemblies_init ();
|
||||
|
Loading…
x
Reference in New Issue
Block a user