Merge branch 'upstream'

Former-commit-id: 60e507b1aee855b697fac45e0e367e8a751689be

LICENSE

@@ -46,7 +46,7 @@ embeddable runtime:
 
 * mono/utils/bsearch.c: BSD license.
 
-* mono/io-layer/wapi_glob.h, wapi_glob.c: BSD license
+* mono/metadata/w32file-unix-glob.c, w32file-unix-glob.h: BSD license
 
 Class Library code
 ==================

Makefile.am

@@ -11,9 +11,15 @@ else
 tools_dir = tools
 endif
 
-SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
+if BUILD_SUPPORT
+support_dir = support
+else
+support_dir =
+endif
+
+SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) $(support_dir) data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
 # Keep in sync with SUBDIRS
-DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
+DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native $(support_dir) data runtime scripts man samples tools msvc docs acceptance-tests llvm
 
 all: update_submodules
 

Makefile.in

@@ -444,9 +444,11 @@ MONOTOUCH_SUBDIRS = $(libgc_dir) mono
 
 # Some tools might not build when cross-compiling
 @CROSS_COMPILING_TRUE@tools_dir = 
-SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
+@BUILD_SUPPORT_FALSE@support_dir = 
+@BUILD_SUPPORT_TRUE@support_dir = support
+SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) $(support_dir) data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
 # Keep in sync with SUBDIRS
-DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
+DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native $(support_dir) data runtime scripts man samples tools msvc docs acceptance-tests llvm
 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 		\

README.md

@@ -308,16 +308,6 @@ should be used.
 
  * Or you can specify a path to a libgdiplus.
 
-* `--disable-shared-memory`
-
-  * Use this option to disable the use of shared memory in
-Mono (this is equivalent to setting the MONO_DISABLE_SHM
-environment variable, although this removes the feature
-completely).
-
-  * Disabling the shared memory support will disable certain
-features like cross-process named mutexes.
-
 * `--enable-minimal=LIST`
 
   * Use this feature to specify optional runtime

acceptance-tests/Makefile.am

