Register Dapr services in keyed-compatible manner

src/Dapr.AspNetCore/DaprMvcBuilderExtensions.cs

@@ -21,6 +21,7 @@ namespace Microsoft.Extensions.DependencyInjection
     using Dapr.Client;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.ApplicationModels;
+    using Microsoft.Extensions.DependencyInjection.Extensions;
 
     /// <summary>
     /// Provides extension methods for <see cref="IMvcBuilder" />.
@@ -40,27 +41,19 @@ public static IMvcBuilder AddDapr(this IMvcBuilder builder, Action<DaprClientBui
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            // This pattern prevents registering services multiple times in the case AddDapr is called
-            // by non-user-code.
-            if (builder.Services.Any(s => s.ImplementationType == typeof(DaprMvcMarkerService)))
-            {
-                return builder;
-            }
-
             builder.Services.AddDaprClient(configureClient);
 
-            builder.Services.AddSingleton<DaprMvcMarkerService>();
-            builder.Services.AddSingleton<IApplicationModelProvider, StateEntryApplicationModelProvider>();
+            builder.Services.TryAddSingleton<IApplicationModelProvider, StateEntryApplicationModelProvider>();
+
             builder.Services.Configure<MvcOptions>(options =>
             {
-                options.ModelBinderProviders.Insert(0, new StateEntryModelBinderProvider());
+                if (!options.ModelBinderProviders.Any(p => p is StateEntryModelBinderProvider))
+                {
+                    options.ModelBinderProviders.Insert(0, new StateEntryModelBinderProvider());
+                }
             });
 
             return builder;
         }
-
-        private class DaprMvcMarkerService
-        {
-        }
     }
 }

src/Dapr.AspNetCore/DaprServiceCollectionExtensions.cs

@@ -36,15 +36,6 @@ public static void AddDaprClient(this IServiceCollection services, Action<DaprCl
                 throw new ArgumentNullException(nameof(services));
             }
 
-            // This pattern prevents registering services multiple times in the case AddDaprClient is called
-            // by non-user-code.
-            if (services.Any(s => s.ImplementationType == typeof(DaprClientMarkerService)))
-            {
-                return;
-            }
-
-            services.AddSingleton<DaprClientMarkerService>();
-
             services.TryAddSingleton(_ =>
             {
                 var builder = new DaprClientBuilder();
@@ -56,9 +47,5 @@ public static void AddDaprClient(this IServiceCollection services, Action<DaprCl
                 return builder.Build();
             });
         }
-
-        private class DaprClientMarkerService
-        {
-        }
     }
 }

test/Dapr.AspNetCore.Test/DaprMvcBuilderExtensionsTest.cs

@@ -84,5 +84,23 @@ public void AddDapr_RegistersDaprOnlyOnce()
 
             Assert.False(daprClient.JsonSerializerOptions.PropertyNameCaseInsensitive);
         }
+
+#if NET8_0_OR_GREATER
+        [Fact]
+        public void AddDapr_WithKeyedServices()
+        {
+            var services = new ServiceCollection();
+
+            services.AddKeyedSingleton("key1", new Object());
+
+            services.AddControllers().AddDapr();
+
+            var serviceProvider = services.BuildServiceProvider();
+
+            var daprClient = serviceProvider.GetService<DaprClient>();
+
+            Assert.NotNull(daprClient);
+        }
+#endif
     }
 }

test/Dapr.AspNetCore.Test/DaprServiceCollectionExtensionsTest.cs

@@ -47,5 +47,23 @@ public void AddDaprClient_RegistersDaprClientOnlyOnce()
 
             Assert.True(daprClient.JsonSerializerOptions.PropertyNameCaseInsensitive);
         }
+
+#if NET8_0_OR_GREATER
+        [Fact]
+        public void AddDaprClient_WithKeyedServices()
+        {
+            var services = new ServiceCollection();
+
+            services.AddKeyedSingleton("key1", new Object());
+
+            services.AddDaprClient();
+
+            var serviceProvider = services.BuildServiceProvider();
+
+            var daprClient = serviceProvider.GetService<DaprClient>();
+
+            Assert.NotNull(daprClient);
+        }
+#endif
     }
 }