From 41f8570a70872adffbb0521b911f5b44563782c3 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 9 Jun 2020 13:42:59 -0400 Subject: [PATCH 1/4] Add System.Security.Cryptography.Algorithms to the pinvoke generator. --- src/mono/wasm/wasm.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/wasm.targets b/src/mono/wasm/wasm.targets index f910a6e0c2d380..b02a86f6278a8a 100644 --- a/src/mono/wasm/wasm.targets +++ b/src/mono/wasm/wasm.targets @@ -9,7 +9,6 @@ - @@ -19,6 +18,7 @@ + From 0b2c74ce05883a9088e303cde90fb35b6561e394 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 9 Jun 2020 13:43:36 -0400 Subject: [PATCH 2/4] Fix a stack overflow in WasmAppBuilder. --- tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.cs b/tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.cs index ef2236b931ee4b..d51afcb77c0c1c 100644 --- a/tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.cs +++ b/tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.cs @@ -108,6 +108,8 @@ public override bool Execute () private void Add(MetadataLoadContext mlc, Assembly assembly) { + if (_assemblies!.ContainsKey(assembly.GetName().Name!)) + return; _assemblies![assembly.GetName().Name!] = assembly; foreach (var aname in assembly.GetReferencedAssemblies()) { From 963adb6549ddeabd37f1b65afa8abe73e4746373 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 9 Jun 2020 15:16:10 -0400 Subject: [PATCH 3/4] [wasm] Unset MONO_LOG_MASK when running tests. Its set to 'gc' by default which causes extra log messages to be added to the testResult.xml file. --- eng/testing/WasmRunnerTemplate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/testing/WasmRunnerTemplate.sh b/eng/testing/WasmRunnerTemplate.sh index b218892220490a..01747617ec722d 100644 --- a/eng/testing/WasmRunnerTemplate.sh +++ b/eng/testing/WasmRunnerTemplate.sh @@ -8,9 +8,9 @@ cd $EXECUTION_DIR XHARNESS_OUT="$EXECUTION_DIR/xharness-output" dotnet xharness wasm test --engine=$JAVASCRIPT_ENGINE \ - --js-file=runtime.js \ + --js-file=runtime.js -v \ --output-directory=$XHARNESS_OUT \ - -- --enable-gc --run WasmTestRunner.dll ${@:2} + -- --enable-gc --setenv=MONO_LOG_MASK= --run WasmTestRunner.dll ${@:2} _exitCode=$? From d16ce857ff27c532c83fd3205359f3e830ed9b75 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 9 Jun 2020 17:11:08 -0400 Subject: [PATCH 4/4] Turn off GC logging by default. --- eng/testing/WasmRunnerTemplate.sh | 2 +- src/mono/wasm/runtime/driver.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/testing/WasmRunnerTemplate.sh b/eng/testing/WasmRunnerTemplate.sh index 01747617ec722d..9ec16d23dcebf4 100644 --- a/eng/testing/WasmRunnerTemplate.sh +++ b/eng/testing/WasmRunnerTemplate.sh @@ -10,7 +10,7 @@ XHARNESS_OUT="$EXECUTION_DIR/xharness-output" dotnet xharness wasm test --engine=$JAVASCRIPT_ENGINE \ --js-file=runtime.js -v \ --output-directory=$XHARNESS_OUT \ - -- --enable-gc --setenv=MONO_LOG_MASK= --run WasmTestRunner.dll ${@:2} + -- --enable-gc --run WasmTestRunner.dll ${@:2} _exitCode=$? diff --git a/src/mono/wasm/runtime/driver.c b/src/mono/wasm/runtime/driver.c index ffdd9025c379a0..e536f1d8aa50da 100644 --- a/src/mono/wasm/runtime/driver.c +++ b/src/mono/wasm/runtime/driver.c @@ -312,8 +312,8 @@ mono_wasm_load_runtime (const char *managed_path, int enable_debugging) { const char *interp_opts = ""; - monoeg_g_setenv ("MONO_LOG_LEVEL", "debug", 0); - monoeg_g_setenv ("MONO_LOG_MASK", "gc", 0); + //monoeg_g_setenv ("MONO_LOG_LEVEL", "debug", 0); + //monoeg_g_setenv ("MONO_LOG_MASK", "gc", 0); #ifdef ENABLE_NETCORE monoeg_g_setenv ("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "1", 0); #endif