From ded03f8d7de300263f9362ed78571e3c5b8e3000 Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Sat, 15 Jun 2024 20:33:12 +0300 Subject: [PATCH 1/5] fix null check to unblock sdk --- .../src/HostFactoryResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs index 01bcc724f8494..6df33986d633f 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs @@ -163,7 +163,7 @@ static bool IsApplicationNameArg(string arg) => arg.Equals("--applicationName", StringComparison.OrdinalIgnoreCase) || arg.Equals("/applicationName", StringComparison.OrdinalIgnoreCase); - args = args.Any(arg => IsApplicationNameArg(arg)) || assembly?.GetName().Name is null + args = args.Any(arg => IsApplicationNameArg(arg)) || assembly is null || assembly.GetName().Name is null ? args : args.Concat(new[] { "--applicationName", assembly.GetName().Name }).ToArray(); From b22823dd9bf2cb2835cc5b699604ce228b92b269 Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Sat, 15 Jun 2024 20:43:03 +0300 Subject: [PATCH 2/5] Update HostFactoryResolver.cs --- .../src/HostFactoryResolver.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs index 6df33986d633f..88f840a8e5ff4 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs @@ -163,9 +163,9 @@ static bool IsApplicationNameArg(string arg) => arg.Equals("--applicationName", StringComparison.OrdinalIgnoreCase) || arg.Equals("/applicationName", StringComparison.OrdinalIgnoreCase); - args = args.Any(arg => IsApplicationNameArg(arg)) || assembly is null || assembly.GetName().Name is null + args = (args.Any(arg => IsApplicationNameArg(arg)) || assembly is null || assembly.GetName().Name is null ? args - : args.Concat(new[] { "--applicationName", assembly.GetName().Name }).ToArray(); + : args.Concat(new[] { "--applicationName", assembly.GetName().Name }).ToArray())!; var host = hostFactory(args); return GetServiceProvider(host); From 67e80312962620e87a950155cae7342ee8673f77 Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Sun, 16 Jun 2024 00:41:53 +0300 Subject: [PATCH 3/5] Update src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs --- .../src/HostFactoryResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs index 88f840a8e5ff4..a04655d7abf84 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs @@ -163,7 +163,7 @@ static bool IsApplicationNameArg(string arg) => arg.Equals("--applicationName", StringComparison.OrdinalIgnoreCase) || arg.Equals("/applicationName", StringComparison.OrdinalIgnoreCase); - args = (args.Any(arg => IsApplicationNameArg(arg)) || assembly is null || assembly.GetName().Name is null + args = (args.Any(arg => IsApplicationNameArg(arg)) || assembly?.GetName().Name is null ? args : args.Concat(new[] { "--applicationName", assembly.GetName().Name }).ToArray())!; From 122a56e7fcc9335546f0f4d6fefa4fbcb3396bce Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Sun, 16 Jun 2024 19:12:49 +0300 Subject: [PATCH 4/5] Update HostFactoryResolver.cs --- .../src/HostFactoryResolver.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs index a04655d7abf84..d0d61c205304f 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs @@ -163,9 +163,8 @@ static bool IsApplicationNameArg(string arg) => arg.Equals("--applicationName", StringComparison.OrdinalIgnoreCase) || arg.Equals("/applicationName", StringComparison.OrdinalIgnoreCase); - args = (args.Any(arg => IsApplicationNameArg(arg)) || assembly?.GetName().Name is null - ? args - : args.Concat(new[] { "--applicationName", assembly.GetName().Name }).ToArray())!; + if (!args.Any(arg => IsApplicationNameArg(arg)) && assembly?.GetName().Name is string assemblyName) + args = args.Concat(new[] { "--applicationName", assemblyName }).ToArray(); var host = hostFactory(args); return GetServiceProvider(host); From 55a9f2872d35c0253858862c7fcb28ddb33adac9 Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Mon, 17 Jun 2024 08:34:07 +0300 Subject: [PATCH 5/5] Update src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs Co-authored-by: Buyaa Namnan --- .../src/HostFactoryResolver.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs index d0d61c205304f..cc8a86d84e1a5 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/HostFactoryResolver.cs @@ -163,8 +163,10 @@ static bool IsApplicationNameArg(string arg) => arg.Equals("--applicationName", StringComparison.OrdinalIgnoreCase) || arg.Equals("/applicationName", StringComparison.OrdinalIgnoreCase); - if (!args.Any(arg => IsApplicationNameArg(arg)) && assembly?.GetName().Name is string assemblyName) + if (!args.Any(arg => IsApplicationNameArg(arg)) && assembly.GetName().Name is string assemblyName) + { args = args.Concat(new[] { "--applicationName", assemblyName }).ToArray(); + } var host = hostFactory(args); return GetServiceProvider(host);