Merge pull request #776 from Unity-Technologies/unity-master-staging

Mono Bleeding Edge for Trunk
case 980742 - Fix 32-bit Windows Standalone failing to load Mono

Author: joncham

CONTRIBUTING.md renamed to .github/CONTRIBUTING.md

@@ -0,0 +1,30 @@
+## Steps to Reproduce
+
+1. 
+2. 
+3. 
+
+## Current Behavior
+
+What is the current behavior?
+
+## Expected Behavior
+
+Please describe the behavior you are expecting
+
+### On which platforms did you notice this
+
+- [ ] macOS
+- [ ] Linux 
+- [ ] Windows
+
+**Version Used**:
+
+You can use `mono --version` or About dialog to obtain this information
+
+### Stacktrace
+
+```
+Please copy paste the Stacktrace here if available
+```
+

.github/ISSUE_TEMPLATE.md

@@ -224,8 +224,7 @@ section.
 Reporting bugs
 ==============
 
-To submit bug reports, please use [Xamarin's
-Bugzilla](https://bugzilla.xamarin.com/)
+To submit bug reports, please [open an issue on the mono GitHub repo](https://github.com/mono/mono/issues/new).
 
 Please use the search facility to ensure the same bug hasn't already
 been submitted and follow our
@@ -358,16 +357,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

README.md

@@ -60,18 +60,16 @@ static class Program {
 		static readonly TimeSpan _timeout = TimeSpan.FromHours (9);
 
 		static readonly Dictionary<string, Predicate<Benchmark>> _filters = new Dictionary<string, Predicate<Benchmark>> {
-			{ "ironjs-v8", FilterArmArchitecture },
+			{ "ironjs-v8", FilterNotOnArm },
+			{ "msbiology", FilterNever },
 		};
 
-		static readonly Dictionary<string, Action<TestResult>> _processors = new Dictionary<string, Action<TestResult>> {
-			{ "msbiology", Process32BitOutOfMemory },
-		};
-
-		static string FilterInvalidXmlChars (string text) {
-			return Regex.Replace (text, @"[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u10000-\u10FFFF]", string.Empty);
+		static bool FilterNever (Benchmark benchmark)
+		{
+			return false;
 		}
 
-		static bool FilterArmArchitecture (Benchmark benchmark)
+		static bool FilterNotOnArm (Benchmark benchmark)
 		{
 #if ARCH_arm || ARCH_arm64
 			return false;
@@ -80,23 +78,15 @@ static bool FilterArmArchitecture (Benchmark benchmark)
 #endif
 		}
 
-		static void Process32BitOutOfMemory (TestResult result)
-		{
-			if (Environment.Is64BitProcess)
-				return;
-
-			if (result.ExitCode == null || result.ExitCode == 0)
-				return;
-
-			if (result.StandardError.Contains ("OutOfMemoryException"))
-				result.ExitCode = 0;
-		}
-
 		static bool IsSupported (Benchmark benchmark)
 		{
 			return _filters.TryGetValue (benchmark.Name, out var filter) ? filter (benchmark) : true;
 		}
 
+		static string ReplaceInvalidXmlChars (string text) {
+			return Regex.Replace (text, @"[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u10000-\u10FFFF]", string.Empty);
+		}
+
 		static int Main ()
 		{
 			var depDir = Path.Combine ("..", "external", "benchmarker");
@@ -227,9 +217,6 @@ static int Main ()
 					Console.WriteLine (result.StandardError);
 				}
 
-				if (_processors.TryGetValue (bench.Name, out var processor))
-					processor (result);
-
 				results.Add (result);
 			}
 
@@ -307,11 +294,11 @@ static int Main ()
 						writer.WriteStartElement ("failure");
 
 						writer.WriteStartElement ("message");
-						writer.WriteCData (FilterInvalidXmlChars (result.StandardOutput));
+						writer.WriteCData (ReplaceInvalidXmlChars (result.StandardOutput));
 						writer.WriteEndElement ();
 
 						writer.WriteStartElement ("stack-trace");
-						writer.WriteCData (FilterInvalidXmlChars (result.StandardError));
+						writer.WriteCData (ReplaceInvalidXmlChars (result.StandardError));
 						writer.WriteEndElement ();
 
 						writer.WriteEndElement ();

acceptance-tests/profiler-stress/runner.cs

@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 #AC_PREREQ([2.62])
 
-AC_INIT(mono, [5.9.0],
+AC_INIT(mono, [5.11.0],
         [http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
 
 AC_CONFIG_SRCDIR([README.md])
@@ -123,6 +123,7 @@ CFLAGS="$CFLAGS -D_REENTRANT -D_GNU_SOURCE -DNO_UNALIGNED_ACCESS -s WASM=1"
 CPPFLAGS="$CPPFLAGS -D_REENTRANT -DUSE_MMAP -D_GNU_SOURCE -DNO_UNALIGNED_ACCESS -s WASM=1"
 libdl="-ldl"
 libgc_threads=pthreads
+platform_wasm=yes
 
 else
 
@@ -368,8 +369,6 @@ case "$host" in
 		AC_DEFINE(PTHREAD_POINTER_ID)
 		dnl Haiku does not support static TLS with __thread
 		with_tls=pthread
-		dnl Boehm is too much work to backport Haiku support for
-		support_boehm=no
 		libgc_threads=pthreads
 		use_sigposix=yes
 		;;
@@ -413,6 +412,7 @@ AM_CONDITIONAL(HOST_SIGPOSIX, test x$use_sigposix = xyes)
 AM_CONDITIONAL(HOST_ANDROID, test x$platform_android = xyes)
 AM_CONDITIONAL(HOST_TIZEN, test x$platform_tizen = xyes)
 AM_CONDITIONAL(HOST_IOS, test x$platform_ios = xyes)
+AM_CONDITIONAL(HOST_WASM, test x$platform_wasm = xyes)
 
 if test -z "$HOST_DARWIN_TRUE"; then :
 PLATFORM_AOT_SUFFIX=.dylib