Fix ServiceDescriptor.DebuggerToString()

dotnet · Jul 5, 2023 · 17b9312 · 17b9312
1 parent 72b2b5d
commit 17b9312
Showing 1 changed file with 26 additions and 7 deletions.
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ServiceDescriptor.cs b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ServiceDescriptor.cs
@@ -1012,17 +1012,36 @@ private string DebuggerToString()
             string debugText = $@"Lifetime = {Lifetime}, ServiceType = ""{ServiceType.FullName}""";
 
             // Either implementation type, factory or instance is set.
-            if (ImplementationType != null)
-            {
-                debugText += $@", ImplementationType = ""{ImplementationType.FullName}""";
-            }
-            else if (ImplementationFactory != null)
+            if (IsKeyedService)
             {
-                debugText += $@", ImplementationFactory = {ImplementationFactory.Method}";
+                debugText += $@", ServiceKey = ""{ServiceKey}""";
+                if (KeyedImplementationType != null)
+                {
+                    debugText += $@", KeyedImplementationType = ""{KeyedImplementationType.FullName}""";
+                }
+                else if (KeyedImplementationFactory != null)
+                {
+                    debugText += $@", KeyedImplementationFactory = {KeyedImplementationFactory.Method}";
+                }
+                else
+                {
+                    debugText += $@", KeyedImplementationInstance = {KeyedImplementationInstance}";
+                }
             }
             else
             {
-                debugText += $@", ImplementationInstance = {ImplementationInstance}";
+                if (ImplementationType != null)
+                {
+                    debugText += $@", ImplementationType = ""{ImplementationType.FullName}""";
+                }
+                else if (ImplementationFactory != null)
+                {
+                    debugText += $@", ImplementationFactory = {ImplementationFactory.Method}";
+                }
+                else
+                {
+                    debugText += $@", ImplementationInstance = {ImplementationInstance}";
+                }
             }
 
             return debugText;