From f993e1d44b286ddba44b4f3578171b40d86f5177 Mon Sep 17 00:00:00 2001 From: TheXamlGuy Date: Sat, 22 Jun 2024 22:47:42 +0100 Subject: [PATCH] Fixed a crash where if a null parameter was passed --- Toolkit.Foundation/ComponentBuilder.cs | 3 ++- Toolkit.Foundation/DefaultHostBuilder.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Toolkit.Foundation/ComponentBuilder.cs b/Toolkit.Foundation/ComponentBuilder.cs index 08496d2..ca508c4 100644 --- a/Toolkit.Foundation/ComponentBuilder.cs +++ b/Toolkit.Foundation/ComponentBuilder.cs @@ -24,7 +24,8 @@ public class ComponentBuilder : services.AddScoped(); services.AddScoped(provider => - new ServiceFactory((type, parameters) => ActivatorUtilities.CreateInstance(provider, type, parameters!))); + new ServiceFactory((type, parameters) => ActivatorUtilities.CreateInstance(provider, type, + parameters?.Where(x => x is not null).ToArray()!))); services.AddSingleton(); diff --git a/Toolkit.Foundation/DefaultHostBuilder.cs b/Toolkit.Foundation/DefaultHostBuilder.cs index 5e8026e..b58e9db 100644 --- a/Toolkit.Foundation/DefaultHostBuilder.cs +++ b/Toolkit.Foundation/DefaultHostBuilder.cs @@ -18,7 +18,8 @@ public class DefaultHostBuilder : .ConfigureServices((context, services) => { services.AddScoped(provider => - new ServiceFactory((type, parameters) => ActivatorUtilities.CreateInstance(provider, type, parameters!))); + new ServiceFactory((type, parameters) => ActivatorUtilities.CreateInstance(provider, type, + parameters?.Where(x => x is not null).ToArray()!))); services.AddSingleton();