chore: More adjustments

Author: jeromelaban

src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets

@@ -202,7 +202,7 @@
 			<WasmEnableThreads Condition=" '$(WasmShellEnableThreads)' == 'true' ">true</WasmEnableThreads>
 
 			<!-- https://github.com/dotnet/runtime/blob/1231a9addd0fb3cfb806c2a89cb45a3018c48bb2/src/mono/browser/build/BrowserWasmApp.targets#L125-L126 -->
-			<_WasmPThreadPoolInitialSize Condition=" '$(WasmShellPThreadsPoolSize)' == 'true' ">true</_WasmPThreadPoolInitialSize>
+			<_WasmPThreadPoolInitialSize Condition=" '$(WasmShellPThreadsPoolSize)' == '' ">2</_WasmPThreadPoolInitialSize>
 
 			<!-- Native build compatibility -->
 			<WasmBuildNative Condition=" 

src/Uno.Wasm.Bootstrap/ts/Uno/WebAssembly/Bootstrapper.ts

@@ -145,6 +145,7 @@ namespace Uno.WebAssembly.Bootstrap {
 				onConfigLoaded: this.onConfigLoaded,
 				onDotnetReady: this.onDotnetReady,
 				onAbort: this.onAbort,
+				pthreadPoolInitialSize: 2,
 				exports: ["IDBFS", "FS"].concat(this._unoConfig.emcc_exported_runtime_methods),
 				onDownloadResourceProgress: (resourcesLoaded: number, totalResources: number) => this.reportDownloadResourceProgress(resourcesLoaded, totalResources),
 			};
@@ -260,9 +261,9 @@ namespace Uno.WebAssembly.Bootstrap {
 
 				await this.setupHotReload();
 
-				if (this._hotReloadSupport) {
-					await this._hotReloadSupport.initializeHotReload();
-				}
+				//if (this._hotReloadSupport) {
+				//	await this._hotReloadSupport.initializeHotReload();
+				//}
 
 				this._runMain(this._unoConfig.uno_main, []);
 

src/Uno.Wasm.Bootstrap/ts/Uno/WebAssembly/HotReloadSupport.ts

@@ -37,16 +37,15 @@ namespace Uno.WebAssembly.Bootstrap {
 				(<any>this._context).config.environmentVariables['ASPNETCORE-BROWSER-TOOLS']
 				|| (<any>this._context).config.environmentVariables['__ASPNETCORE_BROWSER_TOOLS'];
 
+			if (!await HotReloadSupport._initializeMethod()) {
+				console.warn("The application was compiled with the IL linker enabled, hot reload is disabled. See https://aka.platform.uno/wasm-il-linker for more details.");
+			}
+			let capabilities = await HotReloadSupport._getApplyUpdateCapabilitiesMethod();
+
 			// Take the place of the internal .NET for WebAssembly APIs for metadata updates coming
 			// from the "BrowserLink" feature.
 			(function (Blazor) {
 				Blazor._internal = {
-					initialize: function () {
-						if (!HotReloadSupport._initializeMethod()) {
-							console.warn("The application was compiled with the IL linker enabled, hot reload is disabled. See https://aka.platform.uno/wasm-il-linker for more details.");
-						}
-					},
-
 					applyExisting: async function (): Promise<void> {
 
 						if (browserToolsVariable == "true")
@@ -62,13 +61,11 @@ namespace Uno.WebAssembly.Bootstrap {
 					},
 
 					getApplyUpdateCapabilities: function () {
-						Blazor._internal.initialize();
-						return HotReloadSupport._getApplyUpdateCapabilitiesMethod();
+						return capabilities;
 					},
 
 					applyHotReload: function (moduleId: any, metadataDelta: any, ilDelta: any, pdbDelta: any, updatedTypes: any) {
-						Blazor._internal.initialize();
-						return HotReloadSupport._applyHotReloadDeltaMethod(moduleId, metadataDelta, ilDelta, pdbDelta || "", updatedTypes || []);
+						HotReloadSupport._applyHotReloadDeltaMethod(moduleId, metadataDelta, ilDelta, pdbDelta || "", updatedTypes || []);
 					}
 				};
 			})((<any>window).Blazor || ((<any>window).Blazor = {}));

src/Uno.Wasm.Tests.Shared/Runtime.cs

@@ -3,6 +3,7 @@
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Runtime.InteropServices.JavaScript;
+using System.Threading.Tasks;
 
 namespace WebAssembly
 {
@@ -11,7 +12,7 @@ internal sealed class Runtime
 		/// <summary>
 		/// Invokes Javascript code in the hosting environment
 		/// </summary>
-		internal static string InvokeJS(string str)
+		internal static Task<string> InvokeJS(string str)
 		{
 			Console.WriteLine($"Invoking {str}");
 			return Interop.InvokeJS(str);
@@ -21,6 +22,6 @@ internal static string InvokeJS(string str)
 	internal static partial class Interop
 	{
 		[JSImport("globalThis.Uno.WebAssembly.Bootstrap.Bootstrapper.invokeJS")]
-		public static partial string InvokeJS(string value);
+		public static partial Task<string> InvokeJS(string value);
 	}
 }

src/Uno.Wasm.Threads.Shared/Program.cs

@@ -44,7 +44,7 @@ static void Main()
 			Console.WriteLine($"TID: {Thread.CurrentThread.ManagedThreadId}");
 			Console.WriteLine($"SynchronizationContext: {_jsContext}");
 
-			Runtime.InvokeJS("Interop.appendResult('Startup')");
+			_ = Runtime.InvokeJS("Interop.appendResult('Startup')");
 
 			Run();
 
@@ -57,7 +57,7 @@ private static void OnTick(object state)
 			if (_event.WaitOne(10) && _mainThreadInvoked)
 			{
 				var r = $"Done {_messages.Count} results (_mainThreadInvoked:{_mainThreadInvoked})";
-				Runtime.InvokeJS($"Interop.appendResult('{r}')");
+				_ = Runtime.InvokeJS($"Interop.appendResult('{r}')");
 				Console.WriteLine($"[tid:{Thread.CurrentThread.ManagedThreadId}]: {r}");
 				_timer.Dispose();
 			}

src/Uno.Wasm.Threads.Shared/WasmScripts/test.js

@@ -3,7 +3,7 @@
 });
 
 var Interop = {
-    appendResult: function (str) {
+    appendResult: async function (str) {
         var txt = document.createTextNode(str);
         var parent = document.getElementById('results');
         parent.appendChild(txt, parent.lastChild);

src/Uno.Wasm.Threads/Uno.Wasm.Threads.csproj

@@ -9,6 +9,7 @@
 		<!--<WasmShellMonoRuntimeExecutionMode Condition="$([MSBuild]::IsOsPlatform('Linux'))">FullAOT</WasmShellMonoRuntimeExecutionMode>-->
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<WasmShellEnableThreads>true</WasmShellEnableThreads>
+		<!--<WasmBuildNative>true</WasmBuildNative>-->
 		<!--<WasmShellILLinkerEnabled>false</WasmShellILLinkerEnabled>-->
 	</PropertyGroup>