From 634c0a063c914b03a1729e320f889adc70b9bb38 Mon Sep 17 00:00:00 2001
From: Vladimir Pecanac <vladimir.pecanac@gmail.com>
Date: Sat, 15 Aug 2026 17:22:27 +0200
Subject: [PATCH] IntroductionToScrutorInDotNet: retarget net10.0, bump Scrutor
 to 7.0.0, add pitfalls tests

Scrutor 7.0.0 removed FromCallingAssembly(); switch both scans to
FromAssembliesOf(typeof(Program)). Bump all packages to current versions.
Add ScrutorPitfallsTests covering duplicate-scan append, RegistrationStrategy.Skip,
default transient lifetime, DecorationException on unregistered decorate, and
open-generic decoration of the scanned repository.
---
 ...oductionToScrutorInDotNet.Customers.csproj |  2 +-
 .../IntroductionToScrutorInDotNet.csproj      |  8 +-
 .../IntroductionToScrutorInDotNet/Program.cs  |  4 +-
 .../Tests/ScrutorPitfallsTests.cs             | 85 +++++++++++++++++++
 .../Tests/Tests.csproj                        | 13 +--
 5 files changed, 99 insertions(+), 13 deletions(-)
 create mode 100644 dependency-injection-tools/IntroductionToScrutorInDotNet/Tests/ScrutorPitfallsTests.cs

diff --git a/dependency-injection-tools/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet.Customers/IntroductionToScrutorInDotNet.Customers.csproj b/dependency-injection-tools/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet.Customers/IntroductionToScrutorInDotNet.Customers.csproj
index 6836c6808f..e0ad4b5540 100644
--- a/dependency-injection-tools/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet.Customers/IntroductionToScrutorInDotNet.Customers.csproj
+++ b/dependency-injection-tools/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet.Customers/IntroductionToScrutorInDotNet.Customers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/dependency-injection-tools/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet.csproj b/dependency-injection-tools/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet.csproj
index 47db4ffab3..c63dfc5e42 100644
--- a/dependency-injection-tools/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet.csproj
+++ b/dependency-injection-tools/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.7" />
-    <PackageReference Include="Scrutor" Version="4.2.2" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.11" />
+    <PackageReference Include="Scrutor" Version="7.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="10.2.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/dependency-injection-tools/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet/Program.cs b/dependency-injection-tools/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet/Program.cs
index ac49e4ca63..c41b6c8ad7 100644
--- a/dependency-injection-tools/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet/Program.cs
+++ b/dependency-injection-tools/IntroductionToScrutorInDotNet/IntroductionToScrutorInDotNet/Program.cs
@@ -7,7 +7,7 @@
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.Scan(selector => selector
-    .FromCallingAssembly()
+    .FromAssembliesOf(typeof(Program))
     .AddClasses(
         classSelector =>
             classSelector.InNamespaces("IntroductionToScrutorInDotNet.Services.Implementations")
@@ -24,7 +24,7 @@
 );
 
 builder.Services.Scan(selector => selector
-    .FromCallingAssembly()
+    .FromAssembliesOf(typeof(Program))
     .AddClasses(classSelector => classSelector.AssignableTo(typeof(IRepository<>)))
     .UsingRegistrationStrategy(RegistrationStrategy.Skip)
     .AsImplementedInterfaces());
diff --git a/dependency-injection-tools/IntroductionToScrutorInDotNet/Tests/ScrutorPitfallsTests.cs b/dependency-injection-tools/IntroductionToScrutorInDotNet/Tests/ScrutorPitfallsTests.cs
new file mode 100644
index 0000000000..76aa5d9171
--- /dev/null
+++ b/dependency-injection-tools/IntroductionToScrutorInDotNet/Tests/ScrutorPitfallsTests.cs
@@ -0,0 +1,85 @@
+using IntroductionToScrutorInDotNet.Entities;
+using IntroductionToScrutorInDotNet.Repositories;
+using IntroductionToScrutorInDotNet.Repositories.Decorators;
+using IntroductionToScrutorInDotNet.Repositories.Implementations;
+using Microsoft.Extensions.DependencyInjection;
+using Scrutor;
+
+namespace Tests;
+
+public class ScrutorPitfallsTests
+{
+    private static ServiceCollection ScanRepositories(RegistrationStrategy? strategy = null)
+    {
+        var services = new ServiceCollection();
+        services.Scan(selector => selector
+            .FromAssembliesOf(typeof(UserRepository))
+            .AddClasses(classSelector => classSelector.AssignableTo(typeof(IRepository<>)))
+            .UsingRegistrationStrategy(strategy ?? RegistrationStrategy.Append)
+            .AsImplementedInterfaces());
+        return services;
+    }
+
+    [Fact]
+    public void GivenTwoScans_WhenAppending_ThenRegistrationIsDuplicated()
+    {
+        var services = ScanRepositories();
+        services.Scan(selector => selector
+            .FromAssembliesOf(typeof(UserRepository))
+            .AddClasses(classSelector => classSelector.AssignableTo(typeof(IRepository<>)))
+            .AsImplementedInterfaces());
+
+        var count = services.Count(descriptor => descriptor.ServiceType == typeof(IRepository<User>));
+
+        Assert.Equal(2, count);
+    }
+
+    [Fact]
+    public void GivenTwoScans_WhenUsingSkipStrategy_ThenRegistrationIsNotDuplicated()
+    {
+        var services = ScanRepositories(RegistrationStrategy.Skip);
+        services.Scan(selector => selector
+            .FromAssembliesOf(typeof(UserRepository))
+            .AddClasses(classSelector => classSelector.AssignableTo(typeof(IRepository<>)))
+            .UsingRegistrationStrategy(RegistrationStrategy.Skip)
+            .AsImplementedInterfaces());
+
+        var count = services.Count(descriptor => descriptor.ServiceType == typeof(IRepository<User>));
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    public void GivenScannedRegistration_WhenLifetimeIsNotSpecified_ThenItIsTransient()
+    {
+        var services = ScanRepositories();
+
+        var descriptor = services.First(d => d.ServiceType == typeof(IRepository<User>));
+
+        Assert.Equal(ServiceLifetime.Transient, descriptor.Lifetime);
+    }
+
+    [Fact]
+    public void GivenNoPriorRegistration_WhenDecorating_ThenDecorationExceptionIsThrown()
+    {
+        var services = new ServiceCollection();
+
+        var exception = Assert.Throws<DecorationException>(() =>
+            services.Decorate<IRepository<User>, RepositoryLoggerDecorator<User>>());
+
+        Assert.Contains("Could not find any registered services", exception.Message);
+    }
+
+    [Fact]
+    public void GivenScannedRepository_WhenDecoratingTheOpenGeneric_ThenTheDecoratorResolves()
+    {
+        var services = ScanRepositories();
+
+        services.Decorate(typeof(IRepository<>), typeof(RepositoryLoggerDecorator<>));
+
+        var provider = services.BuildServiceProvider();
+        var resolved = provider.GetRequiredService<IRepository<User>>();
+
+        Assert.IsType<RepositoryLoggerDecorator<User>>(resolved);
+    }
+}
diff --git a/dependency-injection-tools/IntroductionToScrutorInDotNet/Tests/Tests.csproj b/dependency-injection-tools/IntroductionToScrutorInDotNet/Tests/Tests.csproj
index 2690e1934e..b02aba6a88 100644
--- a/dependency-injection-tools/IntroductionToScrutorInDotNet/Tests/Tests.csproj
+++ b/dependency-injection-tools/IntroductionToScrutorInDotNet/Tests/Tests.csproj
@@ -1,22 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.9" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.11" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="10.0.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>