@@ -14,6 +14,7 @@ RUNTIME = MONO_PATH=$(CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug
 TOOLS_RUNTIME = MONO_PATH=$(TOOLS_CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug
 MCS = $(TOOLS_RUNTIME) $(CSC) -nologo -noconfig -lib:$(CLASS) -r:System.dll -r:System.Core.dll -r:System.Xml.dll -r:Microsoft.CSharp.dll
 ILASM = $(TOOLS_RUNTIME) $(TOOLS_CLASS)/ilasm.exe
+XUNIT = $(RUNTIME) $(abs_top_builddir)/external/xunit-binaries/xunit.console.exe
 
 include versions.mk
 include profiler-stress.mk

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

@@ -1 +1 @@
-fa3deb0e32592c4b1df3beb35a88ba20c203d4a3
+1f1cceb22b20c4572e28fe691242ed1310de17b6

acceptance-tests/SUBMODULES.json

@@ -1,16 +1,16 @@
 [
   {
     "name": "roslyn", 
-    "url": "git://github.com/dotnet/roslyn.git", 
+    "url": "git://github.com/mono/roslyn.git",
-    "rev": "322bd5b2bbf07df6a67de35cbcb2365484412f70", 
+    "rev": "1d9895045041925490038c5df0d8f947d8dcbd7f",
-    "remote-branch": "origin/master", 
+    "remote-branch": "origin/mono-testing",
-    "branch": "master", 
+    "branch": "mono-testing",
     "directory": "roslyn"
   }, 
   {
     "name": "coreclr", 
     "url": "git://github.com/mono/coreclr.git", 
-    "rev": "d0e6a36f782f5ee1ca0b7d3ec0c55725c3571b1f", 
+    "rev": "83d8279997d8ce4ad344ff9b937b2d13d074dcaa", 
     "remote-branch": "origin/mono", 
     "branch": "mono", 
     "directory": "coreclr"
@@ -18,7 +18,7 @@
   {
     "name": "ms-test-suite", 
     "url": "git@github.com:xamarin/ms-test-suite.git", 
-    "rev": "25f495326e141163d59e52ef499227a2f38fe036", 
+    "rev": "67f29dfc0741b5311dd746c75760963a2915e648", 
     "remote-branch": "origin/master", 
     "branch": "master", 
     "directory": "ms-test-suite"

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

@@ -1 +1 @@
-6fc6a28236467657b04c41902a5452ebf4d475c2
+4cc234e1abb16add35f675272bf36aa78fb4f1b9

acceptance-tests/roslyn.mk

@@ -1,18 +1,5 @@
 check-roslyn:
 	@$(MAKE) validate-roslyn RESET_VERSIONS=1
-	@if [ -z $$PREFIX ]; then echo "You need to set PREFIX to the prefix of the Mono installation that should be used for testing Roslyn." && exit 1; fi
-	sed -i -e 's/\\4.5-api"/\\4.5"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \
-	export MSBuildExtensionsPath=$$PREFIX/lib/mono/xbuild; \
-	MONO_DOTNET_PORTABLE_DIR=$$PREFIX/lib/mono/xbuild-frameworks/.NETPortable/; \
-	if [ ! -d "$$MONO_DOTNET_PORTABLE_DIR/v4.6" ]; then \
-		mkdir -p $$MONO_DOTNET_PORTABLE_DIR; \
-		curl -SL "http://download.mono-project.com/third-party/RoslynBuildDependencies.zip" > /tmp/RoslynBuildDependencies.zip; \
-		unzip -o /tmp/RoslynBuildDependencies.zip -d /tmp/RoslynBuildDependencies; \
-		cp -r /tmp/RoslynBuildDependencies/PortableReferenceAssemblies/* $$MONO_DOTNET_PORTABLE_DIR; \
-	fi; \
 	cd $(ROSLYN_PATH); \
-	sed -i -e 'N; s/bootstrapArg=".*\n.*"/bootstrapArg=""/g' cibuild.sh; \
+	./mono-testing.sh "$(XUNIT)" || exit; \
-	sed -i -e 's#-xml Binaries/\$$BUILD_CONFIGURATION/xUnitResults/#-nunit $(abs_top_builddir)/acceptance-tests/TestResult-#g' cibuild.sh; \
+	echo "done"
-	./cibuild.sh --mono-path $$PREFIX/bin || EXIT_CODE=1; \
-	sed -i -e 's/\\4.5"/\\4.5-api"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \
-	exit $$EXIT_CODE

config.h.in

@@ -42,7 +42,11 @@
 /* Icall tables disabled */
 #undef DISABLE_ICALL_TABLES
 
-/* Disable the JIT, only full-aot mode will be supported by the runtime. */
+/* Disable the interpreter. */
+#undef DISABLE_INTERPRETER
+
+/* Disable the JIT, only full-aot mode or interpreter will be supported by the
+   runtime. */
 #undef DISABLE_JIT
 
 /* Disable support for huge assemblies */
@@ -142,9 +146,6 @@
 /* Icall symbol map enabled */
 #undef ENABLE_ICALL_SYMBOL_MAP
 
-/* Enable Interpreter */
-#undef ENABLE_INTERPRETER
-
 /* Enable the LLVM back end */
 #undef ENABLE_LLVM
 
@@ -355,6 +356,9 @@
 /* Define to 1 if you have the `getdomainname' function. */
 #undef HAVE_GETDOMAINNAME
 
+/* Define to 1 if you have the `getentropy' function. */
+#undef HAVE_GETENTROPY
+
 /* Define to 1 if you have the `getfsstat' function. */
 #undef HAVE_GETFSSTAT
 
@@ -406,6 +410,9 @@
 /* Define to 1 if you have the `getpwuid_r' function. */
 #undef HAVE_GETPWUID_R
 
+/* Define to 1 if you have the `getrandom' function. */
+#undef HAVE_GETRANDOM
+
 /* Define to 1 if you have the `getresuid' function. */
 #undef HAVE_GETRESUID
 
@@ -917,6 +924,9 @@
 /* Define to 1 if you have the <sys/prctl.h> header file. */
 #undef HAVE_SYS_PRCTL_H
 
+/* Define to 1 if you have the <sys/random.h> header file. */
+#undef HAVE_SYS_RANDOM_H
+
 /* Define to 1 if you have the <sys/resource.h> header file. */
 #undef HAVE_SYS_RESOURCE_H
 

configure.REMOVED.git-id

@@ -1 +1 @@
-3f09b601878b3b0733df5bf60b63d9f073a2ddd9
+d13f7ea6116e119ab479d11eb1c2998854e15762

configure.ac.REMOVED.git-id

@@ -1 +1 @@
-5c436fa207f4194311d1484a2af27b92af78515a
+c88fcfe91d4abdcba2e28a486d695c94df35b127

data/lldb/monobt.py

@@ -11,9 +11,9 @@ def print_frames(thread, num_frames, current_thread):
         pc = str(frame.addr)
         var = frame
         function_name = frame.GetFunctionName()
-        if function_name == "ves_exec_method_with_context":
+        if function_name == "interp_exec_method_full":
             try:
-                s = 'frame->runtime_method->method'
+                s = 'frame->imethod->method'
                 klassname = frame.EvaluateExpression('(char*) ' + s + '->klass->name').summary[1:-1]
                 methodname = frame.EvaluateExpression('(char*) ' + s + '->name').summary[1:-1]
 

data/net_4_5/machine.config

@@ -11,11 +11,11 @@
 		<section name="assemblyBinding"  type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
 		<section name="satelliteassemblies" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
 		<section name="startup" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false"/>
-		<section name="system.codedom" type="System.CodeDom.Compiler.CodeDomConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 		<section name="system.data" type="System.Data.Common.DbProviderFactoriesConfigurationHandler, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 		<section name="system.diagnostics" type="System.Diagnostics.SystemDiagnosticsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 		<section name="system.runtime.remoting" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
 		<section name="system.windows.forms" type="System.Windows.Forms.WindowsFormsSection, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+		<section name="system.codedom" type="System.CodeDom.Compiler.CodeDomConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 		<section name="windows" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
 		<section name="strongNames" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
 		<sectionGroup name="system.runtime.serialization" type="System.Runtime.Serialization.Configuration.SerializationSectionGroup, System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

docs/api-style.css

@@ -43,6 +43,16 @@
         line-height: 0px;
     }
 
+    .mapi-codeblock {
+        display: block;
+        padding: 5pt 5pt;
+        margin: 10pt;
+        white-space: pre;
+        font-family: monospace;
+        border: 1px solid rgba(233,233,233,1);
+        background-color: rgba(249,249,249,1);
+    }
+
     .mapi-entry code {
         border: none;
         background-color: transparent;

docs/deploy/api-style.css

@@ -43,6 +43,16 @@
         line-height: 0px;
     }
 
+    .mapi-codeblock {
+        display: block;
+        padding: 5pt 5pt;
+        margin: 10pt;
+        white-space: pre;
+        font-family: monospace;
+        border: 1px solid rgba(233,233,233,1);
+        background-color: rgba(249,249,249,1);
+    }
+
     .mapi-entry code {
         border: none;
         background-color: transparent;

docs/deploy/mono-api-assembly.html

@@ -48,6 +48,16 @@
         line-height: 0px;
     }
 
+    .mapi-codeblock {
+        display: block;
+        padding: 5pt 5pt;
+        margin: 10pt;
+        white-space: pre;
+        font-family: monospace;
+        border: 1px solid rgba(233,233,233,1);
+        background-color: rgba(249,249,249,1);
+    }
+
     .mapi-entry code {
         border: none;
         background-color: transparent;
@@ -240,7 +250,10 @@ mono_assembly_close (MonoAssembly *assembly)
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>assembly</i></td><td> the assembly to release.</td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 This method releases a reference to the <i>assembly</i>.  The assembly is 	 only released when all the outstanding references to it are released.</div>
+             <div>
+<p />
+ This method releases a reference to the <i>assembly</i>.  The assembly is
+ only released when all the outstanding references to it are released.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -287,7 +300,11 @@ mono_assembly_load (MonoAssemblyName *aname, const char *basedir, MonoImageOpenS
 
 	 value pointed by <i>status</i> is updated with an error code.</div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Loads the assembly referenced by <i>aname</i>, if the value of <i>basedir</i> is not <code>NULL</code>, it 	 attempts to load the assembly from that directory before probing the standard locations. 	<p /></div>
+             <div>
+<p />
+ Loads the assembly referenced by <i>aname</i>, if the value of <i>basedir</i> is not <code>NULL</code>, it
+ attempts to load the assembly from that directory before probing the standard locations.
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -312,7 +329,14 @@ mono_assembly_load_full (MonoAssemblyName *aname, const char *basedir, MonoImage
 
 	 value pointed by <i>status</i> is updated with an error code.</div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Loads the assembly referenced by <i>aname</i>, if the value of <i>basedir</i> is not <code>NULL</code>, it 	 attempts to load the assembly from that directory before probing the standard locations. 	<p /> 	 If the assembly is being opened in reflection-only mode (<i>refonly</i> set to <code>TRUE</code>) then no  	 assembly binding takes place. 	<p /></div>
+             <div>
+<p />
+ Loads the assembly referenced by <i>aname</i>, if the value of <i>basedir</i> is not <code>NULL</code>, it
+ attempts to load the assembly from that directory before probing the standard locations.
+<p />
+ If the assembly is being opened in reflection-only mode (<i>refonly</i> set to <code>TRUE</code>) then no 
+ assembly binding takes place.
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -337,7 +361,10 @@ mono_assembly_loaded (MonoAssemblyName *aname)
 
 	 a <code>MonoAssembly</code> that matches the <code>MonoAssemblyName</code> specified.</div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 This is used to determine if the specified assembly has been loaded 	<p /></div>
+             <div>
+<p />
+ This is used to determine if the specified assembly has been loaded
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -368,7 +395,15 @@ mono_assembly_load_from (MonoImage *image, const char *fname,
 	 image did not contain an assembly reference table.
 	<p /></div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 If the provided <i>image</i> has an assembly reference, it will process the given 	 image as an assembly with the given name. 	<p /> 	 Most likely you want to use the `api:mono_assembly_load_full` method instead. 	<p /> 	 This is equivalent to calling `api:mono_assembly_load_from_full` with the 	 <i>refonly</i> parameter set to <code>FALSE</code>.</div>
+             <div>
+<p />
+ If the provided <i>image</i> has an assembly reference, it will process the given
+ image as an assembly with the given name.
+<p />
+ Most likely you want to use the `api:mono_assembly_load_full` method instead.
+<p />
+ This is equivalent to calling `api:mono_assembly_load_from_full` with the
+ <i>refonly</i> parameter set to <code>FALSE</code>.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -398,7 +433,13 @@ mono_assembly_load_from_full (MonoImage *image, const char*fname,
 	 reason with <i>status</i> being set to <code>MONO_IMAGE_INVALID</code> if the
 	 image did not contain an assembly reference table.</div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 If the provided <i>image</i> has an assembly reference, it will process the given 	 image as an assembly with the given name. 	<p /> 	 Most likely you want to use the `api:mono_assembly_load_full` method instead. 	<p /></div>
+             <div>
+<p />
+ If the provided <i>image</i> has an assembly reference, it will process the given
+ image as an assembly with the given name.
+<p />
+ Most likely you want to use the `api:mono_assembly_load_full` method instead.
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -422,7 +463,18 @@ mono_assembly_load_with_partial_name (const char *name, MonoImageOpenStatus *sta
              <div>	 <code>NULL</code> on failure, or a pointer to a <code>MonoAssembly</code> on success.
 </div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Loads a <code>MonoAssembly</code> from a name.  The name is parsed using `api:mono_assembly_name_parse`, 	 so it might contain a qualified type name, version, culture and token. 	<p /> 	 This will load the assembly from the file whose name is derived from the assembly name 	 by appending the <code>.dll</code> extension. 	<p /> 	 The assembly is loaded from either one of the extra Global Assembly Caches specified 	 by the extra GAC paths (specified by the <code>MONO_GAC_PREFIX</code> environment variable) or 	 if that fails from the GAC. 	<p /></div>
+             <div>
+<p />
+ Loads a <code>MonoAssembly</code> from a name.  The name is parsed using `api:mono_assembly_name_parse`,
+ so it might contain a qualified type name, version, culture and token.
+<p />
+ This will load the assembly from the file whose name is derived from the assembly name
+ by appending the <code>.dll</code> extension.
+<p />
+ The assembly is loaded from either one of the extra Global Assembly Caches specified
+ by the extra GAC paths (specified by the <code>MONO_GAC_PREFIX</code> environment variable) or
+ if that fails from the GAC.
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -448,7 +500,21 @@ mono_assembly_open (const char *filename, MonoImageOpenStatus *status)
 	 assembly or <code>NULL</code> on error.  Details about the error are stored in the
 	 <i>status</i> variable.</div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 This loads an assembly from the specified <i>filename</i>. The <i>filename</i> allows 	 a local URL (starting with a <code>file://</code> prefix).  If a file prefix is used, the 	 filename is interpreted as a URL, and the filename is URL-decoded.   Otherwise the file 	 is treated as a local path. 	<p /> 	 First, an attempt is made to load the assembly from the bundled executable (for those 	 deployments that have been done with the <code>mkbundle</code> tool or for scenarios where the 	 assembly has been registered as an embedded assembly).   If this is not the case, then 	 the assembly is loaded from disk using `api:mono_image_open_full`. 	<p /> 	 If the pointed assembly does not live in the Global Assembly Cache, a shadow copy of 	 the assembly is made. 	<p /></div>
+             <div>
+<p />
+ This loads an assembly from the specified <i>filename</i>. The <i>filename</i> allows
+ a local URL (starting with a <code>file://</code> prefix).  If a file prefix is used, the
+ filename is interpreted as a URL, and the filename is URL-decoded.   Otherwise the file
+ is treated as a local path.
+<p />
+ First, an attempt is made to load the assembly from the bundled executable (for those
+ deployments that have been done with the <code>mkbundle</code> tool or for scenarios where the
+ assembly has been registered as an embedded assembly).   If this is not the case, then
+ the assembly is loaded from disk using `api:mono_image_open_full`.
+<p />
+ If the pointed assembly does not live in the Global Assembly Cache, a shadow copy of
+ the assembly is made.
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -473,7 +539,24 @@ mono_assembly_open_full (const char *filename, MonoImageOpenStatus *status, gboo
 
 	 to the assembly.</div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 This loads an assembly from the specified <i>filename</i>. The <i>filename</i> allows 	 a local URL (starting with a <code>file://</code> prefix).  If a file prefix is used, the 	 filename is interpreted as a URL, and the filename is URL-decoded.   Otherwise the file 	 is treated as a local path. 	<p /> 	 First, an attempt is made to load the assembly from the bundled executable (for those 	 deployments that have been done with the <code>mkbundle</code> tool or for scenarios where the 	 assembly has been registered as an embedded assembly).   If this is not the case, then 	 the assembly is loaded from disk using `api:mono_image_open_full`. 	<p /> 	 If the pointed assembly does not live in the Global Assembly Cache, a shadow copy of 	 the assembly is made. 	<p /> 	 If <i>refonly</i> is set to true, then the assembly is loaded purely for inspection with 	 the <code>System.Reflection</code> API. 	<p /></div>
+             <div>
+<p />
+ This loads an assembly from the specified <i>filename</i>. The <i>filename</i> allows
+ a local URL (starting with a <code>file://</code> prefix).  If a file prefix is used, the
+ filename is interpreted as a URL, and the filename is URL-decoded.   Otherwise the file
+ is treated as a local path.
+<p />
+ First, an attempt is made to load the assembly from the bundled executable (for those
+ deployments that have been done with the <code>mkbundle</code> tool or for scenarios where the
+ assembly has been registered as an embedded assembly).   If this is not the case, then
+ the assembly is loaded from disk using `api:mono_image_open_full`.
+<p />
+ If the pointed assembly does not live in the Global Assembly Cache, a shadow copy of
+ the assembly is made.
+<p />
+ If <i>refonly</i> is set to true, then the assembly is loaded purely for inspection with
+ the <code>System.Reflection</code> API.
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -494,7 +577,16 @@ mono_set_assemblies_path (const char* path)
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>path</i></td><td> list of paths that contain directories where Mono will look for assemblies</td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Use this method to override the standard assembly lookup system and 	 override any assemblies coming from the GAC.  This is the method 	 that supports the <code>MONO_PATH</code> variable. 	<p /> 	 Notice that <code>MONO_PATH</code> and this method are really a very bad idea as 	 it prevents the GAC from working and it prevents the standard 	 resolution mechanisms from working.  Nonetheless, for some debugging 	 situations and bootstrapping setups, this is useful to have. </div>
+             <div>
+<p />
+ Use this method to override the standard assembly lookup system and
+ override any assemblies coming from the GAC.  This is the method
+ that supports the <code>MONO_PATH</code> variable.
+<p />
+ Notice that <code>MONO_PATH</code> and this method are really a very bad idea as
+ it prevents the GAC from working and it prevents the standard
+ resolution mechanisms from working.  Nonetheless, for some debugging
+ situations and bootstrapping setups, this is useful to have. </div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -514,7 +606,10 @@ mono_set_rootdir (void)
 </div>
             <p />
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Registers the root directory for the Mono runtime, for Linux and Solaris 10, 	 this auto-detects the prefix where Mono was installed. </div>
+             <div>
+<p />
+ Registers the root directory for the Mono runtime, for Linux and Solaris 10,
+ this auto-detects the prefix where Mono was installed. </div>
         </div><!--mapi-description -->
     </div><!--height container -->
 
@@ -561,7 +656,14 @@ mono_assembly_foreach (GFunc func, gpointer user_data)
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>func</i></td><td> function to invoke for each assembly loaded</td></tr><tr><td><i>user_data</i></td><td> data passed to the callback</td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Invokes the provided <i>func</i> callback for each assembly loaded into 	 the runtime.   The first parameter passed to the callback  is the 	 <code>MonoAssembly*</code>, and the second parameter is the <i>user_data</i>. 	<p /> 	 This is done for all assemblies loaded in the runtime, not just 	 those loaded in the current application domain.</div>
+             <div>
+<p />
+ Invokes the provided <i>func</i> callback for each assembly loaded into
+ the runtime.   The first parameter passed to the callback  is the
+ <code>MonoAssembly*</code>, and the second parameter is the <i>user_data</i>.
+<p />
+ This is done for all assemblies loaded in the runtime, not just
+ those loaded in the current application domain.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -585,7 +687,8 @@ mono_assembly_get_image (MonoAssembly *assembly)
              <div>	 the <code>MonoImage</code> associated with this assembly.
 </div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /></div>
+             <div>
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -608,7 +711,8 @@ mono_assembly_get_main (void)
              <div>	 the assembly for the application, the first assembly that is loaded by the VM
 </div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /></div>
+             <div>
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -632,7 +736,10 @@ mono_assembly_get_name (MonoAssembly *assembly)
              <div>	 the <code>MonoAssemblyName</code> associated with this assembly.
 </div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 The returned name's lifetime is the same as <i>assembly</i>'s. 	<p /></div>
+             <div>
+<p />
+ The returned name's lifetime is the same as <i>assembly</i>'s.
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -655,7 +762,10 @@ mono_assembly_getrootdir (void)
              <div>	 a string with the directory, this string should not be freed.
 </div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Obtains the root directory used for looking up assemblies. 	<p /></div>
+             <div>
+<p />
+ Obtains the root directory used for looking up assemblies.
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -676,7 +786,9 @@ mono_assembly_get_assemblyref (MonoImage *image, int index, MonoAssemblyName *an
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>image</i></td><td> pointer to the <code>MonoImage</code> to extract the information from.</td></tr><tr><td><i>index</i></td><td> index to the assembly reference in the image.</td></tr><tr><td><i>aname</i></td><td> pointer to a <code>MonoAssemblyName</code> that will hold the returned value.</td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Fills out the <i>aname</i> with the assembly name of the <i>index</i> assembly reference in <i>image</i>.</div>
+             <div>
+<p />
+ Fills out the <i>aname</i> with the assembly name of the <i>index</i> assembly reference in <i>image</i>.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -701,7 +813,9 @@ mono_assembly_loaded_full (MonoAssemblyName *aname, gboolean refonly)
 
 	 a <code>MonoAssembly</code> that matches the <code>MonoAssemblyName</code> specified.</div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 This is used to determine if the specified assembly has been loaded</div>
+             <div>
+<p />
+ This is used to determine if the specified assembly has been loaded</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -740,7 +854,9 @@ mono_assembly_load_references (MonoImage *image, MonoImageOpenStatus *status)
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>image</i></td><td></td></tr><tr><td><i>status</i></td><td></td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 This method is now a no-op, it does nothing other than setting the <i>status</i> to <code>MONO_IMAGE_OK</code></div>
+             <div>
+<p />
+ This method is now a no-op, it does nothing other than setting the <i>status</i> to <code>MONO_IMAGE_OK</code></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -833,7 +949,14 @@ mono_assembly_setrootdir (const char *root_dir)
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>root_dir</i></td><td> The pathname of the root directory where we will locate assemblies</td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 This routine sets the internal default root directory for looking up 	 assemblies. 	<p /> 	 This is used by Windows installations to compute dynamically the 	 place where the Mono assemblies are located. 	<p /></div>
+             <div>
+<p />
+ This routine sets the internal default root directory for looking up
+ assemblies.
+<p />
+ This is used by Windows installations to compute dynamically the
+ place where the Mono assemblies are located.
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -904,7 +1027,11 @@ mono_assembly_name_new (const char *name)
              <div>	 a newly allocated structure or <code>NULL</code> if there was any failure.
 </div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Allocate a new <code>MonoAssemblyName</code> and fill its values from the 	 passed <i>name</i>. 	<p /></div>
+             <div>
+<p />
+ Allocate a new <code>MonoAssemblyName</code> and fill its values from the
+ passed <i>name</i>.
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -997,7 +1124,10 @@ mono_assembly_name_free (MonoAssemblyName *aname)
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>aname</i></td><td> assembly name to free</td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Frees the provided assembly name object. 	 (it does not frees the object itself, only the name members).</div>
+             <div>
+<p />
+ Frees the provided assembly name object.
+ (it does not frees the object itself, only the name members).</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -1022,7 +1152,11 @@ mono_stringify_assembly_name (MonoAssemblyName *aname)
 
 	 the assembly name.</div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Convert <i>aname</i> into its string format. The returned string is dynamically 	 allocated and should be freed by the caller. 	<p /></div>
+             <div>
+<p />
+ Convert <i>aname</i> into its string format. The returned string is dynamically
+ allocated and should be freed by the caller.
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -1046,7 +1180,13 @@ mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r)
              <div>	 <code>TRUE</code> if both assembly names are equal.
 </div>
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Compares two <code>MonoAssemblyName</code> instances and returns whether they are equal. 	<p /> 	 This compares the names, the cultures, the release version and their 	 public tokens. 	<p /></div>
+             <div>
+<p />
+ Compares two <code>MonoAssemblyName</code> instances and returns whether they are equal.
+<p />
+ This compares the names, the cultures, the release version and their
+ public tokens.
+<p /></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 

docs/deploy/mono-api-counters.html

@@ -48,6 +48,16 @@
         line-height: 0px;
     }
 
+    .mapi-codeblock {
+        display: block;
+        padding: 5pt 5pt;
+        margin: 10pt;
+        white-space: pre;
+        font-family: monospace;
+        border: 1px solid rgba(233,233,233,1);
+        background-color: rgba(249,249,249,1);
+    }
+
     .mapi-entry code {
         border: none;
         background-color: transparent;
@@ -244,7 +254,10 @@ mono_counters_dump (int section_mask, FILE *outfile)
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>section_mask</i></td><td> The sections to dump counters for</td></tr><tr><td><i>outfile</i></td><td> a FILE to dump the results to</td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	 Displays the counts of all the enabled counters registered.  	 To filter by variance, you can OR one or more variance with the specific section you want. 	 Use <code>MONO_COUNTER_SECTION_MASK</code> to dump all categories of a specific variance.</div>
+             <div>
+ Displays the counts of all the enabled counters registered. 
+ To filter by variance, you can OR one or more variance with the specific section you want.
+ Use <code>MONO_COUNTER_SECTION_MASK</code> to dump all categories of a specific variance.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -265,6 +278,7 @@ mono_counters_enable (int section_mask)
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>sectionmask</i></td><td> a mask listing the sections that will be displayed</td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	 This is used to track which counters will be displayed.</div>
+             <div>
+ This is used to track which counters will be displayed.</div>
         </div><!--mapi-description -->
     </div><!--height container -->

docs/deploy/mono-api-debug.html

@@ -48,6 +48,16 @@
         line-height: 0px;
     }
 
+    .mapi-codeblock {
+        display: block;
+        padding: 5pt 5pt;
+        margin: 10pt;
+        white-space: pre;
+        font-family: monospace;
+        border: 1px solid rgba(233,233,233,1);
+        background-color: rgba(249,249,249,1);
+    }
+
     .mapi-entry code {
         border: none;
         background-color: transparent;
@@ -259,7 +269,10 @@ mono_debug_symfile_free_location (MonoDebugSourceLocation  *location)
 </div>
             <p />
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Free a <code>MonoDebugSourceLocation</code> returned by 	 <code>mono_debug_symfile_lookup_location</code></div>
+             <div>
+<p />
+ Free a <code>MonoDebugSourceLocation</code> returned by
+ <code>mono_debug_symfile_lookup_location</code></div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -297,7 +310,11 @@ mono_debug_symfile_lookup_locals (MonoDebugMethodInfo *minfo)
 </div>
             <p />
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Return information about the local variables of <i>minfo</i> from the symbol file. 	 Return <code>NULL</code> if no information can be found. 	 The result should be freed using <code>mono_debug_symfile_free_locals</code>.</div>
+             <div>
+<p />
+ Return information about the local variables of <i>minfo</i> from the symbol file.
+ Return <code>NULL</code> if no information can be found.
+ The result should be freed using <code>mono_debug_symfile_free_locals</code>.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -318,7 +335,11 @@ mono_debug_symfile_lookup_location (MonoDebugMethodInfo *minfo, uint32_t offset)
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>minfo</i></td><td> A <code>MonoDebugMethodInfo</code> which can be retrieved by <code>mono_debug_lookup_method</code>.</td></tr><tr><td><i>offset</i></td><td> IL offset within the corresponding method's CIL code.</td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 This function is similar to <code>mono_debug_lookup_location</code>, but we 	 already looked up the method and also already did the 	 native address -&gt; IL offset mapping.</div>
+             <div>
+<p />
+ This function is similar to <code>mono_debug_lookup_location</code>, but we
+ already looked up the method and also already did the
+ native address -&gt; IL offset mapping.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -428,7 +449,9 @@ mono_debug_enabled (void)
 </div>
             <p />
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Returns true is debug information is enabled. This doesn't relate if a debugger is present or not.</div>
+             <div>
+<p />
+ Returns true is debug information is enabled. This doesn't relate if a debugger is present or not.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -464,7 +487,8 @@ mono_debug_free_source_location (MonoDebugSourceLocation *location)
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>location</i></td><td> A <code>MonoDebugSourceLocation</code></td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	 Frees the <i>location</i>.</div>
+             <div>
+ Frees the <i>location</i>.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -499,7 +523,11 @@ mono_debug_lookup_method (MonoMethod *method)
 </div>
             <p />
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Lookup symbol file information for the method <i>method</i>.  The returned 	 <code>MonoDebugMethodInfo</code> is a private structure, but it can be passed to 	 <code>mono_debug_symfile_lookup_location</code>.</div>
+             <div>
+<p />
+ Lookup symbol file information for the method <i>method</i>.  The returned
+ <code>MonoDebugMethodInfo</code> is a private structure, but it can be passed to
+ <code>mono_debug_symfile_lookup_location</code>.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -535,7 +563,12 @@ mono_debug_lookup_source_location (MonoMethod *method, guint32 address, MonoDoma
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>address</i></td><td> Native offset within the <i>method</i>'s machine code.</td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	 Lookup the source code corresponding to the machine instruction located at 	 native offset <i>address</i> within <i>method</i>. 	 The returned <code>MonoDebugSourceLocation</code> contains both file / line number 	 information and the corresponding IL offset.  It must be freed by 	 <code>mono_debug_free_source_location</code>.</div>
+             <div>
+ Lookup the source code corresponding to the machine instruction located at
+ native offset <i>address</i> within <i>method</i>.
+ The returned <code>MonoDebugSourceLocation</code> contains both file / line number
+ information and the corresponding IL offset.  It must be freed by
+ <code>mono_debug_free_source_location</code>.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -571,7 +604,9 @@ mono_debug_print_stack_frame (MonoMethod *method, guint32 native_offset, MonoDom
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>native_offset</i></td><td> Native offset within the <i>method</i>'s machine code.</td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	 Conventient wrapper around <code>mono_debug_lookup_source_location</code> which can be 	 used if you only want to use the location to print a stack frame.</div>
+             <div>
+ Conventient wrapper around <code>mono_debug_lookup_source_location</code> which can be
+ used if you only want to use the location to print a stack frame.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -606,7 +641,10 @@ mono_debug_il_offset_from_address (MonoMethod *method, MonoDomain *domain, guint
 </div>
             <p />
              <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Compute the IL offset corresponding to <i>native_offset</i> inside the native 	 code of <i>method</i> in <i>domain</i>.</div>
+             <div>
+<p />
+ Compute the IL offset corresponding to <i>native_offset</i> inside the native
+ code of <i>method</i> in <i>domain</i>.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->