Remove Entrypoint Invoker

src/Components/.gitignore

@@ -0,0 +1 @@
+**/Samples/**/.vscode/*

src/Components/Web.JS/src/Platform/Mono/MonoPlatform.ts

@@ -54,16 +54,13 @@ export const monoPlatform: Platform = {
     });
   },
 
-  callEntryPoint: function callEntryPoint(assemblyName: string) {
-    // Instead of using Module.mono_call_assembly_entry_point, we have our own logic for invoking
-    // the entrypoint which adds support for async main.
+  callEntryPoint: function callEntryPoint(assemblyName: string) : Promise<any> {
     // Currently we disregard the return value from the entrypoint, whether it's sync or async.
     // In the future, we might want Blazor.start to return a Promise<Promise<value>>, where the
     // outer promise reflects the startup process, and the inner one reflects the possibly-async
     // .NET entrypoint method.
-    const invokeEntrypoint = bindStaticMethod('Microsoft.AspNetCore.Components.WebAssembly', 'Microsoft.AspNetCore.Components.WebAssembly.Hosting.EntrypointInvoker', 'InvokeEntrypoint');
-    // Note we're passing in null because passing arrays is problematic until https://github.com/mono/mono/issues/18245 is resolved.
-    invokeEntrypoint(assemblyName, null);
+    const emptyArray = [ [ ] ];
+    return BINDING.call_assembly_entry_point(assemblyName, emptyArray, undefined);
   },
 
   toUint8Array: function toUint8Array(array: System_Array<any>): Uint8Array {

src/Components/Web.JS/src/Platform/Mono/MonoTypes.ts

@@ -21,6 +21,7 @@ declare interface BINDING {
   mono_array_to_js_array<TInput, TOutput>(array: System_Array<TInput>) : Array<TOutput>;
   conv_string(dotnetString: System_String | null): string | null;
   bind_static_method(fqn: string, signature?: string): Function;
+  call_assembly_entry_point(assemblyName: string, args: any[], signature: any): Promise<any>;
   unbox_mono_obj(object: System_Object): any;
 }
 

src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHost.cs

@@ -48,7 +48,6 @@ internal WebAssemblyHost(
             string? persistedState)
         {
             // To ensure JS-invoked methods don't get linked out, have a reference to their enclosing types
-            GC.KeepAlive(typeof(EntrypointInvoker));
             GC.KeepAlive(typeof(JSInteropMethods));
 
             _services = services;
@@ -68,8 +67,6 @@ internal WebAssemblyHost(
         /// </summary>
         public IServiceProvider Services => _scope.ServiceProvider;
 
-        internal WebAssemblyCultureProvider CultureProvider { get; set; } = WebAssemblyCultureProvider.Instance!;
-
         /// <summary>
         /// Disposes the host asynchronously.
         /// </summary>
@@ -124,7 +121,7 @@ public Task RunAsync()
         }
 
         // Internal for testing.
-        internal async Task RunAsyncCore(CancellationToken cancellationToken)
+        internal async Task RunAsyncCore(CancellationToken cancellationToken, WebAssemblyCultureProvider? cultureProvider = null)
         {
             if (_started)
             {
@@ -133,13 +130,13 @@ internal async Task RunAsyncCore(CancellationToken cancellationToken)
 
             _started = true;
 
-            CultureProvider.ThrowIfCultureChangeIsUnsupported();
+            cultureProvider ??= WebAssemblyCultureProvider.Instance!;
+            cultureProvider.ThrowIfCultureChangeIsUnsupported();
 
-            // EntryPointInvoker loads satellite assemblies for the application default culture.
             // Application developers might have configured the culture based on some ambient state
             // such as local storage, url etc as part of their Program.Main(Async).
             // This is the earliest opportunity to fetch satellite assemblies for this selection.
-            await CultureProvider.LoadCurrentCultureResourcesAsync();
+            await cultureProvider.LoadCurrentCultureResourcesAsync();
 
             var manager = Services.GetRequiredService<ComponentApplicationLifetime>();
             var store = !string.IsNullOrEmpty(_persistedState) ?

src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHostBuilder.cs

@@ -36,7 +36,6 @@ public sealed class WebAssemblyHostBuilder
         /// </summary>
         /// <param name="args">The argument passed to the application's main method.</param>
         /// <returns>A <see cref="WebAssemblyHostBuilder"/>.</returns>
-        [DynamicDependency(DynamicallyAccessedMemberTypes.PublicMethods, typeof(EntrypointInvoker))]
         [DynamicDependency(DynamicallyAccessedMemberTypes.PublicMethods, typeof(JSInteropMethods))]
         [DynamicDependency(JsonSerialized, typeof(WebEventDescriptor))]
         public static WebAssemblyHostBuilder CreateDefault(string[]? args = default)
@@ -46,6 +45,8 @@ public static WebAssemblyHostBuilder CreateDefault(string[]? args = default)
             args ??= Array.Empty<string>();
             var builder = new WebAssemblyHostBuilder(DefaultWebAssemblyJSRuntime.Instance);
 
+            WebAssemblyCultureProvider.Initialize();
+
             // Right now we don't have conventions or behaviors that are specific to this method
             // however, making this the default for the template allows us to add things like that
             // in the future, while giving `new WebAssemblyHostBuilder` as an opt-out of opinionated

src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyHostTest.cs

@@ -22,12 +22,12 @@ public async Task RunAsync_CanExitBasedOnCancellationToken()
             // Arrange
             var builder = new WebAssemblyHostBuilder(new TestJSUnmarshalledRuntime());
             var host = builder.Build();
-            host.CultureProvider = new TestSatelliteResourcesLoader();
+            var cultureProvider = new TestSatelliteResourcesLoader();
 
             var cts = new CancellationTokenSource();
 
             // Act
-            var task = host.RunAsyncCore(cts.Token);
+            var task = host.RunAsyncCore(cts.Token, cultureProvider);
 
             cts.Cancel();
             await task.TimeoutAfter(TimeSpan.FromSeconds(3));
@@ -41,10 +41,10 @@ public async Task RunAsync_CallingTwiceCausesException()
             // Arrange
             var builder = new WebAssemblyHostBuilder(new TestJSUnmarshalledRuntime());
             var host = builder.Build();
-            host.CultureProvider = new TestSatelliteResourcesLoader();
+            var cultureProvider = new TestSatelliteResourcesLoader();
 
             var cts = new CancellationTokenSource();
-            var task = host.RunAsyncCore(cts.Token);
+            var task = host.RunAsyncCore(cts.Token, cultureProvider);
 
             // Act
             var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => host.RunAsyncCore(cts.Token));
@@ -63,7 +63,7 @@ public async Task DisposeAsync_CanDisposeAfterCallingRunAsync()
             var builder = new WebAssemblyHostBuilder(new TestJSUnmarshalledRuntime());
             builder.Services.AddSingleton<DisposableService>();
             var host = builder.Build();
-            host.CultureProvider = new TestSatelliteResourcesLoader();
+            var cultureProvider = new TestSatelliteResourcesLoader();
 
             var disposable = host.Services.GetRequiredService<DisposableService>();
 
@@ -72,7 +72,7 @@ public async Task DisposeAsync_CanDisposeAfterCallingRunAsync()
             // Act
             await using (host)
             {
-                var task = host.RunAsyncCore(cts.Token);
+                var task = host.RunAsyncCore(cts.Token, cultureProvider);
 
                 cts.Cancel();
                 await task.TimeoutAfter(TimeSpan.FromSeconds(3));