Address PR feedback

khellang · Sep 1, 2023 · ae79699 · ae79699
1 parent 33f606d
commit ae79699
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Setup .NET 8 SDK
               uses: actions/setup-dotnet@v3

diff --git a/src/Scrutor/ServiceCollectionExtensions.Decoration.cs b/src/Scrutor/ServiceCollectionExtensions.Decoration.cs
@@ -292,8 +292,7 @@ public static bool TryDecorate(this IServiceCollection services, DecorationStrat
         return null;
     }
 
-    private static bool IsDecorated(ServiceDescriptor descriptor)
-    {
-        return descriptor.ServiceKey is string stringKey && stringKey.EndsWith(DecoratedServiceKeySuffix);
-    }
+    private static bool IsDecorated(ServiceDescriptor descriptor) =>
+        descriptor.ServiceKey is string stringKey
+            && stringKey.EndsWith(DecoratedServiceKeySuffix, StringComparison.Ordinal);
 }
diff --git a/src/Scrutor/ServiceDescriptorExtensions.cs b/src/Scrutor/ServiceDescriptorExtensions.cs
@@ -42,7 +42,8 @@ public static ServiceDescriptor WithServiceKey(this ServiceDescriptor descriptor
 
         if (descriptor.ImplementationFactory is not null)
         {
-            return new ServiceDescriptor(descriptor.ServiceType, serviceKey, (sp, key) => descriptor.ImplementationFactory(sp), descriptor.Lifetime);
+            var factory = descriptor.ImplementationFactory; // Local to avoid capturing descriptor in lambda below.
+            return new ServiceDescriptor(descriptor.ServiceType, serviceKey, (sp, key) => factory(sp), descriptor.Lifetime);
         }
 
         throw new InvalidOperationException($"One of the following properties must be set: {nameof(ServiceDescriptor.ImplementationType)}, {nameof(ServiceDescriptor.ImplementationInstance)} or {nameof(ServiceDescriptor.ImplementationFactory)}");