Merge pull request #897 from unoplatform/dev/hr-update

Misc HR updates

Author: jeromelaban

src/Uno.Wasm.Bootstrap/Uno.Wasm.Bootstrap.csproj

@@ -62,8 +62,13 @@
 			<Pack>true</Pack>
 			<PackagePath>tools</PackagePath>
 			<Visible>false</Visible>
-			<Visible>false</Visible>
 		</None>
+		
+		<Content Include="$(NuGetPackageRoot)/newtonsoft.json/13.0.2/lib/netstandard2.0/*.dll">
+			<Pack>true</Pack>
+			<PackagePath>tools</PackagePath>
+			<Visible>false</Visible>
+		</Content>
 
 	</ItemGroup>
 
@@ -74,6 +79,7 @@
 		-->
 		<ItemGroup>
 			<_UnoTaskDependencies Include="$(NuGetPackageRoot)/mono.cecil/0.11.4/lib/netstandard2.0/*.dll" />
+			<_UnoTaskDependencies Include="$(NuGetPackageRoot)/newtonsoft.json/13.0.2/lib/netstandard2.0/*.dll" />
 		</ItemGroup>
 		<Copy
 			SourceFiles="@(_UnoTaskDependencies)"

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

@@ -31,10 +31,12 @@ namespace Uno.WebAssembly.Bootstrap {
 
 			const webAppBasePath = this._unoConfig.environmentVariables["UNO_BOOTSTRAP_WEBAPP_BASE_PATH"];
 
+			// This assumes that the runtime includes the header as an env var:
+			// https://github.com/dotnet/runtime/blob/79a71fc750652191eba18e19b3f98492e882cb5f/src/mono/browser/runtime/loader/config.ts#L336
+			const browserToolsVariable = (<any>this._context).config.environmentVariables['ASPNETCORE-BROWSER-TOOLS'];
+
 			// Take the place of the internal .NET for WebAssembly APIs for metadata updates coming
 			// from the "BrowserLink" feature.
-			const bootstrapContext = this._context;
-
 			(function (Blazor) {
 				Blazor._internal = {
 					initialize: function () {
@@ -45,21 +47,11 @@ namespace Uno.WebAssembly.Bootstrap {
 
 					applyExisting: async function (): Promise<void> {
 
-						var hotreloadConfigResponse = await fetch(`/_framework/unohotreload`);
-
-						var modifiableAssemblies = hotreloadConfigResponse.headers.get('DOTNET-MODIFIABLE-ASSEMBLIES');
-						var aspnetCoreBrowserTools = hotreloadConfigResponse.headers.get('ASPNETCORE-BROWSER-TOOLS');
-
-						if (modifiableAssemblies) {
-							bootstrapContext.MONO.mono_wasm_setenv('DOTNET_MODIFIABLE_ASSEMBLIES', modifiableAssemblies);
-						}
-
-						// To uncomment once https://github.com/dotnet/aspnetcore/issues/37357#issuecomment-941237000 is released
-						// if (aspnetCoreBrowserTools == "true")
+						if (browserToolsVariable == "true")
 						{
 							try {
 								var m = <any>await import(`/_framework/blazor-hotreload.js`);
-								m.receiveHotReload();
+								await m.receiveHotReloadAsync();
 							}
 							catch (e) {
 								console.error(`Failed to apply initial metadata delta ${e}`);
@@ -72,15 +64,15 @@ namespace Uno.WebAssembly.Bootstrap {
 						return HotReloadSupport._getApplyUpdateCapabilitiesMethod();
 					},
 
-					applyHotReload: function (moduleId: any, metadataDelta: any, ilDelta: any, pdbDelta: any) {
+					applyHotReload: function (moduleId: any, metadataDelta: any, ilDelta: any, pdbDelta: any, updatedTypes: any) {
 						this.initialize();
-						return HotReloadSupport._applyHotReloadDeltaMethod(moduleId, metadataDelta, ilDelta, pdbDelta || "");
+						return HotReloadSupport._applyHotReloadDeltaMethod(moduleId, metadataDelta, ilDelta, pdbDelta || "", updatedTypes || []);
 					}
 				};
 			})((<any>window).Blazor || ((<any>window).Blazor = {}));
 
 			// Apply pending updates caused by a browser refresh
-			(<any>window).Blazor._internal.initialize(bootstrapContext.BINDING);
+			(<any>window).Blazor._internal.initialize();
 			await (<any>window).Blazor._internal.applyExisting();
 		}
 	}

src/Uno.Wasm.MetadataUpdater/WebAssemblyHotReload.cs

@@ -62,7 +62,7 @@ internal static bool Initialize()
 		/// For framework use only.
 		/// </summary>
 		[JSExport]
-		public static void ApplyHotReloadDelta(string moduleIdString, string metadataDelta, string ilDeta, string pdbDelta)
+		public static void ApplyHotReloadDelta(string moduleIdString, string metadataDelta, string ilDeta, string pdbDelta, int[] updatedTypes)
 		{
 			if (_linkerEnabled)
 			{
@@ -84,6 +84,7 @@ public static void ApplyHotReloadDelta(string moduleIdString, string metadataDel
 			_updateDeltas[0].MetadataDelta = Convert.FromBase64String(metadataDelta);
 			_updateDeltas[0].ILDelta = Convert.FromBase64String(ilDeta);
 			_updateDeltas[0].PdbBytes = Convert.FromBase64String(pdbDelta);
+			_updateDeltas[0].UpdatedTypes = updatedTypes;
 
 			_hotReloadAgent!.ApplyDeltas(_updateDeltas);
 		}

src/Uno.Wasm.Sample/Program.cs

@@ -21,6 +21,11 @@
 using System.Globalization;
 using System.Runtime.InteropServices.JavaScript;
 using System.Threading.Tasks;
+using System.Reflection.Metadata;
+using Uno.Wasm.Sample;
+using System.Linq;
+
+[assembly: MetadataUpdateHandler(typeof(MyHandler))]
 
 namespace Uno.Wasm.Sample
 { 
@@ -81,6 +86,11 @@ static void Main(string[] args)
 			}, null, 5000, 5000);
 		}
 	}
+	public static class MyHandler
+	{
+		internal static void ClearCache(Type[]? types) => Console.WriteLine("MyHandler.ClearCache");
+		internal static void UpdateApplication(Type[]? types) => Console.WriteLine($"MyHandler.UpdateApplication {types.Length} types: {string.Join(", ", types.Select(t => t.Name	))}");
+	}
 
 #if NET7_0_OR_GREATER
 	public static partial class Imports