Imported Upstream version 5.18.0.142

Former-commit-id: 7467d4b717762eeaf652d77f1486dd11ffb1ff1f

Makefile.am

@@ -11,9 +11,9 @@ else
 tools_dir = tools
 endif
 
-SUBDIRS = mk po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
+SUBDIRS = mk po $(libgc_dir) llvm mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests
 # Keep in sync with SUBDIRS
-DIST_SUBDIRS = m4 mk po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
+DIST_SUBDIRS = m4 mk po $(libgc_dir) llvm mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests
 
 all: update_submodules
 
@@ -126,6 +126,7 @@ package-inputs:
 		(echo "    <project dir=\"$$1\" library=\"$$2\">"; \
 		 read boot;   echo "      <boot>$$boot</boot>"; \
 		 read flags;  echo "      <flags>$$flags</flags>"; \
+		 read sources;echo "      <sources>$$sources</sources>"; \
 		 read output; echo "      <output>$$output</output>"; \
 		 read built;  echo "      <built_sources>`echo $$built | sed 's/\\\/\\\\/g'`</built_sources>"; \
 		 read libou;  echo "      <library_output>$$libou</library_output>"; \
@@ -144,7 +145,7 @@ update-llvm-version:
 
 
 update-solution-files:
-	(pushd msvc/scripts; rm genproj.exe; $(MAKE) genproj.exe; popd)
+	cd msvc/scripts && $(MAKE) genproj.exe || exit $$?;
 	$(MAKE) update-csproj
 	$(MAKE) package-inputs
 	(cd msvc/scripts; mono --debug genproj.exe $(GENPROJ_ARGS))

Makefile.in

@@ -236,6 +236,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXX_ADD_CFLAGS = @CXX_ADD_CFLAGS@
+CXX_REMOVE_CFLAGS = @CXX_REMOVE_CFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PROFILE = @DEFAULT_PROFILE@
 DEFS = @DEFS@
@@ -251,6 +253,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+EXTERNAL_LLVM_CONFIG = @EXTERNAL_LLVM_CONFIG@
 FGREP = @FGREP@
 GDKX11 = @GDKX11@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -291,11 +294,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LLVM_CFLAGS = @LLVM_CFLAGS@
+LLVM_CODEGEN_LIBS = @LLVM_CODEGEN_LIBS@
-LLVM_CONFIG = @LLVM_CONFIG@
-LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
-LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@
@@ -438,9 +437,9 @@ MONOTOUCH_SUBDIRS = $(libgc_dir) mono
 
 # Some tools might not build when cross-compiling
 @CROSS_COMPILING_TRUE@tools_dir = 
-SUBDIRS = mk po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
+SUBDIRS = mk po $(libgc_dir) llvm mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests
 # Keep in sync with SUBDIRS
-DIST_SUBDIRS = m4 mk po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
+DIST_SUBDIRS = m4 mk po $(libgc_dir) llvm mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests
 SUBMODULE_ERROR = 'Could not recursively update all git submodules. You may experience compilation problems if some submodules are out of date'
 EXTRA_DIST = \
 	README.md 		\
@@ -1030,6 +1029,7 @@ package-inputs:
 		(echo "    <project dir=\"$$1\" library=\"$$2\">"; \
 		 read boot;   echo "      <boot>$$boot</boot>"; \
 		 read flags;  echo "      <flags>$$flags</flags>"; \
+		 read sources;echo "      <sources>$$sources</sources>"; \
 		 read output; echo "      <output>$$output</output>"; \
 		 read built;  echo "      <built_sources>`echo $$built | sed 's/\\\/\\\\/g'`</built_sources>"; \
 		 read libou;  echo "      <library_output>$$libou</library_output>"; \
@@ -1047,7 +1047,7 @@ update-llvm-version:
 	REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.ac > tmp && mv tmp configure.ac && echo "Version set to $$REV."
 
 update-solution-files:
-	(pushd msvc/scripts; rm genproj.exe; $(MAKE) genproj.exe; popd)
+	cd msvc/scripts && $(MAKE) genproj.exe || exit $$?;
 	$(MAKE) update-csproj
 	$(MAKE) package-inputs
 	(cd msvc/scripts; mono --debug genproj.exe $(GENPROJ_ARGS))

README.md

@@ -30,6 +30,7 @@ The Mono project is part of the [.NET Foundation](http://www.dotnetfoundation.or
 | Windows      | i386               | [![windows-i386][17]][18]    |
 | CentOS       | s390x (cs)         | [![centos-s390x][19]][20]    |
 | Debian 9     | ppc64el (cs)       | [![debian-9-ppc64el][21]][22]|
+| AIX          | ppc64 (cs)         | [![aix-ppc64][23]][24]       |
 
 _(cs) = community supported architecture_
 
@@ -55,6 +56,8 @@ _(cs) = community supported architecture_
 [20]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x
 [21]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-9-ppc64el/badge/icon
 [22]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-9-ppc64el
+[23]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=aix-ppc64/badge/icon
+[24]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=aix-ppc64
 
 Compilation and Installation
 ============================

acceptance-tests/Makefile.in.REMOVED.git-id

@@ -1 +1 @@
-547201804efe0b3764dea8e1818b1aa0728bd1dc
+185fb4f08d318b39e998de65aba693189afa76a0

acceptance-tests/coreclr.mk.REMOVED.git-id

@@ -1 +1 @@
-df7c4e44217ae3f66ca522f7795d474bcb95050d
+51dbbe569e45412d294d6d996ba1a802f3f87374

config.h.in

@@ -410,6 +410,9 @@
 /* Define to 1 if you have the `futimes' function. */
 #undef HAVE_FUTIMES
 
+/* F_DUPFD_CLOEXEC */
+#undef HAVE_F_DUPFD_CLOEXEC
+
 /* Have getaddrinfo */
 #undef HAVE_GETADDRINFO
 
@@ -590,9 +593,6 @@
 /* kqueue */
 #undef HAVE_KQUEUE
 
-/* Have __thread keyword */
-#undef HAVE_KW_THREAD
-
 /* Have large file support */
 #undef HAVE_LARGE_FILE_SUPPORT
 
@@ -701,6 +701,9 @@
 /* No GC support. */
 #undef HAVE_NULL_GC
 
+/* O_CLOEXEC */
+#undef HAVE_O_CLOEXEC
+
 /* Define to 1 if you have the <pathconf.h> header file. */
 #undef HAVE_PATHCONF_H
 
@@ -1323,6 +1326,12 @@
 /* inotify_rm_watch with unsigned wd */
 #undef INOTIFY_RM_WATCH_WD_UNSIGNED
 
+/* LLVM used is being build during mono build */
+#undef INTERNAL_LLVM
+
+/* Build LLVM with assertions */
+#undef INTERNAL_LLVM_ASSERTS
+
 /* struct ipv6_mreq with unsigned ipv6mr_interface */
 #undef IPV6MR_INTERFACE_UNSIGNED
 
@@ -1335,9 +1344,6 @@
 /* Enable lazy gc thread creation by the embedding host. */
 #undef LAZY_GC_THREAD_CREATION
 
-/* Full version of LLVM libraries */
-#undef LLVM_VERSION
-
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #undef LT_OBJDIR
@@ -1374,6 +1380,9 @@
 /* Enable jemalloc usage for mono */
 #undef MONO_JEMALLOC_ENABLED
 
+/* Have __thread keyword */
+#undef MONO_KEYWORD_THREAD
+
 /* The LLVM back end is dynamically loaded */
 #undef MONO_LLVM_LOADED
 
@@ -1434,7 +1443,7 @@
 /* The size of `long long', as computed by sizeof. */
 #undef SIZEOF_LONG_LONG
 
-/* size of machine integer registers */
+/* size of target machine integer registers */
 #undef SIZEOF_REGISTER
 
 /* The size of `size_t', as computed by sizeof. */
@@ -1491,6 +1500,9 @@
 /* ... */
 #undef TARGET_S390X
 
+/* wordsize of target */
+#undef TARGET_SIZEOF_VOID_P
+
 /* ... */
 #undef TARGET_SPARC
 

configure.REMOVED.git-id

@@ -1 +1 @@
-ffc6859b8573983062da73baeea2360c777c88e5
+9b2fd835af009b5dd6dd4db4bed39050a935a5ea

configure.ac.REMOVED.git-id

@@ -1 +1 @@
-1bf4fa1e23e690a37efb70df0e659d764a410d7d
+31d01c63c1999848cd2cd8c491268eca5b0f9084

data/Makefile.in

@@ -259,6 +259,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXX_ADD_CFLAGS = @CXX_ADD_CFLAGS@
+CXX_REMOVE_CFLAGS = @CXX_REMOVE_CFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PROFILE = @DEFAULT_PROFILE@
 DEFS = @DEFS@
@@ -274,6 +276,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+EXTERNAL_LLVM_CONFIG = @EXTERNAL_LLVM_CONFIG@
 FGREP = @FGREP@
 GDKX11 = @GDKX11@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -314,11 +317,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LLVM_CFLAGS = @LLVM_CFLAGS@
+LLVM_CODEGEN_LIBS = @LLVM_CODEGEN_LIBS@
-LLVM_CONFIG = @LLVM_CONFIG@
-LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
-LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@

data/gdb/mono-gdb.py

@@ -48,7 +48,7 @@ def stringify_class_name(ns, name):
     if ns == "":
         return name
     else:
-        return "{}.{}".format (ns, name)
+        return "{0}.{1}".format (ns, name)
 
 class ArrayPrinter:
     "Print a C# array"
@@ -61,7 +61,7 @@ class ArrayPrinter:
     def to_string(self):
         obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
         length = obj ['max_length']
-        return "{} [{}]".format (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
+        return "{0} [{1}]".format (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
         
 class ObjectPrinter:
     "Print a C# object"
@@ -91,7 +91,7 @@ class ObjectPrinter:
                     return (field.name, self.obj [field.name])
             except:
                 # Superclass
-                return (field.name, self.obj.cast (gdb.lookup_type ("{}".format (field.name))))
+                return (field.name, self.obj.cast (gdb.lookup_type ("{0}".format (field.name))))
 
     def children(self):
         # FIXME: It would be easier if gdb.Value would support iteration itself
@@ -105,7 +105,7 @@ class ObjectPrinter:
             if class_name [-2:len(class_name)] == "[]":
                 return {}.__iter__ ()
             try:
-                gdb_type = gdb.lookup_type ("struct {}_{}".format (class_ns.replace (".", "_"), class_name))
+                gdb_type = gdb.lookup_type ("struct {0}_{1}".format (class_ns.replace (".", "_"), class_name))
                 return self._iterator(obj.cast (gdb_type))
             except:
                 return {}.__iter__ ()
@@ -127,12 +127,12 @@ class ObjectPrinter:
                 return ArrayPrinter (self.val,class_ns,class_name).to_string ()
             if class_ns != "":
                 try:
-                    gdb_type = gdb.lookup_type ("struct {}.{}".format (class_ns, class_name))
+                    gdb_type = gdb.lookup_type ("struct {0}.{1}".format (class_ns, class_name))
                 except:
                     # Maybe there is no debug info for that type
-                    return "{}.{}".format (class_ns, class_name)
+                    return "{0}.{1}".format (class_ns, class_name)
                 #return obj.cast (gdb_type)
-                return "{}.{}".format (class_ns, class_name)
+                return "{0}.{1}".format (class_ns, class_name)
             return class_name
         except:
             print (sys.exc_info ()[0])
@@ -152,9 +152,9 @@ class MonoMethodPrinter:
         val = self.val.dereference ()
         klass = val ["klass"].dereference ()
         class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
-        return "\"{}:{} ()\"".format (class_name, val ["name"].string ())
+        return "\"{0}:{1} ()\"".format (class_name, val ["name"].string ())
         # This returns more info but requires calling into the inferior
-        #return "\"{}\"".format (gdb.parse_and_eval ("mono_method_full_name ({}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
+        #return "\"{0}\"".format (gdb.parse_and_eval ("mono_method_full_name ({0}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
 
 class MonoClassPrinter:
     "Print a MonoClass structure"
@@ -168,11 +168,11 @@ class MonoClassPrinter:
         klass = self.val.dereference ()
         class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
         if add_quotes:
-            return "\"{}\"".format (class_name)
+            return "\"{0}\"".format (class_name)
         else:
             return class_name
         # This returns more info but requires calling into the inferior
-        #return "\"{}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
+        #return "\"{0}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){0})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
 
     def to_string(self):
         try:
@@ -220,7 +220,7 @@ class MonoGenericClassPrinter:
         method_inst_str = ""
         if int(method_inst.cast (gdb.lookup_type ("guint64"))) != 0:
             method_inst_str  = str(method_inst)
-        return "{}, [{}], [{}]>".format (container_str, class_inst_str, method_inst_str)
+        return "{0}, [{1}], [{2}]>".format (container_str, class_inst_str, method_inst_str)
 
     def to_string(self):
         try:
@@ -250,9 +250,9 @@ class MonoTypePrinter:
                 info = str(t ["data"]["generic_class"])
 
             if info != "":
-                return "{{{}, {}}}".format (kind, info)
+                return "{{{0}, {1}}}".format (kind, info)
             else:
-                return "{{{}}}".format (kind)
+                return "{{{0}}}".format (kind)
         except:
             #print (sys.exc_info ()[0])
             #print (sys.exc_info ()[1])
@@ -281,7 +281,7 @@ class MonoMethodRgctxPrinter:
             if i > 0:
                 inst_str = inst_str + ", "
             inst_str = inst_str + type_printer.to_string ()
-        return "MRGCTX[{}, [{}]]".format (klass_printer.to_string(), inst_str)
+        return "MRGCTX[{0}, [{1}]]".format (klass_printer.to_string(), inst_str)
 
 class MonoVTablePrinter:
     "Print a MonoVTable structure"
@@ -296,7 +296,7 @@ class MonoVTablePrinter:
         klass = vtable ["klass"]
         klass_printer = MonoClassPrinter (klass)
 
-        return "vtable({})".format (klass_printer.to_string ())
+        return "vtable({0})".format (klass_printer.to_string ())
 
 def lookup_pretty_printer(val):
     t = str (val.type)

data/net_2_0/Browsers/Makefile.in

@@ -181,6 +181,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXX_ADD_CFLAGS = @CXX_ADD_CFLAGS@
+CXX_REMOVE_CFLAGS = @CXX_REMOVE_CFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PROFILE = @DEFAULT_PROFILE@
 DEFS = @DEFS@
@@ -196,6 +198,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+EXTERNAL_LLVM_CONFIG = @EXTERNAL_LLVM_CONFIG@
 FGREP = @FGREP@
 GDKX11 = @GDKX11@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -236,11 +239,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LLVM_CFLAGS = @LLVM_CFLAGS@
+LLVM_CODEGEN_LIBS = @LLVM_CODEGEN_LIBS@
-LLVM_CONFIG = @LLVM_CONFIG@
-LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
-LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@

data/net_2_0/Makefile.in

@@ -241,6 +241,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXX_ADD_CFLAGS = @CXX_ADD_CFLAGS@
+CXX_REMOVE_CFLAGS = @CXX_REMOVE_CFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PROFILE = @DEFAULT_PROFILE@
 DEFS = @DEFS@
@@ -256,6 +258,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+EXTERNAL_LLVM_CONFIG = @EXTERNAL_LLVM_CONFIG@
 FGREP = @FGREP@
 GDKX11 = @GDKX11@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -296,11 +299,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LLVM_CFLAGS = @LLVM_CFLAGS@
+LLVM_CODEGEN_LIBS = @LLVM_CODEGEN_LIBS@
-LLVM_CONFIG = @LLVM_CONFIG@
-LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
-LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@

data/net_4_0/Browsers/Makefile.in

@@ -181,6 +181,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXX_ADD_CFLAGS = @CXX_ADD_CFLAGS@
+CXX_REMOVE_CFLAGS = @CXX_REMOVE_CFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PROFILE = @DEFAULT_PROFILE@
 DEFS = @DEFS@
@@ -196,6 +198,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+EXTERNAL_LLVM_CONFIG = @EXTERNAL_LLVM_CONFIG@
 FGREP = @FGREP@
 GDKX11 = @GDKX11@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -236,11 +239,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LLVM_CFLAGS = @LLVM_CFLAGS@
+LLVM_CODEGEN_LIBS = @LLVM_CODEGEN_LIBS@
-LLVM_CONFIG = @LLVM_CONFIG@
-LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
-LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@

data/net_4_0/Makefile.in

@@ -241,6 +241,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXX_ADD_CFLAGS = @CXX_ADD_CFLAGS@
+CXX_REMOVE_CFLAGS = @CXX_REMOVE_CFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PROFILE = @DEFAULT_PROFILE@
 DEFS = @DEFS@
@@ -256,6 +258,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+EXTERNAL_LLVM_CONFIG = @EXTERNAL_LLVM_CONFIG@
 FGREP = @FGREP@
 GDKX11 = @GDKX11@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -296,11 +299,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LLVM_CFLAGS = @LLVM_CFLAGS@
+LLVM_CODEGEN_LIBS = @LLVM_CODEGEN_LIBS@
-LLVM_CONFIG = @LLVM_CONFIG@
-LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
-LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@

data/net_4_5/Browsers/Makefile.in

@@ -181,6 +181,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXX_ADD_CFLAGS = @CXX_ADD_CFLAGS@
+CXX_REMOVE_CFLAGS = @CXX_REMOVE_CFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PROFILE = @DEFAULT_PROFILE@
 DEFS = @DEFS@
@@ -196,6 +198,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+EXTERNAL_LLVM_CONFIG = @EXTERNAL_LLVM_CONFIG@
 FGREP = @FGREP@
 GDKX11 = @GDKX11@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -236,11 +239,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LLVM_CFLAGS = @LLVM_CFLAGS@
+LLVM_CODEGEN_LIBS = @LLVM_CODEGEN_LIBS@
-LLVM_CONFIG = @LLVM_CONFIG@
-LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
-LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@

data/net_4_5/Makefile.in

@@ -241,6 +241,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXX_ADD_CFLAGS = @CXX_ADD_CFLAGS@
+CXX_REMOVE_CFLAGS = @CXX_REMOVE_CFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PROFILE = @DEFAULT_PROFILE@
 DEFS = @DEFS@
@@ -256,6 +258,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+EXTERNAL_LLVM_CONFIG = @EXTERNAL_LLVM_CONFIG@
 FGREP = @FGREP@
 GDKX11 = @GDKX11@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -296,11 +299,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LLVM_CFLAGS = @LLVM_CFLAGS@
+LLVM_CODEGEN_LIBS = @LLVM_CODEGEN_LIBS@
-LLVM_CONFIG = @LLVM_CONFIG@
-LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
-LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@

docs/Makefile.in

@@ -181,6 +181,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXX_ADD_CFLAGS = @CXX_ADD_CFLAGS@
+CXX_REMOVE_CFLAGS = @CXX_REMOVE_CFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_PROFILE = @DEFAULT_PROFILE@
 DEFS = @DEFS@
@@ -196,6 +198,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+EXTERNAL_LLVM_CONFIG = @EXTERNAL_LLVM_CONFIG@
 FGREP = @FGREP@
 GDKX11 = @GDKX11@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -236,11 +239,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
-LLVM_CFLAGS = @LLVM_CFLAGS@
+LLVM_CODEGEN_LIBS = @LLVM_CODEGEN_LIBS@
-LLVM_CONFIG = @LLVM_CONFIG@
-LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
-LLVM_LIBS = @LLVM_LIBS@
 LN_S = @LN_S@
 LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@

docs/deploy/mono-api-class.html

@@ -1362,7 +1362,7 @@ mono_class_value_size (MonoClass *klass, guint32 *align)
 </div>
             <p />
             <div class="mapi-section">Parameters</div>
-            <table class="mapi-parameters"><tbody><tr><td><i>klass</i></td><td> a class </td></tr></tbody></table>             <div class="mapi-section">Return value</div>
+            <table class="mapi-parameters"><tbody><tr><td><i>klass</i></td><td> a class</td></tr></tbody></table>             <div class="mapi-section">Return value</div>
              <div>	 the size of a value of kind <i>klass</i>
 </div>
              <div class="mapi-section">Description</div>

docs/deploy/mono-api-exc.html

@@ -396,7 +396,7 @@ mono_exception_from_name_msg (MonoImage *image, const char *name_space,
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoException*
 mono_exception_from_name_two_strings (MonoImage *image, const char *name_space,
-				      const char *name, MonoString *a1, MonoString *a2)
+				      const char *name, MonoString *a1_raw, MonoString *a2_raw)
 
 </div>
             <p />
@@ -672,7 +672,7 @@ mono_get_exception_execution_engine (const char *msg)
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoException*
-mono_get_exception_file_not_found2 (const char *msg, MonoString *fname)
+mono_get_exception_file_not_found2 (const char *msg, MonoString *fname_raw)
 
 </div>
             <p />
@@ -694,7 +694,7 @@ mono_get_exception_file_not_found2 (const char *msg, MonoString *fname)
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoException*
-mono_get_exception_file_not_found (MonoString *fname)
+mono_get_exception_file_not_found (MonoString *fname_raw)
 
 </div>
             <p />
@@ -866,7 +866,7 @@ mono_get_exception_overflow (void)
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoException*
-mono_get_exception_security ()
+mono_get_exception_security (void)
 
 </div>
             <p />
@@ -952,7 +952,7 @@ mono_get_exception_synchronization_lock (const char *msg)
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoException*
-mono_get_exception_thread_abort ()
+mono_get_exception_thread_abort (void)
 
 </div>
             <p />
@@ -972,8 +972,7 @@ mono_get_exception_thread_abort ()
             <div class="mapi-ptr"></div>
 
             <div class="mapi-declaration mapi-section">Syntax</div>
-            <div class="mapi-prototype">MONO_RT_EXTERNAL_ONLY
+            <div class="mapi-prototype">MonoException*
-MonoException *
 mono_get_exception_thread_state (const char *msg)
 
 </div>
@@ -996,7 +995,7 @@ mono_get_exception_thread_state (const char *msg)
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoException*
-mono_get_exception_type_initialization (const gchar *type_name, MonoException *inner)
+mono_get_exception_type_initialization (const gchar *type_name, MonoException* inner_raw)
 
 </div>
             <p />
@@ -1018,7 +1017,7 @@ mono_get_exception_type_initialization (const gchar *type_name, MonoException *i
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoException*
-mono_get_exception_type_load (MonoString *class_name, char *assembly_name)
+mono_get_exception_type_load (MonoString *class_name_raw, char *assembly_name)
 
 </div>
             <p />
@@ -1067,7 +1066,7 @@ mono_get_exception_missing_field (const char *class_name, const char *member_nam
 </div>
             <p />
             <div class="mapi-section">Parameters</div>
-            <table class="mapi-parameters"><tbody><tr><td><i>class_name</i></td><td> the class where the lookup was performed</td></tr><tr><td><i>member_name</i></td><td> the name of the missing method.</td></tr></tbody></table>             <div class="mapi-section">Return value</div>
+            <table class="mapi-parameters"><tbody><tr><td><i>class_name</i></td><td> the class where the lookup was performed</td></tr><tr><td><i>member_name</i></td><td> the name of the missing field.</td></tr></tbody></table>             <div class="mapi-section">Return value</div>
              <div>	 a new instance of the <code>System.MissingFieldException</code>
 </div>
         </div><!--mapi-description -->
@@ -1128,8 +1127,7 @@ mono_get_exception_reflection_type_load (MonoArray *types_raw, MonoArray *except
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoException*
-mono_exception_from_token_two_strings (MonoImage *image, guint32 token,
+mono_exception_from_token_two_strings (MonoImage *image, guint32 token, MonoString *arg1_raw, MonoString *arg2_raw)
-									   MonoString *a1, MonoString *a2)
 
 </div>
             <p />
@@ -1152,7 +1150,7 @@ mono_exception_from_token_two_strings (MonoImage *image, guint32 token,
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoException*
-mono_get_exception_bad_image_format2 (const char *msg, MonoString *fname)
+mono_get_exception_bad_image_format2 (const char *msg, MonoString *fname_raw)
 
 </div>
             <p />
@@ -1237,7 +1235,7 @@ mono_get_exception_out_of_memory (void)
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoException*
-mono_get_exception_runtime_wrapped (MonoObject *wrapped_exception)
+mono_get_exception_runtime_wrapped (MonoObject *wrapped_exception_raw)
 
 </div>
             <p />

docs/deploy/mono-api-internal.html

@@ -340,8 +340,8 @@ mono_marshal_alloc (gsize size, MonoError *error)
             <div class="mapi-ptr"></div>
 
             <div class="mapi-declaration mapi-section">Syntax</div>
-            <div class="mapi-prototype">gpointer
+            <div class="mapi-prototype">static gpointer
-mono_marshal_asany (MonoObject *o, MonoMarshalNative string_encoding, int param_attrs)
+mono_marshal_asany_handle (MonoObjectHandle o, MonoMarshalNative string_encoding, int param_attrs, MonoError *error)
 
 </div>
             <p />

docs/deploy/mono-api-string.html

@@ -380,7 +380,7 @@ mono_string_from_utf16 (gunichar2 *data)
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoString*
-mono_string_from_utf32 (mono_unichar4 *data)
+mono_string_from_utf32 (/*const*/ mono_unichar4 *data)
 
 </div>
             <p />

docs/deploy/mono-api-type.html

@@ -478,7 +478,7 @@ mono_type_get_underlying_type (MonoType *type)
             <div class="mapi-ptr"></div>
 
             <div class="mapi-declaration mapi-section">Syntax</div>
-            <div class="mapi-prototype">gboolean
+            <div class="mapi-prototype">mono_bool
 mono_type_is_byref (MonoType *type)
 
 </div>

external/api-snapshot/profiles/monodroid/Facades/netstandard.cs.REMOVED.git-id

@@ -1 +1 @@
-8ffeb2ce2f964947f799e68f33977d6f1842b8c2
+24ecdefc0004fa8d23a5cda73a8075eb8cae0520

external/api-snapshot/profiles/monodroid/System.Core.cs.REMOVED.git-id

@@ -1 +1 @@
-f33b8a63fa46172d23817d0bcc706d25a6ddd781
+2b595ee4c9228ee8ebdc1c8fa5b011b706e4cb23

external/api-snapshot/profiles/monodroid/System.Security.cs

@@ -19,41 +19,7 @@
 [assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)]
 [assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)]
 [assembly:System.Security.AllowPartiallyTrustedCallersAttribute]
-namespace System
+[assembly:System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.RequestMinimum, SkipVerification=true)]
-{
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoDocumentationNoteAttribute : System.MonoTODOAttribute
-    {
-        public MonoDocumentationNoteAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoExtensionAttribute : System.MonoTODOAttribute
-    {
-        public MonoExtensionAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoInternalNoteAttribute : System.MonoTODOAttribute
-    {
-        public MonoInternalNoteAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoLimitationAttribute : System.MonoTODOAttribute
-    {
-        public MonoLimitationAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoNotSupportedAttribute : System.MonoTODOAttribute
-    {
-        public MonoNotSupportedAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoTODOAttribute : System.Attribute
-    {
-        public MonoTODOAttribute() { }
-        public MonoTODOAttribute(string comment) { }
-        public string Comment { get { throw null; } }
-    }
-}
 namespace System.Security.Cryptography
 {
     public sealed partial class CryptographicAttributeObject
@@ -141,14 +107,28 @@ namespace System.Security.Cryptography.Pkcs
         public bool MoveNext() { throw null; }
         public void Reset() { }
     }
+    public sealed partial class CmsSigner
+    {
+        public CmsSigner() { }
+        public CmsSigner(System.Security.Cryptography.CspParameters parameters) { }
+        public CmsSigner(System.Security.Cryptography.Pkcs.SubjectIdentifierType signerIdentifierType) { }
+        public CmsSigner(System.Security.Cryptography.Pkcs.SubjectIdentifierType signerIdentifierType, System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { }
+        public CmsSigner(System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { }
+        public System.Security.Cryptography.X509Certificates.X509Certificate2 Certificate { get { throw null; } set { } }
+        public System.Security.Cryptography.X509Certificates.X509Certificate2Collection Certificates { get { throw null; } }
+        public System.Security.Cryptography.Oid DigestAlgorithm { get { throw null; } set { } }
+        public System.Security.Cryptography.X509Certificates.X509IncludeOption IncludeOption { get { throw null; } set { } }
+        public System.Security.Cryptography.AsymmetricAlgorithm PrivateKey { get { throw null; } set { } }
+        public System.Security.Cryptography.CryptographicAttributeObjectCollection SignedAttributes { get { throw null; } }
+        public System.Security.Cryptography.Pkcs.SubjectIdentifierType SignerIdentifierType { get { throw null; } set { } }
+        public System.Security.Cryptography.CryptographicAttributeObjectCollection UnsignedAttributes { get { throw null; } }
+    }
     public sealed partial class ContentInfo
     {
         public ContentInfo(byte[] content) { }
         public ContentInfo(System.Security.Cryptography.Oid contentType, byte[] content) { }
         public byte[] Content { get { throw null; } }
         public System.Security.Cryptography.Oid ContentType { get { throw null; } }
-        ~ContentInfo() { }
-        [System.MonoTODOAttribute("MS is stricter than us about the content structure")]
         public static System.Security.Cryptography.Oid GetContentType(byte[] encodedMessage) { throw null; }
     }
     public sealed partial class EnvelopedCms
@@ -164,26 +144,16 @@ namespace System.Security.Cryptography.Pkcs
         public System.Security.Cryptography.Pkcs.RecipientInfoCollection RecipientInfos { get { throw null; } }
         public System.Security.Cryptography.CryptographicAttributeObjectCollection UnprotectedAttributes { get { throw null; } }
         public int Version { get { throw null; } }
-        [System.MonoTODOAttribute]
         public void Decode(byte[] encodedMessage) { }
-        [System.MonoTODOAttribute]
         public void Decrypt() { }
-        [System.MonoTODOAttribute]
         public void Decrypt(System.Security.Cryptography.Pkcs.RecipientInfo recipientInfo) { }
-        [System.MonoTODOAttribute]
         public void Decrypt(System.Security.Cryptography.Pkcs.RecipientInfo recipientInfo, System.Security.Cryptography.X509Certificates.X509Certificate2Collection extraStore) { }
-        [System.MonoTODOAttribute]
         public void Decrypt(System.Security.Cryptography.X509Certificates.X509Certificate2Collection extraStore) { }
-        [System.MonoTODOAttribute]
         public byte[] Encode() { throw null; }
-        [System.MonoTODOAttribute]
         public void Encrypt() { }
-        [System.MonoTODOAttribute]
         public void Encrypt(System.Security.Cryptography.Pkcs.CmsRecipient recipient) { }
-        [System.MonoTODOAttribute]
         public void Encrypt(System.Security.Cryptography.Pkcs.CmsRecipientCollection recipients) { }
     }
-    [System.MonoTODOAttribute]
     public sealed partial class KeyAgreeRecipientInfo : System.Security.Cryptography.Pkcs.RecipientInfo
     {
         internal KeyAgreeRecipientInfo() { }
@@ -289,6 +259,70 @@ namespace System.Security.Cryptography.Pkcs
         KeyTransport = 1,
         Unknown = 0,
     }
+    public sealed partial class SignedCms
+    {
+        public SignedCms() { }
+        public SignedCms(System.Security.Cryptography.Pkcs.ContentInfo contentInfo) { }
+        public SignedCms(System.Security.Cryptography.Pkcs.ContentInfo contentInfo, bool detached) { }
+        public SignedCms(System.Security.Cryptography.Pkcs.SubjectIdentifierType signerIdentifierType) { }
+        public SignedCms(System.Security.Cryptography.Pkcs.SubjectIdentifierType signerIdentifierType, System.Security.Cryptography.Pkcs.ContentInfo contentInfo) { }
+        public SignedCms(System.Security.Cryptography.Pkcs.SubjectIdentifierType signerIdentifierType, System.Security.Cryptography.Pkcs.ContentInfo contentInfo, bool detached) { }
+        public System.Security.Cryptography.X509Certificates.X509Certificate2Collection Certificates { get { throw null; } }
+        public System.Security.Cryptography.Pkcs.ContentInfo ContentInfo { get { throw null; } }
+        public bool Detached { get { throw null; } }
+        public System.Security.Cryptography.Pkcs.SignerInfoCollection SignerInfos { get { throw null; } }
+        public int Version { get { throw null; } }
+        public void CheckHash() { }
+        public void CheckSignature(bool verifySignatureOnly) { }
+        public void CheckSignature(System.Security.Cryptography.X509Certificates.X509Certificate2Collection extraStore, bool verifySignatureOnly) { }
+        public void ComputeSignature() { }
+        public void ComputeSignature(System.Security.Cryptography.Pkcs.CmsSigner signer) { }
+        public void ComputeSignature(System.Security.Cryptography.Pkcs.CmsSigner signer, bool silent) { }
+        public void Decode(byte[] encodedMessage) { }
+        public byte[] Encode() { throw null; }
+        public void RemoveSignature(int index) { }
+        public void RemoveSignature(System.Security.Cryptography.Pkcs.SignerInfo signerInfo) { }
+    }
+    public sealed partial class SignerInfo
+    {
+        internal SignerInfo() { }
+        public System.Security.Cryptography.X509Certificates.X509Certificate2 Certificate { get { throw null; } }
+        public System.Security.Cryptography.Pkcs.SignerInfoCollection CounterSignerInfos { get { throw null; } }
+        public System.Security.Cryptography.Oid DigestAlgorithm { get { throw null; } }
+        public System.Security.Cryptography.Oid SignatureAlgorithm { get { throw null; } }
+        public System.Security.Cryptography.CryptographicAttributeObjectCollection SignedAttributes { get { throw null; } }
+        public System.Security.Cryptography.Pkcs.SubjectIdentifier SignerIdentifier { get { throw null; } }
+        public System.Security.Cryptography.CryptographicAttributeObjectCollection UnsignedAttributes { get { throw null; } }
+        public int Version { get { throw null; } }
+        public void CheckHash() { }
+        public void CheckSignature(bool verifySignatureOnly) { }
+        public void CheckSignature(System.Security.Cryptography.X509Certificates.X509Certificate2Collection extraStore, bool verifySignatureOnly) { }
+        public void ComputeCounterSignature() { }
+        public void ComputeCounterSignature(System.Security.Cryptography.Pkcs.CmsSigner signer) { }
+        public byte[] GetSignature() { throw null; }
+        public void RemoveCounterSignature(int index) { }
+        public void RemoveCounterSignature(System.Security.Cryptography.Pkcs.SignerInfo counterSignerInfo) { }
+    }
+    public sealed partial class SignerInfoCollection : System.Collections.ICollection, System.Collections.IEnumerable
+    {
+        internal SignerInfoCollection() { }
+        public int Count { get { throw null; } }
+        public bool IsSynchronized { get { throw null; } }
+        public System.Security.Cryptography.Pkcs.SignerInfo this[int index] { get { throw null; } }
+        public object SyncRoot { get { throw null; } }
+        public void CopyTo(System.Array array, int index) { }
+        public void CopyTo(System.Security.Cryptography.Pkcs.SignerInfo[] array, int index) { }
+        public System.Security.Cryptography.Pkcs.SignerInfoEnumerator GetEnumerator() { throw null; }
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
+    }
+    public sealed partial class SignerInfoEnumerator : System.Collections.IEnumerator
+    {
+        internal SignerInfoEnumerator() { }
+        public System.Security.Cryptography.Pkcs.SignerInfo Current { get { throw null; } }
+        object System.Collections.IEnumerator.Current { get { throw null; } }
+        public bool MoveNext() { throw null; }
+        public void Reset() { }
+    }
     public sealed partial class SubjectIdentifier
     {
         internal SubjectIdentifier() { }

external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id

@@ -1 +1 @@
-d343eb5458c68903df629e9b5279a611131d5dc2
+0a306482eac9dc254a050e40a50147c9f8a8f319

external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id

@@ -1 +1 @@
-3e5fbe0a8e9832a6c1fa10e9e6fcb9b7760767d7
+2fb53cd439a3395a5d960922938e7d3b2ca800d5

external/api-snapshot/profiles/monotouch/System.Core.cs.REMOVED.git-id

@@ -1 +1 @@
-bb9c7fdf6eb89a2c779160dc32d18fefd86adae4
+1845aa28a014b1b3fb193a22b13489b5068511e9

external/api-snapshot/profiles/monotouch/System.Security.cs

@@ -19,41 +19,7 @@
 [assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)]
 [assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)]
 [assembly:System.Security.AllowPartiallyTrustedCallersAttribute]
-namespace System
+[assembly:System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.RequestMinimum, SkipVerification=true)]
-{
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoDocumentationNoteAttribute : System.MonoTODOAttribute
-    {
-        public MonoDocumentationNoteAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoExtensionAttribute : System.MonoTODOAttribute
-    {
-        public MonoExtensionAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoInternalNoteAttribute : System.MonoTODOAttribute
-    {
-        public MonoInternalNoteAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoLimitationAttribute : System.MonoTODOAttribute
-    {
-        public MonoLimitationAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoNotSupportedAttribute : System.MonoTODOAttribute
-    {
-        public MonoNotSupportedAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoTODOAttribute : System.Attribute
-    {
-        public MonoTODOAttribute() { }
-        public MonoTODOAttribute(string comment) { }
-        public string Comment { get { throw null; } }
-    }
-}
 namespace System.Security.Cryptography
 {
     public sealed partial class CryptographicAttributeObject
@@ -141,14 +107,28 @@ namespace System.Security.Cryptography.Pkcs
         public bool MoveNext() { throw null; }
         public void Reset() { }
     }
+    public sealed partial class CmsSigner
+    {
+        public CmsSigner() { }
+        public CmsSigner(System.Security.Cryptography.CspParameters parameters) { }
+        public CmsSigner(System.Security.Cryptography.Pkcs.SubjectIdentifierType signerIdentifierType) { }
+        public CmsSigner(System.Security.Cryptography.Pkcs.SubjectIdentifierType signerIdentifierType, System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { }
+        public CmsSigner(System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { }
+        public System.Security.Cryptography.X509Certificates.X509Certificate2 Certificate { get { throw null; } set { } }
+        public System.Security.Cryptography.X509Certificates.X509Certificate2Collection Certificates { get { throw null; } }
+        public System.Security.Cryptography.Oid DigestAlgorithm { get { throw null; } set { } }
+        public System.Security.Cryptography.X509Certificates.X509IncludeOption IncludeOption { get { throw null; } set { } }
+        public System.Security.Cryptography.AsymmetricAlgorithm PrivateKey { get { throw null; } set { } }
+        public System.Security.Cryptography.CryptographicAttributeObjectCollection SignedAttributes { get { throw null; } }
+        public System.Security.Cryptography.Pkcs.SubjectIdentifierType SignerIdentifierType { get { throw null; } set { } }
+        public System.Security.Cryptography.CryptographicAttributeObjectCollection UnsignedAttributes { get { throw null; } }
+    }
     public sealed partial class ContentInfo
     {
         public ContentInfo(byte[] content) { }
         public ContentInfo(System.Security.Cryptography.Oid contentType, byte[] content) { }
         public byte[] Content { get { throw null; } }
         public System.Security.Cryptography.Oid ContentType { get { throw null; } }
-        ~ContentInfo() { }
-        [System.MonoTODOAttribute("MS is stricter than us about the content structure")]
         public static System.Security.Cryptography.Oid GetContentType(byte[] encodedMessage) { throw null; }
     }
     public sealed partial class EnvelopedCms
@@ -164,26 +144,16 @@ namespace System.Security.Cryptography.Pkcs
         public System.Security.Cryptography.Pkcs.RecipientInfoCollection RecipientInfos { get { throw null; } }
         public System.Security.Cryptography.CryptographicAttributeObjectCollection UnprotectedAttributes { get { throw null; } }
         public int Version { get { throw null; } }
-        [System.MonoTODOAttribute]
         public void Decode(byte[] encodedMessage) { }
-        [System.MonoTODOAttribute]
         public void Decrypt() { }
-        [System.MonoTODOAttribute]
         public void Decrypt(System.Security.Cryptography.Pkcs.RecipientInfo recipientInfo) { }
-        [System.MonoTODOAttribute]
         public void Decrypt(System.Security.Cryptography.Pkcs.RecipientInfo recipientInfo, System.Security.Cryptography.X509Certificates.X509Certificate2Collection extraStore) { }
-        [System.MonoTODOAttribute]
         public void Decrypt(System.Security.Cryptography.X509Certificates.X509Certificate2Collection extraStore) { }
-        [System.MonoTODOAttribute]
         public byte[] Encode() { throw null; }
-        [System.MonoTODOAttribute]
         public void Encrypt() { }
-        [System.MonoTODOAttribute]
         public void Encrypt(System.Security.Cryptography.Pkcs.CmsRecipient recipient) { }
-        [System.MonoTODOAttribute]
         public void Encrypt(System.Security.Cryptography.Pkcs.CmsRecipientCollection recipients) { }
     }
-    [System.MonoTODOAttribute]
     public sealed partial class KeyAgreeRecipientInfo : System.Security.Cryptography.Pkcs.RecipientInfo
     {
         internal KeyAgreeRecipientInfo() { }
@@ -289,6 +259,70 @@ namespace System.Security.Cryptography.Pkcs
         KeyTransport = 1,
         Unknown = 0,
     }
+    public sealed partial class SignedCms
+    {
+        public SignedCms() { }
+        public SignedCms(System.Security.Cryptography.Pkcs.ContentInfo contentInfo) { }
+        public SignedCms(System.Security.Cryptography.Pkcs.ContentInfo contentInfo, bool detached) { }
+        public SignedCms(System.Security.Cryptography.Pkcs.SubjectIdentifierType signerIdentifierType) { }
+        public SignedCms(System.Security.Cryptography.Pkcs.SubjectIdentifierType signerIdentifierType, System.Security.Cryptography.Pkcs.ContentInfo contentInfo) { }
+        public SignedCms(System.Security.Cryptography.Pkcs.SubjectIdentifierType signerIdentifierType, System.Security.Cryptography.Pkcs.ContentInfo contentInfo, bool detached) { }
+        public System.Security.Cryptography.X509Certificates.X509Certificate2Collection Certificates { get { throw null; } }
+        public System.Security.Cryptography.Pkcs.ContentInfo ContentInfo { get { throw null; } }
+        public bool Detached { get { throw null; } }
+        public System.Security.Cryptography.Pkcs.SignerInfoCollection SignerInfos { get { throw null; } }
+        public int Version { get { throw null; } }
+        public void CheckHash() { }
+        public void CheckSignature(bool verifySignatureOnly) { }
+        public void CheckSignature(System.Security.Cryptography.X509Certificates.X509Certificate2Collection extraStore, bool verifySignatureOnly) { }
+        public void ComputeSignature() { }
+        public void ComputeSignature(System.Security.Cryptography.Pkcs.CmsSigner signer) { }
+        public void ComputeSignature(System.Security.Cryptography.Pkcs.CmsSigner signer, bool silent) { }
+        public void Decode(byte[] encodedMessage) { }
+        public byte[] Encode() { throw null; }
+        public void RemoveSignature(int index) { }
+        public void RemoveSignature(System.Security.Cryptography.Pkcs.SignerInfo signerInfo) { }
+    }
+    public sealed partial class SignerInfo
+    {
+        internal SignerInfo() { }
+        public System.Security.Cryptography.X509Certificates.X509Certificate2 Certificate { get { throw null; } }
+        public System.Security.Cryptography.Pkcs.SignerInfoCollection CounterSignerInfos { get { throw null; } }
+        public System.Security.Cryptography.Oid DigestAlgorithm { get { throw null; } }
+        public System.Security.Cryptography.Oid SignatureAlgorithm { get { throw null; } }
+        public System.Security.Cryptography.CryptographicAttributeObjectCollection SignedAttributes { get { throw null; } }
+        public System.Security.Cryptography.Pkcs.SubjectIdentifier SignerIdentifier { get { throw null; } }
+        public System.Security.Cryptography.CryptographicAttributeObjectCollection UnsignedAttributes { get { throw null; } }
+        public int Version { get { throw null; } }
+        public void CheckHash() { }
+        public void CheckSignature(bool verifySignatureOnly) { }
+        public void CheckSignature(System.Security.Cryptography.X509Certificates.X509Certificate2Collection extraStore, bool verifySignatureOnly) { }
+        public void ComputeCounterSignature() { }
+        public void ComputeCounterSignature(System.Security.Cryptography.Pkcs.CmsSigner signer) { }
+        public byte[] GetSignature() { throw null; }
+        public void RemoveCounterSignature(int index) { }
+        public void RemoveCounterSignature(System.Security.Cryptography.Pkcs.SignerInfo counterSignerInfo) { }
+    }
+    public sealed partial class SignerInfoCollection : System.Collections.ICollection, System.Collections.IEnumerable
+    {
+        internal SignerInfoCollection() { }
+        public int Count { get { throw null; } }
+        public bool IsSynchronized { get { throw null; } }
+        public System.Security.Cryptography.Pkcs.SignerInfo this[int index] { get { throw null; } }
+        public object SyncRoot { get { throw null; } }
+        public void CopyTo(System.Array array, int index) { }
+        public void CopyTo(System.Security.Cryptography.Pkcs.SignerInfo[] array, int index) { }
+        public System.Security.Cryptography.Pkcs.SignerInfoEnumerator GetEnumerator() { throw null; }
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
+    }
+    public sealed partial class SignerInfoEnumerator : System.Collections.IEnumerator
+    {
+        internal SignerInfoEnumerator() { }
+        public System.Security.Cryptography.Pkcs.SignerInfo Current { get { throw null; } }
+        object System.Collections.IEnumerator.Current { get { throw null; } }
+        public bool MoveNext() { throw null; }
+        public void Reset() { }
+    }
     public sealed partial class SubjectIdentifier
     {
         internal SubjectIdentifier() { }

external/api-snapshot/profiles/monotouch/System.cs.REMOVED.git-id

@@ -1 +1 @@
-6d22abfe2dc75d6f7256dacb8678da98e4396465
+f1f7d7c12ac0ebb5ae0ba105d8a40604bbe64b2a

external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id

@@ -1 +1 @@
-0e5ebabffda13f7e89b4933bf05bcaf7e5d7cdc3
+19b8755ba7a2fe1982e1a0181d2ff453a1afc9af

external/api-snapshot/profiles/net_4_x/Mono.Debugger.Soft.cs

@@ -65,14 +65,22 @@ namespace Mono.Debugger.Soft
         internal AssemblyMirror() { }
         public Mono.Debugger.Soft.AppDomainMirror Domain { get { throw null; } }
         public Mono.Debugger.Soft.MethodMirror EntryPoint { get { throw null; } }
+        public bool HasFetchedPdb { get { throw null; } }
+        public bool HasPdb { get { throw null; } }
+        public bool IsDynamic { get { throw null; } }
         public string Location { get { throw null; } }
         public Mono.Debugger.Soft.ModuleMirror ManifestModule { get { throw null; } }
         public Mono.Cecil.AssemblyDefinition Metadata { get { throw null; } set { } }
         public Mono.Debugger.Soft.ObjectMirror GetAssemblyObject() { throw null; }
+        public Mono.Cecil.AssemblyDefinition GetMetadata() { throw null; }
+        public byte[] GetMetadataBlob() { throw null; }
+        public Mono.Debugger.Soft.MethodMirror GetMethod(uint token) { throw null; }
         public virtual System.Reflection.AssemblyName GetName() { throw null; }
+        public byte[] GetPdbBlob() { throw null; }
         public Mono.Debugger.Soft.TypeMirror GetType(string name) { throw null; }
         public Mono.Debugger.Soft.TypeMirror GetType(string name, bool throwOnError) { throw null; }
         public Mono.Debugger.Soft.TypeMirror GetType(string name, bool throwOnError, bool ignoreCase) { throw null; }
+        public Mono.Debugger.Soft.TypeMirror GetType(uint token) { throw null; }
     }
     public partial class AssemblyUnloadEvent : Mono.Debugger.Soft.Event
     {

external/api-snapshot/profiles/net_4_x/Novell.Directory.Ldap.cs.REMOVED.git-id

@@ -1 +1 @@
-d906cc86778bcc853daa6f318fa3d840d52a5a10
+b6bab354b18204adbea1f159846b9807413b1a3d

external/api-snapshot/profiles/net_4_x/System.Core.cs.REMOVED.git-id

@@ -1 +1 @@
-bd9b258d4f490e816dcc032678ba657bef5084bb
+5bb99bc8c448a147d4fd5de3bd1798df7015810b

external/api-snapshot/profiles/net_4_x/System.Security.cs

@@ -19,41 +19,7 @@
 [assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)]
 [assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)]
 [assembly:System.Security.AllowPartiallyTrustedCallersAttribute]
-namespace System
+[assembly:System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.RequestMinimum, SkipVerification=true)]
-{
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoDocumentationNoteAttribute : System.MonoTODOAttribute
-    {
-        public MonoDocumentationNoteAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoExtensionAttribute : System.MonoTODOAttribute
-    {
-        public MonoExtensionAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoInternalNoteAttribute : System.MonoTODOAttribute
-    {
-        public MonoInternalNoteAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoLimitationAttribute : System.MonoTODOAttribute
-    {
-        public MonoLimitationAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoNotSupportedAttribute : System.MonoTODOAttribute
-    {
-        public MonoNotSupportedAttribute(string comment) { }
-    }
-    [System.AttributeUsageAttribute((System.AttributeTargets)(32767), AllowMultiple=true)]
-    internal partial class MonoTODOAttribute : System.Attribute
-    {
-        public MonoTODOAttribute() { }
-        public MonoTODOAttribute(string comment) { }
-        public string Comment { get { throw null; } }
-    }
-}
 namespace System.Security.Cryptography
 {
     public sealed partial class CryptographicAttributeObject
@@ -158,7 +124,6 @@ namespace System.Security.Cryptography.Pkcs
     public sealed partial class CmsSigner
     {
         public CmsSigner() { }
-        [System.MonoTODOAttribute]
         public CmsSigner(System.Security.Cryptography.CspParameters parameters) { }
         public CmsSigner(System.Security.Cryptography.Pkcs.SubjectIdentifierType signerIdentifierType) { }
         public CmsSigner(System.Security.Cryptography.Pkcs.SubjectIdentifierType signerIdentifierType, System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { }
@@ -167,6 +132,7 @@ namespace System.Security.Cryptography.Pkcs
         public System.Security.Cryptography.X509Certificates.X509Certificate2Collection Certificates { get { throw null; } }
         public System.Security.Cryptography.Oid DigestAlgorithm { get { throw null; } set { } }
         public System.Security.Cryptography.X509Certificates.X509IncludeOption IncludeOption { get { throw null; } set { } }
+        public System.Security.Cryptography.AsymmetricAlgorithm PrivateKey { get { throw null; } set { } }
         public System.Security.Cryptography.CryptographicAttributeObjectCollection SignedAttributes { get { throw null; } }
         public System.Security.Cryptography.Pkcs.SubjectIdentifierType SignerIdentifierType { get { throw null; } set { } }
         public System.Security.Cryptography.CryptographicAttributeObjectCollection UnsignedAttributes { get { throw null; } }
@@ -177,8 +143,6 @@ namespace System.Security.Cryptography.Pkcs
         public ContentInfo(System.Security.Cryptography.Oid contentType, byte[] content) { }
         public byte[] Content { get { throw null; } }
         public System.Security.Cryptography.Oid ContentType { get { throw null; } }
-        ~ContentInfo() { }
-        [System.MonoTODOAttribute("MS is stricter than us about the content structure")]
         public static System.Security.Cryptography.Oid GetContentType(byte[] encodedMessage) { throw null; }
     }
     public sealed partial class EnvelopedCms
@@ -194,23 +158,14 @@ namespace System.Security.Cryptography.Pkcs
         public System.Security.Cryptography.Pkcs.RecipientInfoCollection RecipientInfos { get { throw null; } }
         public System.Security.Cryptography.CryptographicAttributeObjectCollection UnprotectedAttributes { get { throw null; } }
         public int Version { get { throw null; } }
-        [System.MonoTODOAttribute]
         public void Decode(byte[] encodedMessage) { }
-        [System.MonoTODOAttribute]
         public void Decrypt() { }
-        [System.MonoTODOAttribute]
         public void Decrypt(System.Security.Cryptography.Pkcs.RecipientInfo recipientInfo) { }
-        [System.MonoTODOAttribute]
         public void Decrypt(System.Security.Cryptography.Pkcs.RecipientInfo recipientInfo, System.Security.Cryptography.X509Certificates.X509Certificate2Collection extraStore) { }
-        [System.MonoTODOAttribute]
         public void Decrypt(System.Security.Cryptography.X509Certificates.X509Certificate2Collection extraStore) { }
-        [System.MonoTODOAttribute]
         public byte[] Encode() { throw null; }
-        [System.MonoTODOAttribute]
         public void Encrypt() { }
-        [System.MonoTODOAttribute]
         public void Encrypt(System.Security.Cryptography.Pkcs.CmsRecipient recipient) { }
-        [System.MonoTODOAttribute]
         public void Encrypt(System.Security.Cryptography.Pkcs.CmsRecipientCollection recipients) { }
     }
     public enum KeyAgreeKeyChoice
@@ -219,7 +174,6 @@ namespace System.Security.Cryptography.Pkcs
         StaticKey = 2,
         Unknown = 0,
     }
-    [System.MonoTODOAttribute]
     public sealed partial class KeyAgreeRecipientInfo : System.Security.Cryptography.Pkcs.RecipientInfo
     {
         internal KeyAgreeRecipientInfo() { }
@@ -338,25 +292,15 @@ namespace System.Security.Cryptography.Pkcs
         public bool Detached { get { throw null; } }
         public System.Security.Cryptography.Pkcs.SignerInfoCollection SignerInfos { get { throw null; } }
         public int Version { get { throw null; } }
-        [System.MonoTODOAttribute]
         public void CheckHash() { }
-        [System.MonoTODOAttribute]
         public void CheckSignature(bool verifySignatureOnly) { }
-        [System.MonoTODOAttribute]
         public void CheckSignature(System.Security.Cryptography.X509Certificates.X509Certificate2Collection extraStore, bool verifySignatureOnly) { }
-        [System.MonoTODOAttribute]
         public void ComputeSignature() { }
-        [System.MonoTODOAttribute]
         public void ComputeSignature(System.Security.Cryptography.Pkcs.CmsSigner signer) { }
-        [System.MonoTODOAttribute]
         public void ComputeSignature(System.Security.Cryptography.Pkcs.CmsSigner signer, bool silent) { }
-        [System.MonoTODOAttribute("incomplete - missing attributes")]
         public void Decode(byte[] encodedMessage) { }
-        [System.MonoTODOAttribute]
         public byte[] Encode() { throw null; }
-        [System.MonoTODOAttribute]
         public void RemoveSignature(int index) { }
-        [System.MonoTODOAttribute]
         public void RemoveSignature(System.Security.Cryptography.Pkcs.SignerInfo signerInfo) { }
     }
     public sealed partial class SignerInfo
@@ -365,23 +309,18 @@ namespace System.Security.Cryptography.Pkcs
         public System.Security.Cryptography.X509Certificates.X509Certificate2 Certificate { get { throw null; } }
         public System.Security.Cryptography.Pkcs.SignerInfoCollection CounterSignerInfos { get { throw null; } }
         public System.Security.Cryptography.Oid DigestAlgorithm { get { throw null; } }
+        public System.Security.Cryptography.Oid SignatureAlgorithm { get { throw null; } }
         public System.Security.Cryptography.CryptographicAttributeObjectCollection SignedAttributes { get { throw null; } }
         public System.Security.Cryptography.Pkcs.SubjectIdentifier SignerIdentifier { get { throw null; } }
         public System.Security.Cryptography.CryptographicAttributeObjectCollection UnsignedAttributes { get { throw null; } }
         public int Version { get { throw null; } }
-        [System.MonoTODOAttribute]
         public void CheckHash() { }
-        [System.MonoTODOAttribute]
         public void CheckSignature(bool verifySignatureOnly) { }
-        [System.MonoTODOAttribute]
         public void CheckSignature(System.Security.Cryptography.X509Certificates.X509Certificate2Collection extraStore, bool verifySignatureOnly) { }
-        [System.MonoTODOAttribute]
         public void ComputeCounterSignature() { }
-        [System.MonoTODOAttribute]
         public void ComputeCounterSignature(System.Security.Cryptography.Pkcs.CmsSigner signer) { }
-        [System.MonoTODOAttribute]
+        public byte[] GetSignature() { throw null; }
         public void RemoveCounterSignature(int index) { }
-        [System.MonoTODOAttribute]
         public void RemoveCounterSignature(System.Security.Cryptography.Pkcs.SignerInfo counterSignerInfo) { }
     }
     public sealed partial class SignerInfoCollection : System.Collections.ICollection, System.Collections.IEnumerable

external/api-snapshot/profiles/net_4_x/System.ServiceModel.cs.REMOVED.git-id

@@ -1 +1 @@
-8995d01e1ab9782fe94c11ccbcc28faec0f9899c
+a1df3f83332859870e1cf4a20ceeeed89728c785

external/api-snapshot/profiles/net_4_x/System.cs.REMOVED.git-id

@@ -1 +1 @@
-0e31ba5d23e56d9bf294bc2cb75621d58d6ee1ab
+47154482003e653af7b9a47e14d653dd2a666e8d

external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id

@@ -1 +1 @@
-9bca9460d6b9cd74dd3d146987c845648fdb7094
+9ed54522b05ffd99addb3901008357209a338572

external/binary-reference-assemblies/build/monodroid/Makefile

@@ -5,7 +5,7 @@ CSC ?= csc
 CSC_COMMON_ARGS := -nologo -noconfig -optimize -nostdlib -unsafe -deterministic -publicsign -debug- -target:library -nowarn:612,618,809
 Q_CSC = $(if $(V),,@echo "CSC   [$(PROFILE)] $(1)";)
 
-ASSEMBLIES := mscorlib System System.Xml System.Numerics System.Core System.Net.Http
+ASSEMBLIES := mscorlib System System.Xml System.Numerics System.Core System.Net.Http Mono.Android
 
 ASSEMBLIES += bare/System bare/System.Xml
 
@@ -13,6 +13,7 @@ ASSEMBLIES += bare/System bare/System.Xml
 # for i in *.dll; do ikdasm --assemblyref $i | grep Name= | sed 's/.*Name=//g' | sed -e $'s/$/\\\n/g' | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/ /g' -e "s/^/${i%.*}_REFS := /"; done
 System.Core_REFS := mscorlib System
 System.Net.Http_REFS := mscorlib System
+Mono.Android_REFS := mscorlib
 System.Numerics_REFS := mscorlib
 System_REFS := mscorlib bare/System.Xml
 System.Xml_REFS := mscorlib System
@@ -21,13 +22,16 @@ bare/System_REFS := mscorlib
 bare/System.Xml_REFS := mscorlib bare/System
 
 mscorlib_CSC_ARGS := -runtimemetadataversion:v4.0.30319
-System_CSC_ARGS := ../../src/Mono/System.extra.cs
+System_CSC_ARGS := ../../src/mono/System.extra.cs
 
 ECMA_KEY := ../../../../../mono/mcs/class/ecma.pub         # Public Key Token: b77a5c561934e089
 
 ECMA_KEY_ASSEMBLIES := System.Core System.Net.Http System.Numerics System.Xml System mscorlib \
 	bare/System bare/System.Xml
 
+# Mono.Android must be signed with a different key (copied from xamarin-android repository)
+Mono.Android_KEYFILE := xa.pub
+
 all: $(addsuffix .dll, $(ASSEMBLIES))
 
 clean:

external/binary-reference-assemblies/build/monodroid/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-9e6dab74bb4e7f114920f63c92ca9c8882a98bc9
+d4c864e8ae659a282caa4d63b8ccae891c8fa9a6

external/binary-reference-assemblies/build/monotouch/Makefile

@@ -21,7 +21,7 @@ bare/System_REFS := mscorlib
 bare/System.Xml_REFS := mscorlib bare/System
 
 mscorlib_CSC_ARGS := -runtimemetadataversion:v4.0.30319
-System_CSC_ARGS := ../../src/Mono/System.extra.cs
+System_CSC_ARGS := ../../src/mono/System.extra.cs
 
 ECMA_KEY := ../../../../../mono/mcs/class/ecma.pub         # Public Key Token: b77a5c561934e089
 

external/binary-reference-assemblies/build/monotouch/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-017028776b0688971391ac5e1e75f5b90cbc3d6b
+704d3e02dbd43691d785ec24bee712fe05eaec9f

external/binary-reference-assemblies/src/monodroid/Mono.Android.cs

@@ -0,0 +1,34 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+[assembly:System.Runtime.CompilerServices.ReferenceAssemblyAttribute]
+[assembly:System.Reflection.AssemblyVersionAttribute("0.0.0.0")]
+[assembly:System.CLSCompliantAttribute(true)]
+[assembly:System.Diagnostics.DebuggableAttribute((System.Diagnostics.DebuggableAttribute.DebuggingModes)(2))]
+[assembly:System.Reflection.AssemblyCompanyAttribute("Mono development team")]
+[assembly:System.Reflection.AssemblyCopyrightAttribute("(c) Various Mono authors")]
+[assembly:System.Reflection.AssemblyDefaultAliasAttribute("Mono.Android.dll")]
+[assembly:System.Reflection.AssemblyDescriptionAttribute("Mono.Android.dll")]
+[assembly:System.Reflection.AssemblyFileVersionAttribute("0.0.0.0")]
+[assembly:System.Reflection.AssemblyInformationalVersionAttribute("0.0.0.0")]
+[assembly:System.Reflection.AssemblyProductAttribute("Mono Common Language Infrastructure")]
+[assembly:System.Reflection.AssemblyTitleAttribute("Mono.Android.dll")]
+[assembly:System.Resources.NeutralResourcesLanguageAttribute("en-US")]
+[assembly:System.Resources.SatelliteContractVersionAttribute("0.0.0.0")]
+[assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute(8)]
+[assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)]
+[assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)]
+[assembly:System.Security.SecurityCriticalAttribute]
+[assembly:System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.RequestMinimum, SkipVerification=true)]
+namespace System.Drawing
+{
+    public struct Color {}
+    public enum KnownColor {}
+    public struct Point {}
+    public struct PointF {}
+    public struct Rectangle {}
+    public struct RectangleF {}
+    public struct Size {}
+    public struct SizeF {}
+}

external/binary-reference-assemblies/src/monodroid/System.Core.cs.REMOVED.git-id

@@ -1 +1 @@
-1677ef1e7504f41839769cf611c93149e1d4800f
+68a6c7b04a1ce236a21c3f5a02452eebd9f167b7

external/binary-reference-assemblies/src/monotouch/System.Core.cs.REMOVED.git-id

@@ -1 +1 @@
-7beebcc3cdb0bf41205daab75b21a8a91b5f1c0d
+39ff3fef0094d063b39ccb13d163f80cf5532e89

external/binary-reference-assemblies/v4.7.1/Makefile

@@ -258,7 +258,7 @@ Facades/System.Xml.XmlSerializer_REFS := mscorlib System.Xml
 Facades/netstandard_REFS := mscorlib System System.Core System.Data System.Diagnostics.Tracing System.Drawing System.IO.Compression System.IO.Compression.FileSystem System.ComponentModel.Composition System.Net.Http System.Numerics System.Runtime.Serialization System.Transactions System.Web System.Xml System.Xml.Linq
 
 mscorlib_CSC_ARGS := -runtimemetadataversion:v4.0.30319
-System_CSC_ARGS := -d:CONFIG_DEP -d:XML_DEP ../src/Mono/System.extra.cs
+System_CSC_ARGS := -d:CONFIG_DEP -d:XML_DEP ../src/mono/System.extra.cs
 System.Configuration_CSC_ARGS := -d:CONFIG_DEP
 System.Xml_CSC_ARGS := -d:CONFIG_DEP
 System.ServiceModel.Activation_CSC_ARGS := -d:SERVICEMODEL_DEP -d:WEB_DEP

external/bockbuild/bb

@@ -207,6 +207,9 @@ class Bockbuild:
             elif not os.path.exists(package.build_artifact):
                 package.request_build('No artifact')
 
+            elif is_expired(package.build_artifact, config.artifact_lifespan_days):
+                package.request_build('Artifact expired (older than %d days)' % config.artifact_lifespan_days)
+
             elif is_changed(package.buildstring, package.buildstring_file):
                 package.request_build('Updated')
 

external/bockbuild/bockbuild.py

@@ -207,6 +207,9 @@ class Bockbuild:
             elif not os.path.exists(package.build_artifact):
                 package.request_build('No artifact')
 
+            elif is_expired(package.build_artifact, config.artifact_lifespan_days):
+                package.request_build('Artifact expired (older than %d days)' % config.artifact_lifespan_days)
+
             elif is_changed(package.buildstring, package.buildstring_file):
                 package.request_build('Updated')
 

external/bockbuild/bockbuild/darwinprofile.py

@@ -122,11 +122,11 @@ class DarwinProfile (UnixProfile):
             self.gcc_flags.extend(['-O0', '-ggdb3'])
 
         if os.getenv('BOCKBUILD_USE_CCACHE') is None:
-            self.env.set('CC',  'xcrun gcc')
+            self.env.set('CC',  'xcrun clang')
-            self.env.set('CXX', 'xcrun g++')
+            self.env.set('CXX', 'xcrun clang++')
         else:
-            self.env.set('CC',  'ccache xcrun gcc')
+            self.env.set('CC',  'ccache xcrun clang')
-            self.env.set('CXX', 'ccache xcrun g++')
+            self.env.set('CXX', 'ccache xcrun clang++')
 
         if self.bockbuild.cmd_options.arch == 'default':
             self.bockbuild.cmd_options.arch = 'darwin-32'
@@ -139,7 +139,7 @@ class DarwinProfile (UnixProfile):
             package.local_ld_flags = ['-arch i386', '-m32']
             package.local_gcc_flags = ['-arch i386', '-m32']
             package.local_configure_flags = [
-                '--build=i386-apple-darwin11.2.0', '--disable-dependency-tracking']
+                '--build=i386-apple-darwin13.0.0', '--disable-dependency-tracking']
         elif arch == 'darwin-64':
             package.local_ld_flags = ['-arch x86_64 -m64']
             package.local_gcc_flags = ['-arch x86_64 -m64']

external/bockbuild/bockbuild/util/util.py

@@ -11,6 +11,7 @@ import shutil
 import tarfile
 import hashlib
 import stat
+from datetime import datetime,timedelta
 import functools
 
 # from
@@ -44,6 +45,7 @@ class config:
     absolute_root = None # there is no file resolution beneath this path. Displayed paths are shortened by omitting this segment.
     state_root = None
     exit_code = exit_codes.NOTSET
+    artifact_lifespan_days = 7
 
 class CommandException (Exception):  # shell command failure
 
@@ -298,6 +300,9 @@ def is_changed(new, file, show_diff=True):
     else:
         return False
 
+def is_expired (path, age_cutoff_days):
+    artifact_age_days = (datetime.utcnow() - datetime.utcfromtimestamp(os.path.getmtime(path))).days
+    return artifact_age_days > age_cutoff_days
 
 def get_filetype(path):
     # the env variables are to work around a issue with OS X and 'file':

external/bockbuild/packages/autoconf.py

@@ -18,7 +18,7 @@ class Autoconf (GnuPackage):
         elif arch == 'darwin-32':
             self.local_ld_flags = ['-arch i386', '-m32']
             self.local_gcc_flags = ['-arch i386', '-m32']
-            self.local_configure_flags = ['--build=i386-apple-darwin11.2.0']
+            self.local_configure_flags = ['--build=i386-apple-darwin13.0.0']
         elif arch == 'darwin-64':
             self.local_ld_flags = ['-arch x86_64 -m64']
             self.local_gcc_flags = ['-arch x86_64 -m64']

external/bockbuild/packages/automake.py

@@ -13,7 +13,7 @@ class Automake (GnuPackage):
         elif arch == 'darwin-32':
             self.local_ld_flags = ['-arch i386', '-m32']
             self.local_gcc_flags = ['-arch i386', '-m32']
-            self.local_configure_flags = ['--build=i386-apple-darwin11.2.0']
+            self.local_configure_flags = ['--build=i386-apple-darwin13.0.0']
         elif arch == 'darwin-64':
             self.local_ld_flags = ['-arch x86_64 -m64']
             self.local_gcc_flags = ['-arch x86_64 -m64']

external/bockbuild/packages/patches/gtk/gtk-fix-find_nsview_at_pos-recursive.patch

@@ -1,13 +1,34 @@
 diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
-index 195899b13b..844128e0b2 100644
+index 195899b13b..67e3f8ee17 100644
 --- a/gdk/quartz/gdkevents-quartz.c
 +++ b/gdk/quartz/gdkevents-quartz.c
-@@ -748,7 +748,7 @@ find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y)
+@@ -729,7 +729,7 @@ _gdk_quartz_events_send_map_event (GdkWindow *window)
+ }
+ 
+ static NSView *
+-find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y)
++find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y, bool dont_recurse)
+ {
+   NSView *view = impl->view;
+   guint n_subviews;
+@@ -748,7 +748,10 @@ find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y)
        if (r.origin.x <= x && r.origin.x + r.size.width >= x &&
            r.origin.y <= y && r.origin.y + r.size.height >= y)
          {
 -          NSView* child = find_nsview_at_pos (impl, x - r.origin.x, y - r.origin.y);
-+          NSView* child = find_nsview_at_pos (sv, x - r.origin.x, y - r.origin.y);
++          if (dont_recurse)
++            return sv;
++
++          NSView* child = find_nsview_at_pos (impl, x - r.origin.x, y - r.origin.y, TRUE);
            if (child != NULL)
              return child;
            else
+@@ -932,7 +935,7 @@ find_window_for_ns_event (NSEvent *nsevent,
+                 toplevel_private = (GdkWindowObject *)toplevel;
+                 toplevel_impl = (GdkWindowImplQuartz *)toplevel_private->impl;
+ 
+-                subview = find_nsview_at_pos (toplevel_impl, *x, *y);
++                subview = find_nsview_at_pos (toplevel_impl, *x, *y, FALSE);
+                 if (subview != NULL && ![subview isKindOfClass:[GdkQuartzView class]]) {
+                   g_signal_emit_by_name (toplevel, "native-child-event",
+                                          subview, nsevent);

external/boringssl/CMakeLists.txt

@@ -27,7 +27,12 @@ endif()
 #endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  set(C_CXX_FLAGS "-Wall -Wformat=2 -Wsign-compare -Wmissing-field-initializers -ggdb -fvisibility=hidden")
+  if(${CMAKE_SYSTEM_NAME} MATCHES "AIX" OR ${CMAKE_SYSTEM_NAME} MATCHES "OS400")
+    # XCOFF doesn't support -fvisibility=hidden, and we would prefer XCOFF debugging info.
+    set(C_CXX_FLAGS "-Wall -Wformat=2 -Wsign-compare -Wmissing-field-initializers -gxcoff")
+  else()
+    set(C_CXX_FLAGS "-Wall -Wformat=2 -Wsign-compare -Wmissing-field-initializers -ggdb -fvisibility=hidden")
+  endif()
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_CXX_FLAGS}")
   if(ANDROID)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x ${C_CXX_FLAGS}")

external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.BCryptGenRandom.GetRandomBytes.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.InteropServices;
 
 internal partial class Interop

external/corefx/src/Common/src/CoreLib/Interop/Windows/BCrypt/Interop.BCryptGenRandom.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.InteropServices;
 
 internal partial class Interop

external/corefx/src/Common/src/CoreLib/System/ArraySegment.cs

@@ -16,7 +16,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 
 namespace System
 {

external/corefx/src/Common/src/CoreLib/System/Buffers/Text/FormattingHelpers.CountDigits.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.CompilerServices;
 
 namespace System.Buffers.Text

external/corefx/src/Common/src/CoreLib/System/Buffers/Utilities.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.Private;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
 namespace System.Buffers

external/corefx/src/Common/src/CoreLib/System/Char.cs

@@ -13,7 +13,6 @@
 ===========================================================*/
 
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Globalization;
 using System.Runtime.InteropServices;
 

external/corefx/src/Common/src/CoreLib/System/Collections/Generic/List.cs

@@ -4,7 +4,6 @@
 
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.CompilerServices;
 using System.Threading;
 

external/corefx/src/Common/src/CoreLib/System/Collections/Generic/ValueListBuilder.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Buffers;
-using System.Diagnostics.Private;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
 namespace System.Collections.Generic

external/corefx/src/Common/src/CoreLib/System/Collections/HashHelpers.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.Private;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
 using System.Threading;

external/corefx/src/Common/src/CoreLib/System/Convert.Base64.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Internal.Runtime.CompilerServices;

external/corefx/src/Common/src/CoreLib/System/Convert.cs

@@ -11,7 +11,6 @@ using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Security;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 
 namespace System
 {

external/corefx/src/Common/src/CoreLib/System/Globalization/CharUnicodeInfo.cs

@@ -13,7 +13,6 @@
 ////////////////////////////////////////////////////////////////////////////
 
 using System.Diagnostics;
-using System.Diagnostics.Private;
 
 namespace System.Globalization
 {

external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.Invariant.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.Private;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 namespace System.Globalization

external/corefx/src/Common/src/CoreLib/System/Globalization/CompareInfo.cs

@@ -13,7 +13,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 using System.Reflection;
-using System.Diagnostics.Private;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Buffers;

external/corefx/src/Common/src/CoreLib/System/Globalization/DateTimeParse.cs.REMOVED.git-id

@@ -1 +1 @@
-acebfa84959b21d0d61454b995ae04fdc33b3bcd
+970d1765bb32a4d94bf196a4494ce22b095e4f1c

external/corefx/src/Common/src/CoreLib/System/Globalization/TimeSpanFormat.cs

@@ -4,7 +4,6 @@
 
 using System.Text;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.InteropServices;
 
 namespace System.Globalization

external/corefx/src/Common/src/CoreLib/System/Globalization/TimeSpanParse.cs

@@ -49,7 +49,6 @@
 ////////////////////////////////////////////////////////////////////////////
 
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Text;
 
 namespace System.Globalization

external/corefx/src/Common/src/CoreLib/System/Guid.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

external/corefx/src/Common/src/CoreLib/System/Lazy.cs

@@ -13,7 +13,6 @@
 #pragma warning disable 0420
 
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.ExceptionServices;
 using System.Runtime.InteropServices;
 using System.Threading;

external/corefx/src/Common/src/CoreLib/System/Marvin.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.Private;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Internal.Runtime.CompilerServices;

external/corefx/src/Common/src/CoreLib/System/Memory.cs

@@ -4,7 +4,6 @@
 
 using System.Buffers;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 #if !MONO

external/corefx/src/Common/src/CoreLib/System/MemoryExtensions.Fast.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.Private;
+using System.Diagnostics;
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

external/corefx/src/Common/src/CoreLib/System/Number.Formatting.cs

@@ -4,7 +4,6 @@
 
 using System.Buffers.Text;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

external/corefx/src/Common/src/CoreLib/System/Number.Parsing.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Globalization;
 using System.Runtime.InteropServices;
 

external/corefx/src/Common/src/CoreLib/System/ParseNumbers.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.CompilerServices;
 
 namespace System

external/corefx/src/Common/src/CoreLib/System/Progress.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Threading;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 
 namespace System
 {

external/corefx/src/Common/src/CoreLib/System/ReadOnlyMemory.cs

@@ -4,7 +4,6 @@
 
 using System.Buffers;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 #if !MONO

external/corefx/src/Common/src/CoreLib/System/ReadOnlySpan.Fast.cs

@@ -6,7 +6,6 @@
 using System.ComponentModel;
 #endif
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.CompilerServices;
 using System.Runtime.Versioning;
 using Internal.Runtime.CompilerServices;

external/corefx/src/Common/src/CoreLib/System/Reflection/CustomAttributeFormatException.cs

@@ -7,7 +7,9 @@ using System.Runtime.Serialization;
 namespace System.Reflection
 {
     [Serializable]
+#if !MONO
     [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
+#endif
     public class CustomAttributeFormatException : FormatException
     {
         public CustomAttributeFormatException()

external/corefx/src/Common/src/CoreLib/System/Reflection/MemberInfo.cs

@@ -6,6 +6,9 @@ using System.Collections.Generic;
 
 namespace System.Reflection
 {
+#if MONO
+    [Serializable]
+#endif
     public abstract partial class MemberInfo : ICustomAttributeProvider
     {
         protected MemberInfo() { }

external/corefx/src/Common/src/CoreLib/System/Resources/RuntimeResourceSet.cs

@@ -21,7 +21,6 @@ using System.Globalization;
 using System.Reflection;
 using System.Runtime.Versioning;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 
 namespace System.Resources
 {

external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/ConfiguredValueTaskAwaitable.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Sources;

external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/ValueTaskAwaiter.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Sources;
 

external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MemoryMarshal.cs

@@ -5,7 +5,7 @@
 using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Collections.Generic;
-using System.Diagnostics.Private;
+using System.Diagnostics;
 
 #if !netstandard
 using Internal.Runtime.CompilerServices;

external/corefx/src/Common/src/CoreLib/System/Runtime/Serialization/SerializationInfoEnumerator.cs

@@ -4,7 +4,6 @@
 
 using System.Collections;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 
 namespace System.Runtime.Serialization
 {

external/corefx/src/Common/src/CoreLib/System/Span.Fast.cs

@@ -6,7 +6,6 @@
 using System.ComponentModel;
 #endif
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.CompilerServices;
 using System.Runtime.Versioning;
 using Internal.Runtime.CompilerServices;

external/corefx/src/Common/src/CoreLib/System/SpanHelpers.Byte.cs

@@ -4,7 +4,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.Private;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
 #if !netstandard

external/corefx/src/Common/src/CoreLib/System/SpanHelpers.Char.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.Private;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
 #if !netstandard

external/corefx/src/Common/src/CoreLib/System/SpanHelpers.T.cs

@@ -13,10 +13,6 @@ using Internal.Runtime.CompilerServices;
 using System.Numerics;
 #endif
 
-#if MONO
-using System.Diagnostics.Private;
-#endif
-
 namespace System
 {
     internal static partial class SpanHelpers

external/corefx/src/Common/src/CoreLib/System/SpanHelpers.cs

@@ -9,7 +9,6 @@ using System.Runtime.InteropServices;
 
 #if MONO
 using System.Runtime.CompilerServices;
-using System.Diagnostics.Private;
 #else
 using Internal.Runtime.CompilerServices;
 #endif

external/corefx/src/Common/src/CoreLib/System/String.Comparison.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.Private;
+using System.Diagnostics;
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

external/corefx/src/Common/src/CoreLib/System/String.Manipulation.cs

@@ -4,7 +4,7 @@
 
 using System.Buffers;
 using System.Collections.Generic;
-using System.Diagnostics.Private;
+using System.Diagnostics;
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

external/corefx/src/Common/src/CoreLib/System/String.cs

@@ -6,7 +6,6 @@ using System.Buffers;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

external/corefx/src/Common/src/CoreLib/System/Text/ASCIIEncoding.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Diagnostics.Private;
 using System.Runtime.InteropServices;
 
 namespace System.Text