diff --git a/eng/testing/WasmRunnerTemplate.sh b/eng/testing/WasmRunnerTemplate.sh index b218892220490a..9ec16d23dcebf4 100644 --- a/eng/testing/WasmRunnerTemplate.sh +++ b/eng/testing/WasmRunnerTemplate.sh @@ -8,7 +8,7 @@ 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} 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 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 @@ + 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()) {