Fix unguarded calls to ServiceDescriptor.ImplementationType for keyed services (#16604)

* Update integration test base class to verify that calls to ServiceDescriptor.ImplementationType are guarded for keyed services

* Fix unguarded calls to ServiceDescriptor.ImplementationType for keyed services

Author: xdjoshuaaz

src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderApiExtensions.cs

@@ -11,7 +11,7 @@ public static class UmbracoBuilderApiExtensions
 {
     public static IUmbracoBuilder AddUmbracoApiOpenApiUI(this IUmbracoBuilder builder)
     {
-        if (builder.Services.Any(x => x.ImplementationType == typeof(OperationIdSelector)))
+        if (builder.Services.Any(x => !x.IsKeyedService && x.ImplementationType == typeof(OperationIdSelector)))
         {
             return builder;
         }

src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderAuthExtensions.cs

@@ -17,7 +17,7 @@ public static class UmbracoBuilderAuthExtensions
 {
     public static IUmbracoBuilder AddUmbracoOpenIddict(this IUmbracoBuilder builder)
     {
-        if (builder.Services.Any(x=>x.ImplementationType == typeof(OpenIddictCleanupJob)) is false)
+        if (builder.Services.Any(x => !x.IsKeyedService && x.ImplementationType == typeof(OpenIddictCleanupJob)) is false)
         {
             ConfigureOpenIddict(builder);
         }

src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilderExtensions.cs

@@ -24,7 +24,7 @@ public static IUmbracoBuilder AddUmbracoManagementApi(this IUmbracoBuilder build
         builder.Services.AddUnique<IConflictingRouteService, ConflictingRouteService>();
         builder.AddUmbracoApiOpenApiUI();
 
-        if (!services.Any(x => x.ImplementationType == typeof(JsonPatchService)))
+        if (!services.Any(x => !x.IsKeyedService && x.ImplementationType == typeof(JsonPatchService)))
         {
             ModelsBuilderBuilderExtensions.AddModelsBuilder(builder)
                 .AddJson()

tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs

@@ -136,6 +136,12 @@ protected void ConfigureServices(IServiceCollection services)
 
         services.AddLogger(webHostEnvironment, Configuration);
 
+        // Register a keyed service to verify that all calls to ServiceDescriptor.ImplementationType
+        // are guarded by checking IsKeyedService first.
+        // Failure to check this when accessing a keyed service descriptor's ImplementationType property
+        // throws a InvalidOperationException.
+        services.AddKeyedSingleton<object>("key");
+
         // Add it!
         var hostingEnvironment = TestHelper.GetHostingEnvironment();
         var typeLoader = services.AddTypeLoader(

tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs

@@ -36,7 +36,7 @@ protected void SetUp()
 
     protected override void ConfigureTestServices(IServiceCollection services) =>
         // SQLite + retry policy makes tests fail, we retry before throwing distributed locking timeout.
-        services.RemoveAll(x => x.ImplementationType == typeof(SqliteAddRetryPolicyInterceptor));
+        services.RemoveAll(x => !x.IsKeyedService && x.ImplementationType == typeof(SqliteAddRetryPolicyInterceptor));
 
     [Test]
     public void SingleReadLockTest()

tests/Umbraco.Tests.Integration/Umbraco.Persistence.EFCore/Scoping/EFCoreLockTests.cs

@@ -23,7 +23,7 @@ public class EFCoreLockTests : UmbracoIntegrationTest
     protected override void ConfigureTestServices(IServiceCollection services)
     {
         // SQLite + retry policy makes tests fail, we retry before throwing distributed locking timeout.
-        services.RemoveAll(x => x.ImplementationType == typeof(SqliteAddRetryPolicyInterceptor));
+        services.RemoveAll(x => !x.IsKeyedService && x.ImplementationType == typeof(SqliteAddRetryPolicyInterceptor));
 
         // Remove all locking implementations to ensure we only use EFCoreDistributedLockingMechanisms
         services.RemoveAll(x => x.ServiceType == typeof(IDistributedLockingMechanism));