From e0a10bca3665741620da427ada80997e5a77763a Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 5 Feb 2020 08:39:55 +0000 Subject: [PATCH] Imported Upstream version 6.10.0.65 Former-commit-id: e5cb7a4ca4dde494baae4251cd9d7d852457fec8 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- external/bdwgc/autom4te.cache/requests | 680 +++++++++--------- external/bdwgc/config.log | 4 +- external/bdwgc/libtool.REMOVED.git-id | 2 +- external/bockbuild/packages/pango.py | 4 +- .../packages/patches/pango-familyName.patch | 20 + mcs/build/common/Consts.cs | 2 +- mcs/build/tests.make | 30 +- mcs/class/corlib/corlib_xtest.dll.sources | 11 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/metadata/class-init.c.REMOVED.git-id | 2 +- mono/mini/debugger-agent.c.REMOVED.git-id | 2 +- mono/mini/interp/interp.c.REMOVED.git-id | 2 +- mono/mini/memory-access.c | 2 + .../mini-generic-sharing.c.REMOVED.git-id | 2 +- mono/mini/mini-posix.c | 268 +++---- mono/mini/version.h | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 +- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- support/Makefile.in | 2 +- 59 files changed, 593 insertions(+), 522 deletions(-) create mode 100644 external/bockbuild/packages/patches/pango-familyName.patch diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 231c053078..bc23fc6f2a 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -48ea32285f938ac7e396ca2adbbb2677995358f5 \ No newline at end of file +91371d37aacc62640cff3d8f4b0354a883369950 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 13aa8ab790..f1d15c579a 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -d76cdb7af734cbaacdd7ad6f8c1b56c2030b01b0 \ No newline at end of file +24a7d08b99428114ac70d788e6edbb688c8b9e4a \ No newline at end of file diff --git a/external/bdwgc/autom4te.cache/requests b/external/bdwgc/autom4te.cache/requests index fdea627dae..bed9cf08a2 100644 --- a/external/bdwgc/autom4te.cache/requests +++ b/external/bdwgc/autom4te.cache/requests @@ -42,162 +42,162 @@ 'configure.ac' ], { - 'AM_ENABLE_STATIC' => 1, - 'AM_PROG_LIBTOOL' => 1, - '_AM_MANGLE_OPTION' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AC_DISABLE_STATIC' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - 'AM_RUN_LOG' => 1, - '_LT_AC_LANG_GCJ' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_LIBTOOL_FC' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, - '_AM_IF_OPTION' => 1, - '_LT_PROG_ECHO_BACKSLASH' => 1, - 'LT_PROG_GCJ' => 1, - 'AM_DEP_TRACK' => 1, - 'AC_LIBTOOL_GCJ' => 1, - 'AM_MISSING_PROG' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, - '_LT_PREPARE_SED_QUOTE_VARS' => 1, - 'AM_DISABLE_SHARED' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - '_AM_PROG_TAR' => 1, - 'm4_include' => 1, - 'AC_ENABLE_SHARED' => 1, - '_LT_AC_LANG_C_CONFIG' => 1, - 'LTOPTIONS_VERSION' => 1, - 'LT_AC_PROG_RC' => 1, - '_AM_AUTOCONF_VERSION' => 1, - 'AC_LTDL_PREOPEN' => 1, - '_LT_AC_SHELL_INIT' => 1, - 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AU_DEFUN' => 1, - 'AC_DISABLE_SHARED' => 1, - 'AM_SUBST_NOTMAKE' => 1, - 'LT_PROG_RC' => 1, - 'AM_CONDITIONAL' => 1, - 'AC_PROG_LD_GNU' => 1, - 'AM_SILENT_RULES' => 1, - 'm4_pattern_allow' => 1, - '_AM_DEPENDENCIES' => 1, - '_LT_DLL_DEF_P' => 1, - '_LT_PROG_CXX' => 1, - 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - '_LT_COMPILER_OPTION' => 1, - 'AM_PROG_INSTALL_SH' => 1, - 'AC_LIBTOOL_RC' => 1, - '_LT_AC_TAGVAR' => 1, - 'AM_ENABLE_SHARED' => 1, - 'AM_MAKE_INCLUDE' => 1, - 'LT_LANG' => 1, - 'LT_PATH_NM' => 1, - 'AC_CHECK_LIBM' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - 'AC_PATH_TOOL_PREFIX' => 1, - '_LT_AC_LOCK' => 1, - '_LT_COMPILER_BOILERPLATE' => 1, - '_LT_PROG_FC' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'AC_PROG_LD' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'LT_LIB_M' => 1, - 'include' => 1, - 'LT_AC_PROG_GCJ' => 1, - 'LTOBSOLETE_VERSION' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - 'AC_LIBTOOL_PROG_CC_C_O' => 1, + 'AC_LIBTOOL_OBJDIR' => 1, 'LTSUGAR_VERSION' => 1, - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - 'AM_SET_DEPDIR' => 1, - 'LT_AC_PROG_EGREP' => 1, - '_AM_PROG_CC_C_O' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, - 'AC_PROG_EGREP' => 1, + 'AC_ENABLE_SHARED' => 1, + '_LT_PREPARE_SED_QUOTE_VARS' => 1, + 'm4_pattern_allow' => 1, + '_LT_COMPILER_BOILERPLATE' => 1, 'AC_ENABLE_FAST_INSTALL' => 1, - 'AC_LIBTOOL_CXX' => 1, - '_LT_WITH_SYSROOT' => 1, - '_LT_PROG_LTMAIN' => 1, - 'AM_SANITY_CHECK' => 1, - '_AM_SUBST_NOTMAKE' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - 'LTVERSION_VERSION' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - 'AC_LTDL_ENABLE_INSTALL' => 1, - '_LT_PROG_F77' => 1, - 'LT_PROG_GO' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - 'AM_PROG_NM' => 1, - 'GC_SET_VERSION' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - 'LT_AC_PROG_SED' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, - '_LT_AC_LANG_CXX' => 1, - 'AC_PROG_NM' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - '_AC_PROG_LIBTOOL' => 1, - '_LT_LINKER_BOILERPLATE' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, + 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + 'LTOPTIONS_VERSION' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'LT_OUTPUT' => 1, + 'AC_DISABLE_SHARED' => 1, + 'LT_INIT' => 1, 'AC_LIBTOOL_SETUP' => 1, 'AC_PROG_LIBTOOL' => 1, - 'AC_LIBTOOL_F77' => 1, - '_LT_CC_BASENAME' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, - 'LT_INIT' => 1, - 'AM_DISABLE_STATIC' => 1, - 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - 'AC_LTDL_OBJDIR' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - '_LT_LINKER_OPTION' => 1, - '_AM_SET_OPTION' => 1, - '_LT_AC_SYS_COMPILER' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'AM_PROG_AS' => 1, - '_LT_AC_CHECK_DLFCN' => 1, - '_m4_warn' => 1, - '_AM_SET_OPTIONS' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - 'm4_pattern_forbid' => 1, - 'AC_LIBTOOL_OBJDIR' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - 'LT_OUTPUT' => 1, - 'LT_PATH_LD' => 1, - 'AC_DEFUN_ONCE' => 1, - 'LT_SUPPORTED_TAG' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, 'LT_CMD_MAX_LEN' => 1, - '_LT_AC_LANG_F77' => 1, - 'AC_PATH_MAGIC' => 1, - 'AC_DEFUN' => 1, - 'AC_PROG_LD_RELOAD_FLAG' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, + '_AM_SET_OPTIONS' => 1, + 'AC_LIBTOOL_CXX' => 1, + 'AC_PROG_LD_GNU' => 1, + '_LT_PROG_F77' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + 'AM_DISABLE_SHARED' => 1, + '_LT_WITH_SYSROOT' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'LT_SUPPORTED_TAG' => 1, + '_LT_PROG_FC' => 1, + 'AC_LIBTOOL_CONFIG' => 1, 'AC_ENABLE_STATIC' => 1, + 'AC_LIBTOOL_PICMODE' => 1, + 'AC_LIBTOOL_DLOPEN' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, + '_AM_SET_OPTION' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'LT_LANG' => 1, + 'LT_AC_PROG_SED' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'AC_LIBTOOL_FC' => 1, + 'AM_MISSING_PROG' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + '_AM_AUTOCONF_VERSION' => 1, + 'AM_PROG_LIBTOOL' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + '_LT_DLL_DEF_P' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + 'AM_PROG_CC_C_O' => 1, + 'LTOBSOLETE_VERSION' => 1, + 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, + 'AC_PROG_LD_RELOAD_FLAG' => 1, + '_AM_PROG_CC_C_O' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + '_AM_DEPENDENCIES' => 1, + 'LTVERSION_VERSION' => 1, + 'LT_PATH_NM' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + 'AC_CHECK_LIBM' => 1, + 'AM_PROG_AS' => 1, + 'AC_LIBTOOL_PROG_CC_C_O' => 1, + '_LT_LINKER_OPTION' => 1, + 'LT_AC_PROG_RC' => 1, + 'AM_DISABLE_STATIC' => 1, + 'AC_LTDL_OBJDIR' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, + 'AU_DEFUN' => 1, + 'AC_PATH_MAGIC' => 1, + 'AM_MAKE_INCLUDE' => 1, + '_LT_COMPILER_OPTION' => 1, + '_LT_AC_LOCK' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, + 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, + 'AM_ENABLE_STATIC' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + 'AC_DEFUN_ONCE' => 1, + '_LT_AC_LANG_CXX' => 1, + 'AC_PROG_EGREP' => 1, + 'm4_pattern_forbid' => 1, + 'AC_LIBTOOL_GCJ' => 1, + 'AC_PROG_NM' => 1, + 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, + 'AC_LIBTOOL_F77' => 1, + 'AM_MAINTAINER_MODE' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AC_LIBTOOL_WIN32_DLL' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, + 'AM_PROG_INSTALL_SH' => 1, + '_LT_CC_BASENAME' => 1, + 'AM_ENABLE_SHARED' => 1, + '_LT_AC_LANG_GCJ' => 1, + '_LT_AC_SYS_COMPILER' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'include' => 1, + 'AC_LTDL_ENABLE_INSTALL' => 1, + 'AC_LTDL_PREOPEN' => 1, + 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, + 'LT_AC_PROG_EGREP' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + '_LT_AC_CHECK_DLFCN' => 1, + 'AM_DEP_TRACK' => 1, + 'LT_PROG_GO' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, + 'AC_PATH_TOOL_PREFIX' => 1, + '_AM_MANGLE_OPTION' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + '_LT_AC_LANG_C_CONFIG' => 1, + '_LT_LINKER_BOILERPLATE' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'AM_PROG_LD' => 1, + 'm4_include' => 1, + 'AM_SANITY_CHECK' => 1, + '_LT_PROG_ECHO_BACKSLASH' => 1, + 'LT_LIB_M' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + '_LT_AC_PROG_CXXCPP' => 1, + 'AM_PROG_NM' => 1, + '_LT_PROG_LTMAIN' => 1, + 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + '_m4_warn' => 1, + 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, + 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'AM_RUN_LOG' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + '_LT_PROG_CXX' => 1, + 'LT_PATH_LD' => 1, + 'AM_MISSING_HAS_RUN' => 1, + '_LT_AC_TAGVAR' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'LT_PROG_RC' => 1, + 'AC_DISABLE_STATIC' => 1, + 'LT_PROG_GCJ' => 1, + 'GC_SET_VERSION' => 1, + 'AM_SUBST_NOTMAKE' => 1, + 'AM_SILENT_RULES' => 1, + 'AM_SET_DEPDIR' => 1, + 'LT_AC_PROG_GCJ' => 1, + 'AC_PROG_LD' => 1, + '_LT_AC_SHELL_INIT' => 1, + '_AM_IF_OPTION' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_LIBTOOL_RC' => 1, + '_AC_PROG_LIBTOOL' => 1, + '_LT_AC_LANG_CXX_CONFIG' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, - 'AM_PROG_LD' => 1 + '_LT_AC_TRY_DLOPEN_SELF' => 1, + '_AM_PROG_TAR' => 1, + '_LT_AC_LANG_F77' => 1, + 'AC_DEFUN' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -212,66 +212,66 @@ 'configure.ac' ], { - 'LT_INIT' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AC_CONFIG_FILES' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AC_CONFIG_AUX_DIR' => 1, - '_AM_COND_ELSE' => 1, - 'AC_CANONICAL_BUILD' => 1, 'AC_CANONICAL_SYSTEM' => 1, - 'AM_PROG_MKDIR_P' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AC_SUBST_TRACE' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AM_AUTOMAKE_VERSION' => 1, 'AC_SUBST' => 1, - 'AC_LIBSOURCE' => 1, + 'AC_CONFIG_LINKS' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'm4_include' => 1, + 'AM_NLS' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'AC_SUBST_TRACE' => 1, + 'AM_PROG_AR' => 1, + 'AM_CONDITIONAL' => 1, + 'AM_GNU_GETTEXT' => 1, + '_AM_COND_IF' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, + 'AC_FC_SRCEXT' => 1, 'AC_FC_PP_SRCEXT' => 1, + 'AC_CANONICAL_HOST' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AM_POT_TOOLS' => 1, + 'AC_CONFIG_SUBDIRS' => 1, 'sinclude' => 1, 'AC_FC_FREEFORM' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'AM_CONDITIONAL' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'AM_PROG_F77_C_O' => 1, - 'AC_FC_PP_DEFINE' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, 'AM_PATH_GUILE' => 1, - 'm4_pattern_allow' => 1, + 'AM_PROG_MOC' => 1, + 'AC_CONFIG_FILES' => 1, + 'AM_PROG_CC_C_O' => 1, + 'LT_INIT' => 1, + 'AM_PROG_F77_C_O' => 1, + 'AM_PROG_MKDIR_P' => 1, + 'include' => 1, 'AC_PROG_LIBTOOL' => 1, + 'AC_LIBSOURCE' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AM_ENABLE_MULTILIB' => 1, + '_AM_COND_ELSE' => 1, + 'AC_FC_PP_DEFINE' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, 'AM_SILENT_RULES' => 1, - 'AH_OUTPUT' => 1, - 'AM_NLS' => 1, - 'AM_PROG_AR' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AC_CONFIG_LINKS' => 1, - '_AM_COND_IF' => 1, - 'AC_CANONICAL_HOST' => 1, - '_AM_COND_ENDIF' => 1, + 'm4_sinclude' => 1, + 'm4_pattern_forbid' => 1, + '_m4_warn' => 1, 'LT_CONFIG_LTDL_DIR' => 1, 'AM_XGETTEXT_OPTION' => 1, - 'AC_FC_SRCEXT' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'include' => 1, - 'AM_PROG_CXX_C_O' => 1, - 'AM_PROG_MOC' => 1, - 'AM_GNU_GETTEXT' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'AM_MAINTAINER_MODE' => 1, 'AM_PROG_FC_C_O' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'm4_pattern_forbid' => 1, - 'm4_include' => 1, - '_m4_warn' => 1, - 'm4_sinclude' => 1, - 'AM_ENABLE_MULTILIB' => 1, - 'AM_POT_TOOLS' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AC_CONFIG_HEADERS' => 1, + '_AM_SUBST_NOTMAKE' => 1, 'AC_INIT' => 1, - 'AC_REQUIRE_AUX_FILE' => 1 + 'AC_CANONICAL_BUILD' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'm4_pattern_allow' => 1, + 'AH_OUTPUT' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + '_AM_COND_ENDIF' => 1, + 'AM_PROG_LIBTOOL' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -313,162 +313,162 @@ 'configure.ac' ], { - 'AC_PATH_TOOL_PREFIX' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - '_LT_AC_LOCK' => 1, - '_LT_COMPILER_BOILERPLATE' => 1, - 'AC_CHECK_LIBM' => 1, - 'LT_PATH_NM' => 1, - 'LT_LIB_M' => 1, - 'include' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - '_LT_PROG_FC' => 1, - 'AC_PROG_LD' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'AC_PROG_LD_GNU' => 1, - 'AM_SUBST_NOTMAKE' => 1, - 'AM_CONDITIONAL' => 1, - 'LT_PROG_RC' => 1, - '_LT_DLL_DEF_P' => 1, - '_AM_DEPENDENCIES' => 1, - 'AM_SILENT_RULES' => 1, - 'm4_pattern_allow' => 1, - 'AU_DEFUN' => 1, - 'AM_INIT_AUTOMAKE' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - 'AC_DISABLE_SHARED' => 1, - 'AM_ENABLE_SHARED' => 1, - 'AC_LIBTOOL_RC' => 1, - '_LT_AC_TAGVAR' => 1, - 'LT_LANG' => 1, - 'AM_MAKE_INCLUDE' => 1, - '_LT_COMPILER_OPTION' => 1, - '_LT_PROG_CXX' => 1, - 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - 'AM_PROG_INSTALL_SH' => 1, - 'm4_include' => 1, - '_LT_AC_LANG_C_CONFIG' => 1, - 'AC_ENABLE_SHARED' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, - '_LT_PREPARE_SED_QUOTE_VARS' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'AC_LIBTOOL_GCJ' => 1, - 'AM_MISSING_PROG' => 1, + 'AC_LIBTOOL_WIN32_DLL' => 1, + '_AM_SUBST_NOTMAKE' => 1, 'AM_MAINTAINER_MODE' => 1, - '_AM_PROG_TAR' => 1, - 'AM_DISABLE_SHARED' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - '_LT_AC_SHELL_INIT' => 1, - 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - 'LTOPTIONS_VERSION' => 1, - 'LT_AC_PROG_RC' => 1, - '_AM_AUTOCONF_VERSION' => 1, + 'AC_LIBTOOL_F77' => 1, + 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, + 'AC_PROG_NM' => 1, + 'AC_LIBTOOL_GCJ' => 1, + 'm4_pattern_forbid' => 1, + 'AC_PROG_EGREP' => 1, 'AC_LTDL_PREOPEN' => 1, - '_AM_MANGLE_OPTION' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - 'AM_ENABLE_STATIC' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_LTDL_ENABLE_INSTALL' => 1, + 'include' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + '_LT_AC_SYS_COMPILER' => 1, '_LT_AC_LANG_GCJ' => 1, - '_LT_PROG_ECHO_BACKSLASH' => 1, - '_AM_IF_OPTION' => 1, - 'LT_PROG_GCJ' => 1, - 'AM_DEP_TRACK' => 1, + 'AM_ENABLE_SHARED' => 1, + '_LT_CC_BASENAME' => 1, + 'AM_PROG_INSTALL_SH' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, '_LT_PATH_TOOL_PREFIX' => 1, + '_AM_MANGLE_OPTION' => 1, + 'AC_PATH_TOOL_PREFIX' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, + 'LT_PROG_GO' => 1, + 'AM_DEP_TRACK' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + '_LT_AC_CHECK_DLFCN' => 1, + 'LT_AC_PROG_EGREP' => 1, + 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + '_LT_AC_PROG_CXXCPP' => 1, + 'AM_PROG_NM' => 1, + 'LT_LIB_M' => 1, + '_LT_PROG_ECHO_BACKSLASH' => 1, + 'AM_SANITY_CHECK' => 1, + 'm4_include' => 1, + 'AM_PROG_LD' => 1, + '_LT_LINKER_BOILERPLATE' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + '_LT_AC_LANG_C_CONFIG' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + 'LT_PATH_LD' => 1, + '_LT_PROG_CXX' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'AM_RUN_LOG' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, + 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, + '_LT_PROG_LTMAIN' => 1, + '_m4_warn' => 1, + 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + 'LT_AC_PROG_GCJ' => 1, + 'AM_SET_DEPDIR' => 1, + 'AM_SILENT_RULES' => 1, + 'AM_SUBST_NOTMAKE' => 1, + 'GC_SET_VERSION' => 1, + 'AC_DISABLE_STATIC' => 1, + 'LT_PROG_GCJ' => 1, + 'LT_PROG_RC' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, + '_LT_AC_TAGVAR' => 1, + 'AM_MISSING_HAS_RUN' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + '_LT_AC_LANG_CXX_CONFIG' => 1, + 'AC_LIBTOOL_RC' => 1, + '_AC_PROG_LIBTOOL' => 1, + 'AM_CONDITIONAL' => 1, + '_AM_IF_OPTION' => 1, + '_LT_AC_SHELL_INIT' => 1, + 'AC_PROG_LD' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_DEFUN' => 1, + '_LT_AC_LANG_F77' => 1, + '_AM_PROG_TAR' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, + 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + 'AC_ENABLE_FAST_INSTALL' => 1, + '_LT_COMPILER_BOILERPLATE' => 1, + 'm4_pattern_allow' => 1, + '_LT_PREPARE_SED_QUOTE_VARS' => 1, + 'AC_ENABLE_SHARED' => 1, + 'LTSUGAR_VERSION' => 1, + 'AC_LIBTOOL_OBJDIR' => 1, + 'AC_PROG_LD_GNU' => 1, + '_AM_SET_OPTIONS' => 1, + 'LT_CMD_MAX_LEN' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, + 'AC_LIBTOOL_CXX' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AC_LIBTOOL_SETUP' => 1, + 'LT_INIT' => 1, + 'AC_DISABLE_SHARED' => 1, + 'LT_OUTPUT' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'LTOPTIONS_VERSION' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + '_LT_PROG_FC' => 1, + 'LT_SUPPORTED_TAG' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, + '_LT_WITH_SYSROOT' => 1, + 'AM_DISABLE_SHARED' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + '_LT_PROG_F77' => 1, + 'LT_LANG' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + '_AM_SET_OPTION' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, + 'AC_LIBTOOL_DLOPEN' => 1, + 'AC_LIBTOOL_PICMODE' => 1, + 'AC_ENABLE_STATIC' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'AM_PROG_LIBTOOL' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + '_AM_AUTOCONF_VERSION' => 1, + 'AM_MISSING_PROG' => 1, 'AC_LIBTOOL_FC' => 1, 'AM_SET_LEADING_DOT' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - 'AC_DISABLE_STATIC' => 1, - 'AM_RUN_LOG' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - 'm4_pattern_forbid' => 1, - '_AM_SET_OPTIONS' => 1, - '_m4_warn' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - 'AC_LIBTOOL_OBJDIR' => 1, - 'AM_MISSING_HAS_RUN' => 1, - '_LT_AC_CHECK_DLFCN' => 1, - 'AM_PROG_AS' => 1, - 'AC_ENABLE_STATIC' => 1, - 'AC_PROG_LD_RELOAD_FLAG' => 1, - 'AC_PATH_MAGIC' => 1, - 'AC_DEFUN' => 1, - 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, - 'AM_PROG_LD' => 1, - 'LT_OUTPUT' => 1, - 'LT_PATH_LD' => 1, - '_LT_AC_LANG_F77' => 1, - 'LT_CMD_MAX_LEN' => 1, - 'AC_DEFUN_ONCE' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AC_LIBTOOL_SETUP' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, - '_LT_CC_BASENAME' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_LIBTOOL_F77' => 1, - '_AC_PROG_LIBTOOL' => 1, - '_LT_LINKER_BOILERPLATE' => 1, - '_LT_LINKER_OPTION' => 1, - '_AM_SET_OPTION' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - '_LT_AC_SYS_COMPILER' => 1, - 'AM_DISABLE_STATIC' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'LT_INIT' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - 'AC_LTDL_OBJDIR' => 1, - 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - 'AC_LTDL_ENABLE_INSTALL' => 1, - '_LT_PROG_F77' => 1, - 'LT_PROG_GO' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - 'LTVERSION_VERSION' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - 'AC_PROG_NM' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, - '_LT_AC_LANG_CXX' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - 'AM_PROG_NM' => 1, 'LT_AC_PROG_SED' => 1, - 'GC_SET_VERSION' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - 'LTSUGAR_VERSION' => 1, - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, + 'AC_PROG_LD_RELOAD_FLAG' => 1, '_AM_PROG_CC_C_O' => 1, - 'LT_AC_PROG_EGREP' => 1, - 'AM_SET_DEPDIR' => 1, - 'LT_AC_PROG_GCJ' => 1, + 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, 'LTOBSOLETE_VERSION' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, + 'AM_PROG_CC_C_O' => 1, + '_LT_DLL_DEF_P' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + 'AU_DEFUN' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, + 'AC_LTDL_OBJDIR' => 1, + 'AM_DISABLE_STATIC' => 1, + '_LT_LINKER_OPTION' => 1, + 'LT_AC_PROG_RC' => 1, 'AC_LIBTOOL_PROG_CC_C_O' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, + 'AM_PROG_AS' => 1, + 'AC_CHECK_LIBM' => 1, 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - 'AM_SANITY_CHECK' => 1, + 'LT_PATH_NM' => 1, + 'LTVERSION_VERSION' => 1, + '_AM_DEPENDENCIES' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + '_LT_AC_LANG_CXX' => 1, + 'AC_DEFUN_ONCE' => 1, '_AM_CONFIG_MACRO_DIRS' => 1, - '_AM_SUBST_NOTMAKE' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, - 'AC_PROG_EGREP' => 1, - '_LT_WITH_SYSROOT' => 1, - '_LT_PROG_LTMAIN' => 1, - 'AC_ENABLE_FAST_INSTALL' => 1, - 'AC_LIBTOOL_CXX' => 1 + 'LT_SYS_DLOPEN_SELF' => 1, + 'AM_ENABLE_STATIC' => 1, + 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, + '_LT_AC_LOCK' => 1, + 'AM_MAKE_INCLUDE' => 1, + '_LT_COMPILER_OPTION' => 1, + 'AC_PATH_MAGIC' => 1 } ], 'Autom4te::Request' ) ); diff --git a/external/bdwgc/config.log b/external/bdwgc/config.log index e3906a8c3d..7887d83a1d 100644 --- a/external/bdwgc/config.log +++ b/external/bdwgc/config.log @@ -10,7 +10,7 @@ generated by GNU Autoconf 2.69. Invocation command line was ## Platform. ## ## --------- ## -hostname = az-ubuntu-generalac7100 +hostname = az-ubuntu-generalf85770 uname -m = x86_64 uname -r = 4.15.0-1066-azure uname -s = Linux @@ -747,7 +747,7 @@ generated by GNU Autoconf 2.69. Invocation command line was CONFIG_COMMANDS = $ ./config.status -on az-ubuntu-generalac7100 +on az-ubuntu-generalf85770 config.status:1238: creating Makefile config.status:1238: creating bdw-gc.pc diff --git a/external/bdwgc/libtool.REMOVED.git-id b/external/bdwgc/libtool.REMOVED.git-id index b178eac611..319f1aa4a1 100644 --- a/external/bdwgc/libtool.REMOVED.git-id +++ b/external/bdwgc/libtool.REMOVED.git-id @@ -1 +1 @@ -3487cac1a0123f492b29e1277b114cf7a7c694fe \ No newline at end of file +b9b587451a42deced6329eb1bca5c1706f1c58a5 \ No newline at end of file diff --git a/external/bockbuild/packages/pango.py b/external/bockbuild/packages/pango.py index 28020a47c0..00ba8c2a51 100644 --- a/external/bockbuild/packages/pango.py +++ b/external/bockbuild/packages/pango.py @@ -39,7 +39,9 @@ class PangoPackage (GnomeXzPackage): 'patches/pango-system-font-check-version.patch', # https://devdiv.visualstudio.com/DevDiv/_workitems/edit/573960 - 'patches/pango-get-shaper-for-ideographic-space.patch' + 'patches/pango-get-shaper-for-ideographic-space.patch', + + 'patches/pango-familyName.patch' ]) def prep(self): diff --git a/external/bockbuild/packages/patches/pango-familyName.patch b/external/bockbuild/packages/patches/pango-familyName.patch new file mode 100644 index 0000000000..7382c02fea --- /dev/null +++ b/external/bockbuild/packages/patches/pango-familyName.patch @@ -0,0 +1,20 @@ +commit a8bd6caefcbe5462547a277a4fb864989626ef6f +Author: Cody Russell +Date: Mon Jan 27 10:44:06 2020 -0600 + + Try to get the family name from sysfont + +diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c +index 30605fe..7124db4 100644 +--- a/pango/pangocoretext-fontmap.c ++++ b/pango/pangocoretext-fontmap.c +@@ -1437,7 +1437,8 @@ pango_core_text_font_map_init (PangoCoreTextFontMap *ctfontmap) + if (major == 10 && minor >= 11) + { + NSFont *sysfont = [NSFont systemFontOfSize: 0.0]; +- NSString *name = [[NSFont fontWithName: [[sysfont fontDescriptor] postscriptName] size: 0.0] familyName]; ++ //NSString *name = [[NSFont fontWithName: [[sysfont fontDescriptor] postscriptName] size: 0.0] familyName]; ++ NSString *name = [sysfont familyName]; + + NSArray *fontfaces = [[NSFontManager sharedFontManager] availableMembersOfFontFamily: name]; + int num_faces = [fontfaces count]; diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index caf1a12787..c2fdc5509a 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -41,7 +41,7 @@ static partial class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "6.10.0.54"; + public const string MonoVersion = "6.10.0.65"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; diff --git a/mcs/build/tests.make b/mcs/build/tests.make index 078989ada7..47b7f76320 100644 --- a/mcs/build/tests.make +++ b/mcs/build/tests.make @@ -147,7 +147,7 @@ ifdef HAVE_CS_TESTS test_assemblies += $(test_lib_output) ifdef TEST_SPLIT_ASSEMBLIES -test_assemblies += $(test_lib_output:.dll=.part1.dll) $(test_lib_output:.dll=.part2.dll) +test_assemblies += $(test_lib_output:.dll=.part1.dll) $(test_lib_output:.dll=.part2.dll) $(test_lib_output:.dll=.part3.dll) endif check: run-test @@ -288,7 +288,15 @@ $(test_lib_output:.dll=.part1.dll): $(test_lib_output) $(test_response).part1 $(test_lib_output:.dll=.part2.dll): $(test_lib_output) $(test_response).part2 $(TEST_COMPILE) $(LIBRARY_FLAGS) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response).part2 -tests_CLEAN_FILES += $(test_response).part1 $(test_response).part2 +$(test_lib_output:.dll=.part3.dll): $(test_lib_output) $(test_response).part3 +ifneq ($(wildcard $(test_response).part3),) + $(TEST_COMPILE) $(LIBRARY_FLAGS) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response).part3 +endif + +# part3 is optional so we need this empty target to silence make if it doesn't exist +$(test_response).part3: ; + +tests_CLEAN_FILES += $(test_response).part1 $(test_response).part2 $(test_response).part3 endif $(test_response): $(test_sourcefile_base) $(wildcard *_test.dll.sources) $(wildcard *_test.dll.exclude.sources) $(topdir)/build/tests.make $(depsdir)/.stamp @@ -296,7 +304,7 @@ $(test_response): $(test_sourcefile_base) $(wildcard *_test.dll.sources) $(wildc $(test_makefrag): $(test_response) @echo Creating $@ ... - @sed 's,^,$(test_lib_output) $(test_lib_output:.dll=.part1.dll) $(test_lib_output:.dll=.part2.dll): ,' $< >$@ + @sed 's,^,$(test_lib_output) $(test_lib_output:.dll=.part1.dll) $(test_lib_output:.dll=.part2.dll) $(test_lib_output:.dll=.part3.dll): ,' $< >$@ -include $(test_makefrag) @@ -339,7 +347,7 @@ endif xtest_assemblies += $(xtest_lib_output) ifdef XTEST_SPLIT_ASSEMBLIES -xtest_assemblies += $(xtest_lib_output:.dll=.part1.dll) $(xtest_lib_output:.dll=.part2.dll) +xtest_assemblies += $(xtest_lib_output:.dll=.part1.dll) $(xtest_lib_output:.dll=.part2.dll) $(xtest_lib_output:.dll=.part3.dll) endif @@ -377,7 +385,15 @@ $(xtest_lib_output:.dll=.part1.dll): $(xtest_lib_output) $(xtest_response).part1 $(xtest_lib_output:.dll=.part2.dll): $(xtest_lib_output) $(xtest_response).part2 $(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response).part2 $(xunit_src) -xtests_CLEAN_FILES += $(xtest_response).part1 $(xtest_response).part2 +$(xtest_lib_output:.dll=.part3.dll): $(xtest_lib_output) $(xtest_response).part3 +ifneq ($(wildcard $(xtest_response).part3),) + $(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response).part3 $(xunit_src) +endif + +# part3 is optional so we need this empty target to silence make if it doesn't exist +$(xtest_response).part3: ; + +xtests_CLEAN_FILES += $(xtest_response).part1 $(xtest_response).part2 $(xtest_response).part3 endif # This handles .excludes/.sources pairs, as well as resolving the @@ -385,9 +401,9 @@ endif $(xtest_response): $(xtest_sourcefile_base) $(wildcard *_xtest.dll.sources) $(wildcard *_xtest.dll.exclude.sources) $(topdir)/build/tests.make $(depsdir)/.stamp $(GENSOURCES) --strict --platformsdir:$(topdir)/build "$@" "$(xtest_library)" "$(PROFILE_PLATFORM)" "$(PROFILE)" -$(xtest_makefrag): $(xtest_response) $(xtest_response_parts) +$(xtest_makefrag): $(xtest_response) @echo Creating $@ ... - @sed 's,^,$(xtest_lib_output) $(xtest_lib_output:.dll=.part1.dll) $(xtest_lib_output:.dll=.part2.dll): ,' $< >$@ + @sed 's,^,$(xtest_lib_output) $(xtest_lib_output:.dll=.part1.dll) $(xtest_lib_output:.dll=.part2.dll) $(xtest_lib_output:.dll=.part3.dll): ,' $< >$@ -include $(xtest_makefrag) diff --git a/mcs/class/corlib/corlib_xtest.dll.sources b/mcs/class/corlib/corlib_xtest.dll.sources index d57eba1b39..27b311d382 100644 --- a/mcs/class/corlib/corlib_xtest.dll.sources +++ b/mcs/class/corlib/corlib_xtest.dll.sources @@ -294,8 +294,6 @@ corefx/GlobalizationMode.cs ../../../external/corefx/src/System.Runtime/tests/System/TimeZoneNotFoundExceptionTests.cs ../../../external/corefx/src/System.Runtime/tests/System/TimeSpanTests.cs ../../../external/corefx/src/System.Runtime/tests/System/TimeSpanTests.netcoreapp.cs -../../../external/corefx/src/System.Runtime/tests/System/ArraySegmentTests.cs -../../../external/corefx/src/System.Runtime/tests/System/ArraySegmentTests.netcoreapp.cs ../../../external/corefx/src/System.Runtime/tests/System/BooleanTests.cs ../../../external/corefx/src/System.Runtime/tests/System/BooleanTests.netcoreapp.cs ../../../external/corefx/src/System.Runtime/tests/System/ByteTests.cs @@ -366,6 +364,15 @@ corefx/GlobalizationMode.cs ../../../external/corefx/src/System.Runtime/tests/System/Text/*.cs ../../../external/corefx/src/System.Runtime/tests/System/Runtime/CompilerServices/*.cs:RuntimeHelpersTests.netcoreapp.cs,ConditionalWeakTableTests.netcoreapp.cs,ConditionalWeakTableTests.cs + +#split monotouch +#split monotouch_tv +#split monotouch_watch + + +../../../external/corefx/src/System.Runtime/tests/System/ArraySegmentTests.cs +../../../external/corefx/src/System.Runtime/tests/System/ArraySegmentTests.netcoreapp.cs + # System.Collections ../../../external/corefx/src/Common/tests/System/Collections/CollectionAsserts.cs ../../../external/corefx/src/Common/tests/System/Collections/TestBase.NonGeneric.cs diff --git a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id index 0eab93f952..ddbdf4b599 100644 --- a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -999bec834a1f2063106c554a9afadee99f3bc574 \ No newline at end of file +11a1a4fdc8ae20d0fc949e85d91156c4e3a9b332 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id index 4c37d54667..41115e7ffa 100644 --- a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -c957daa98ec878dded022b0017e2f89a0d6bca05 \ No newline at end of file +25ec47b18d159f0ba53ed2f87bd5f4b24f626011 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id index f13cc3b394..84008c7f81 100644 --- a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -594320db03c0562f23eaaeb4c8982cda139e21a8 \ No newline at end of file +6404e05bab46e3b7f6cfa1d9658a1f5c3b4634d7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id index 678124ab6e..646bae8e30 100644 --- a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -25ee1fcc3972bff3d63d1fc2885df87f877f946b \ No newline at end of file +52d5edda8db8f4b3c5ac2bbdea56fed73b14eaf3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id index 77e4463190..ed8cb04bd4 100644 --- a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -30e03ba4dbb6fbc631cfbc64b03a859baa02e78d \ No newline at end of file +1a9e9451784eec71ba222e8b26e8b9b8296f1c32 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id index fb57fcbfb8..65fe7c6471 100644 --- a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -148ee5ba7292b65b6ffd181c6a6a479680ac8b6d \ No newline at end of file +aae3bd6de76f6ede30d48302d3e3829baa889013 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id index 1b133c3dc0..51ea3c85b8 100644 --- a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -bfb3759593b516f62ee7d91a6d238efed8e62f8a \ No newline at end of file +1edf1934f2298f20e5036a0bb2ddf17c2e8a127d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id index f0471cfcc2..84a9f6cab5 100644 --- a/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -2ae99b3855d0f1368a6277fc2fc8a1aad76902ff \ No newline at end of file +053793b3e3bed81ef7eb8aafeddf49a5d85bd0b0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id index 0eab93f952..ddbdf4b599 100644 --- a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -999bec834a1f2063106c554a9afadee99f3bc574 \ No newline at end of file +11a1a4fdc8ae20d0fc949e85d91156c4e3a9b332 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id index 4c37d54667..41115e7ffa 100644 --- a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -c957daa98ec878dded022b0017e2f89a0d6bca05 \ No newline at end of file +25ec47b18d159f0ba53ed2f87bd5f4b24f626011 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id index f13cc3b394..84008c7f81 100644 --- a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -594320db03c0562f23eaaeb4c8982cda139e21a8 \ No newline at end of file +6404e05bab46e3b7f6cfa1d9658a1f5c3b4634d7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id index 678124ab6e..646bae8e30 100644 --- a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -25ee1fcc3972bff3d63d1fc2885df87f877f946b \ No newline at end of file +52d5edda8db8f4b3c5ac2bbdea56fed73b14eaf3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id index 77e4463190..ed8cb04bd4 100644 --- a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -30e03ba4dbb6fbc631cfbc64b03a859baa02e78d \ No newline at end of file +1a9e9451784eec71ba222e8b26e8b9b8296f1c32 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id index fb57fcbfb8..65fe7c6471 100644 --- a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -148ee5ba7292b65b6ffd181c6a6a479680ac8b6d \ No newline at end of file +aae3bd6de76f6ede30d48302d3e3829baa889013 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id index 1b133c3dc0..51ea3c85b8 100644 --- a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -bfb3759593b516f62ee7d91a6d238efed8e62f8a \ No newline at end of file +1edf1934f2298f20e5036a0bb2ddf17c2e8a127d \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id index f0471cfcc2..84a9f6cab5 100644 --- a/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -2ae99b3855d0f1368a6277fc2fc8a1aad76902ff \ No newline at end of file +053793b3e3bed81ef7eb8aafeddf49a5d85bd0b0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id index 0eab93f952..ddbdf4b599 100644 --- a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -999bec834a1f2063106c554a9afadee99f3bc574 \ No newline at end of file +11a1a4fdc8ae20d0fc949e85d91156c4e3a9b332 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id index 4c37d54667..41115e7ffa 100644 --- a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -c957daa98ec878dded022b0017e2f89a0d6bca05 \ No newline at end of file +25ec47b18d159f0ba53ed2f87bd5f4b24f626011 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id index f13cc3b394..84008c7f81 100644 --- a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -594320db03c0562f23eaaeb4c8982cda139e21a8 \ No newline at end of file +6404e05bab46e3b7f6cfa1d9658a1f5c3b4634d7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id index 678124ab6e..646bae8e30 100644 --- a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -25ee1fcc3972bff3d63d1fc2885df87f877f946b \ No newline at end of file +52d5edda8db8f4b3c5ac2bbdea56fed73b14eaf3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id index 77e4463190..ed8cb04bd4 100644 --- a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -30e03ba4dbb6fbc631cfbc64b03a859baa02e78d \ No newline at end of file +1a9e9451784eec71ba222e8b26e8b9b8296f1c32 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id index fb57fcbfb8..65fe7c6471 100644 --- a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -148ee5ba7292b65b6ffd181c6a6a479680ac8b6d \ No newline at end of file +aae3bd6de76f6ede30d48302d3e3829baa889013 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id index 1b133c3dc0..51ea3c85b8 100644 --- a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -bfb3759593b516f62ee7d91a6d238efed8e62f8a \ No newline at end of file +1edf1934f2298f20e5036a0bb2ddf17c2e8a127d \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id index f0471cfcc2..84a9f6cab5 100644 --- a/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -2ae99b3855d0f1368a6277fc2fc8a1aad76902ff \ No newline at end of file +053793b3e3bed81ef7eb8aafeddf49a5d85bd0b0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id index 0eab93f952..ddbdf4b599 100644 --- a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -999bec834a1f2063106c554a9afadee99f3bc574 \ No newline at end of file +11a1a4fdc8ae20d0fc949e85d91156c4e3a9b332 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id index 4c37d54667..41115e7ffa 100644 --- a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -c957daa98ec878dded022b0017e2f89a0d6bca05 \ No newline at end of file +25ec47b18d159f0ba53ed2f87bd5f4b24f626011 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id index fbd9ffd0be..24c4bf4592 100644 --- a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -b1ef283766720f0c9cea548685bc6c01df86e992 \ No newline at end of file +8e717e95e5b6ba8f008c075c1a863f380c53c0bd \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id index 678124ab6e..646bae8e30 100644 --- a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -25ee1fcc3972bff3d63d1fc2885df87f877f946b \ No newline at end of file +52d5edda8db8f4b3c5ac2bbdea56fed73b14eaf3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id index 77e4463190..ed8cb04bd4 100644 --- a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -30e03ba4dbb6fbc631cfbc64b03a859baa02e78d \ No newline at end of file +1a9e9451784eec71ba222e8b26e8b9b8296f1c32 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id index fb57fcbfb8..65fe7c6471 100644 --- a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -148ee5ba7292b65b6ffd181c6a6a479680ac8b6d \ No newline at end of file +aae3bd6de76f6ede30d48302d3e3829baa889013 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id index 1b133c3dc0..51ea3c85b8 100644 --- a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -bfb3759593b516f62ee7d91a6d238efed8e62f8a \ No newline at end of file +1edf1934f2298f20e5036a0bb2ddf17c2e8a127d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id index c76c14092e..3dccd33c08 100644 --- a/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -3ffd61049c79186fc4ff8824b1308fe578a106d7 \ No newline at end of file +eff35503a1d722ee69b4d74f21177131143eebd2 \ No newline at end of file diff --git a/mono/metadata/class-init.c.REMOVED.git-id b/mono/metadata/class-init.c.REMOVED.git-id index ef391f2752..8e89a137a0 100644 --- a/mono/metadata/class-init.c.REMOVED.git-id +++ b/mono/metadata/class-init.c.REMOVED.git-id @@ -1 +1 @@ -853f02d989e0dabe5ee296675400bdf1a5c8943c \ No newline at end of file +9dc9519d7a09613d44df4898eeb7d033cc21c72d \ No newline at end of file diff --git a/mono/mini/debugger-agent.c.REMOVED.git-id b/mono/mini/debugger-agent.c.REMOVED.git-id index 8911af0342..80d251d509 100644 --- a/mono/mini/debugger-agent.c.REMOVED.git-id +++ b/mono/mini/debugger-agent.c.REMOVED.git-id @@ -1 +1 @@ -f6f4098422af50d6f9c4c20b58c164ca7102932b \ No newline at end of file +8bfd9404dac1e5d99cfafe05aec5bd4c59335a94 \ No newline at end of file diff --git a/mono/mini/interp/interp.c.REMOVED.git-id b/mono/mini/interp/interp.c.REMOVED.git-id index f1114ae305..eba731f883 100644 --- a/mono/mini/interp/interp.c.REMOVED.git-id +++ b/mono/mini/interp/interp.c.REMOVED.git-id @@ -1 +1 @@ -d3ceae2e01a0980abecaa845740e98779b3cbc24 \ No newline at end of file +2b09f3bffd92c39c68014aee77fecf5ed9b140d5 \ No newline at end of file diff --git a/mono/mini/memory-access.c b/mono/mini/memory-access.c index da695ada36..c5d5cd5f5a 100644 --- a/mono/mini/memory-access.c +++ b/mono/mini/memory-access.c @@ -260,6 +260,8 @@ create_write_barrier_bitmap (MonoCompile *cfg, MonoClass *klass, unsigned *wb_bi *wb_bitmap |= 1 << ((offset + foffset) / TARGET_SIZEOF_VOID_P); } else { MonoClass *field_class = mono_class_from_mono_type_internal (field->type); + if (cfg->gshared) + field_class = mono_class_from_mono_type_internal (mini_get_underlying_type (m_class_get_byval_arg (field_class))); if (m_class_has_references (field_class)) create_write_barrier_bitmap (cfg, field_class, wb_bitmap, offset + foffset); } diff --git a/mono/mini/mini-generic-sharing.c.REMOVED.git-id b/mono/mini/mini-generic-sharing.c.REMOVED.git-id index ca531de39d..1e2fdadd2f 100644 --- a/mono/mini/mini-generic-sharing.c.REMOVED.git-id +++ b/mono/mini/mini-generic-sharing.c.REMOVED.git-id @@ -1 +1 @@ -e97d1062d2c06bcc69b24064e36a70c50d3b3f69 \ No newline at end of file +26d0c01fe91413648c0c53a906ba8b3e495a730f \ No newline at end of file diff --git a/mono/mini/mini-posix.c b/mono/mini/mini-posix.c index d3b874b877..fd32733317 100644 --- a/mono/mini/mini-posix.c +++ b/mono/mini/mini-posix.c @@ -914,6 +914,37 @@ assert_printer_callback (void) mono_dump_native_crash_info ("SIGABRT", NULL, NULL); } +#if !defined (HOST_WIN32) +/** + * fork_crash_safe: + * + * Version of \c fork that is safe to call from an async context such as a + * signal handler even if the process crashed inside libc. + * + * Returns 0 to the child process, >0 to the parent process or <0 on error. + */ +static pid_t +fork_crash_safe (void) +{ + pid_t pid; + /* + * glibc fork acquires some locks, so if the crash happened inside malloc/free, + * it will deadlock. Call the syscall directly instead. + */ +#if defined(HOST_ANDROID) + /* SYS_fork is defined to be __NR_fork which is not defined in some ndk versions */ + g_assert_not_reached (); +#elif !defined(HOST_DARWIN) && defined(SYS_fork) + pid = (pid_t) syscall (SYS_fork); +#elif HAVE_FORK + pid = (pid_t) fork (); +#else + g_assert_not_reached (); +#endif + return pid; +} +#endif + static void dump_native_stacktrace (const char *signal, MonoContext *mctx) { @@ -956,159 +987,150 @@ dump_native_stacktrace (const char *signal, MonoContext *mctx) } #if !defined(HOST_WIN32) && defined(HAVE_SYS_SYSCALL_H) && (defined(SYS_fork) || HAVE_FORK) - if (!mini_debug_options.no_gdb_backtrace) { - /* From g_spawn_command_line_sync () in eglib */ - pid_t pid; - int status; - pid_t crashed_pid = getpid (); + pid_t crashed_pid = getpid (); #ifndef DISABLE_CRASH_REPORTING - gchar *output = NULL; - MonoStackHash hashes; - MonoStateMem merp_mem; - memset (&merp_mem, 0, sizeof (merp_mem)); + gchar *output = NULL; + MonoStackHash hashes; + MonoStateMem merp_mem; + memset (&merp_mem, 0, sizeof (merp_mem)); - if (!double_faulted) { - gboolean leave = FALSE; - gboolean dump_for_merp = FALSE; + if (!double_faulted) { + gboolean leave = FALSE; + gboolean dump_for_merp = FALSE; #if defined(TARGET_OSX) - dump_for_merp = mono_merp_enabled (); + dump_for_merp = mono_merp_enabled (); #endif #ifndef DISABLE_STRUCTURED_CRASH - mini_register_sigterm_handler (); + mini_register_sigterm_handler (); #endif - if (!dump_for_merp) { + if (!dump_for_merp) { #ifdef DISABLE_STRUCTURED_CRASH - leave = TRUE; + leave = TRUE; #endif - } - - MonoContext *passed_ctx = NULL; - if (!leave && mctx) { - passed_ctx = mctx; - } - - g_async_safe_printf ("\n=================================================================\n"); - g_async_safe_printf ("\tTelemetry Dumper:\n"); - g_async_safe_printf ("=================================================================\n"); - - if (!leave) { - mono_summarize_timeline_start (); - mono_summarize_toggle_assertions (TRUE); - - int mono_max_summary_len = 500000; - int mono_state_tmp_file_tag = 1; - mono_state_alloc_mem (&merp_mem, mono_state_tmp_file_tag, mono_max_summary_len * sizeof (gchar)); - - // Returns success, so leave if !success - leave = !mono_threads_summarize (passed_ctx, &output, &hashes, FALSE, TRUE, (gchar *) merp_mem.mem, mono_max_summary_len); - } - - if (!leave) { - // Wait for the other threads to clean up and exit their handlers - // We can't lock / wait indefinitely, in case one of these threads got stuck somehow - // while dumping. - g_async_safe_printf ("\nWaiting for dumping threads to resume\n"); - sleep (1); - } - - // We want our crash, and don't have telemetry - // So we dump to disk - if (!leave && !dump_for_merp) { - mono_summarize_timeline_phase_log (MonoSummaryCleanup); - mono_crash_dump (output, &hashes); - mono_summarize_timeline_phase_log (MonoSummaryDone); - mono_summarize_toggle_assertions (FALSE); - } } + + MonoContext *passed_ctx = NULL; + if (!leave && mctx) { + passed_ctx = mctx; + } + + g_async_safe_printf ("\n=================================================================\n"); + g_async_safe_printf ("\tTelemetry Dumper:\n"); + g_async_safe_printf ("=================================================================\n"); + + if (!leave) { + mono_summarize_timeline_start (); + mono_summarize_toggle_assertions (TRUE); + + int mono_max_summary_len = 500000; + int mono_state_tmp_file_tag = 1; + mono_state_alloc_mem (&merp_mem, mono_state_tmp_file_tag, mono_max_summary_len * sizeof (gchar)); + + // Returns success, so leave if !success + leave = !mono_threads_summarize (passed_ctx, &output, &hashes, FALSE, TRUE, (gchar *) merp_mem.mem, mono_max_summary_len); + } + + if (!leave) { + // Wait for the other threads to clean up and exit their handlers + // We can't lock / wait indefinitely, in case one of these threads got stuck somehow + // while dumping. + g_async_safe_printf ("\nWaiting for dumping threads to resume\n"); + sleep (1); + } + + // We want our crash, and don't have telemetry + // So we dump to disk + if (!leave && !dump_for_merp) { + mono_summarize_timeline_phase_log (MonoSummaryCleanup); + mono_crash_dump (output, &hashes); + mono_summarize_timeline_phase_log (MonoSummaryDone); + mono_summarize_toggle_assertions (FALSE); + } + } #endif // DISABLE_CRASH_REPORTING - /* - * glibc fork acquires some locks, so if the crash happened inside malloc/free, - * it will deadlock. Call the syscall directly instead. - */ -#if defined(HOST_ANDROID) - /* SYS_fork is defined to be __NR_fork which is not defined in some ndk versions */ - g_assert_not_reached (); -#elif !defined(HOST_DARWIN) && defined(SYS_fork) - pid = (pid_t) syscall (SYS_fork); -#elif HAVE_FORK - pid = (pid_t) fork (); -#else - g_assert_not_reached (); + pid_t pid = crashed_pid; /* init to some >0 value */ + gboolean need_to_fork = !mini_debug_options.no_gdb_backtrace; + +#if defined (TARGET_OSX) && !defined (DISABLE_CRASH_REPORTING) + need_to_fork |= mono_merp_enabled (); #endif + if (need_to_fork) + pid = fork_crash_safe (); + #if defined (HAVE_PRCTL) && defined(PR_SET_PTRACER) - if (pid > 0) { - // Allow gdb to attach to the process even if ptrace_scope sysctl variable is set to - // a value other than 0 (the most permissive ptrace scope). Most modern Linux - // distributions set the scope to 1 which allows attaching only to direct children of - // the current process - prctl (PR_SET_PTRACER, pid, 0, 0, 0); - } + if (need_to_fork && pid > 0) { + // Allow gdb to attach to the process even if ptrace_scope sysctl variable is set to + // a value other than 0 (the most permissive ptrace scope). Most modern Linux + // distributions set the scope to 1 which allows attaching only to direct children of + // the current process + prctl (PR_SET_PTRACER, pid, 0, 0, 0); + } #endif #if defined(TARGET_OSX) && !defined(DISABLE_CRASH_REPORTING) - if (!double_faulted && mono_merp_enabled ()) { - if (pid == 0) { - if (output) { - gboolean merp_upload_success = mono_merp_invoke (crashed_pid, signal, output, &hashes); + if (!double_faulted && mono_merp_enabled ()) { + /* FIXME: why are we running mono_merp_invoke in the forked process? */ + if (pid == 0) { + if (output) { + gboolean merp_upload_success = mono_merp_invoke (crashed_pid, signal, output, &hashes); - if (!merp_upload_success) { - g_async_safe_printf("\nThe MERP upload step has failed.\n"); - } else { - // Remove - g_async_safe_printf("\nThe MERP upload step has succeeded.\n"); - mono_summarize_timeline_phase_log (MonoSummaryDone); - } - mono_summarize_toggle_assertions (FALSE); + if (!merp_upload_success) { + g_async_safe_printf("\nThe MERP upload step has failed.\n"); } else { - g_async_safe_printf("\nMerp dump step not run, no dump created.\n"); + // Remove + g_async_safe_printf("\nThe MERP upload step has succeeded.\n"); + mono_summarize_timeline_phase_log (MonoSummaryDone); } + mono_summarize_toggle_assertions (FALSE); + } else { + g_async_safe_printf("\nMerp dump step not run, no dump created.\n"); } } + } #endif - if (pid == 0) { - dup2 (STDERR_FILENO, STDOUT_FILENO); + if (!mini_debug_options.no_gdb_backtrace && pid == 0) { + dup2 (STDERR_FILENO, STDOUT_FILENO); - g_async_safe_printf ("\n=================================================================\n"); - g_async_safe_printf("\tExternal Debugger Dump:\n"); - g_async_safe_printf ("=================================================================\n"); - mono_gdb_render_native_backtraces (crashed_pid); - _exit (1); - } else if (pid > 0) { - waitpid (pid, &status, 0); - } else { - // If we can't fork, do as little as possible before exiting + g_async_safe_printf ("\n=================================================================\n"); + g_async_safe_printf("\tExternal Debugger Dump:\n"); + g_async_safe_printf ("=================================================================\n"); + mono_gdb_render_native_backtraces (crashed_pid); + _exit (1); + } else if (need_to_fork && pid > 0) { + int status; + waitpid (pid, &status, 0); + } else { + // If we can't fork, do as little as possible before exiting #ifndef DISABLE_CRASH_REPORTING - output = NULL; -#endif - } - - if (double_faulted) { - g_async_safe_printf("\nExiting early due to double fault.\n"); -#ifndef DISABLE_CRASH_REPORTING - mono_state_free_mem (&merp_mem); -#endif - _exit (-1); - } - -#ifndef DISABLE_CRASH_REPORTING - if (output) { - // We've already done our gdb dump and our telemetry steps. Before exiting, - // see if we can notify any attached debugger instances. - // - // At this point we are accepting that the below step might end in a crash - mini_get_dbg_callbacks ()->send_crash (output, &hashes, 0 /* wait # seconds */); - } output = NULL; +#endif + } + + if (double_faulted) { + g_async_safe_printf("\nExiting early due to double fault.\n"); +#ifndef DISABLE_CRASH_REPORTING mono_state_free_mem (&merp_mem); #endif - + _exit (-1); } + +#ifndef DISABLE_CRASH_REPORTING + if (output) { + // We've already done our gdb dump and our telemetry steps. Before exiting, + // see if we can notify any attached debugger instances. + // + // At this point we are accepting that the below step might end in a crash + mini_get_dbg_callbacks ()->send_crash (output, &hashes, 0 /* wait # seconds */); + } + output = NULL; + mono_state_free_mem (&merp_mem); +#endif #endif #else #ifdef HOST_ANDROID @@ -1238,8 +1260,10 @@ mono_gdb_render_native_backtraces (pid_t crashed_pid) } #if defined(HOST_DARWIN) - if (native_stack_with_lldb (crashed_pid, argv, commands_handle, commands_filename)) - goto exec; + // lldb hangs on attaching on Catalina + return; + //if (native_stack_with_lldb (crashed_pid, argv, commands_handle, commands_filename)) + // goto exec; #endif if (native_stack_with_gdb (crashed_pid, argv, commands_handle, commands_filename)) diff --git a/mono/mini/version.h b/mono/mini/version.h index 205c4c47d6..ea8b0000bf 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/2edccc5" +#define FULL_VERSION "explicit/e65846b" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index e23e4fdb26faddc4d78f2f59b3d6804430da1398..c9e8daa4f898457fb6ab1430ea520024cb1b4233 100644 GIT binary patch delta 23 ecmbQIHBW29BQ7o@T?11E0}Cqyi_LGijJNPErV0iYRt6TE`PB=w0Ci#qoB#j- delta 25 gcmeyri1Gg-#tp3MT!y+vMhXTNRtA=v`PB=w0Ci6Xn*aa+ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 27b4f26d9d..8f7fbc49cd 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -1a2dbc626db4822c00d0c33b66edc66b279d0852 \ No newline at end of file +aceb6277b8ab56bc624494cb6004a6da01ac3634 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index e8d37cbc3d..66081cb7e5 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.10.0.54\n" +"Project-Id-Version: mono 6.10.0.65\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2020-01-22 08:09+0000\n" +"POT-Creation-Date: 2020-02-05 08:08+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index c760f6c0c873a22f82b0fbbfe06e82e597c472f6..df32e3f8abeb735c2576422ee1107b8a687dac32 100644 GIT binary patch delta 25 hcmaF1gXP%{mJQKUxr}rTOce|)tPCtRr%q*T2LObn2@(JR delta 25 hcmaF1gXP%{mJQKUxeRrUj1&wktPCtSr%q*T2LObU2@wDQ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 3bd9f84aca..4adda0ccd6 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -18c26a88df3e93aa6f69e7862f4749d0eaabeb0c \ No newline at end of file +f4efe4f3cd6630fa602c3ba96c7b5b3401daf83f \ No newline at end of file diff --git a/support/Makefile.in b/support/Makefile.in index cfd84a1901..cac290c9f2 100644 --- a/support/Makefile.in +++ b/support/Makefile.in @@ -918,8 +918,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_MSVC_ONLY_FALSE@clean-local: @ENABLE_MSVC_ONLY_TRUE@test-bundle-local: +@ENABLE_MSVC_ONLY_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \