[release/2.2] Correct mapping of raw startup classes to their respective features (#18430)

---------

Co-authored-by: Georg von Kries <[email protected]>

Author: github-actions[bot]

src/OrchardCore/OrchardCore/Shell/Builders/ShellContainerFactory.cs

@@ -115,7 +115,9 @@ public async Task<IServiceProvider> CreateContainerAsync(ShellSettings settings,
         // Let any module add custom service descriptors to the tenant.
         foreach (var startup in startups)
         {
-            var feature = blueprint.Dependencies.FirstOrDefault(x => x.Key == startup.GetType()).Value?.FirstOrDefault();
+            // For raw startup classes, use the original type named 'Startup' to find the feature.
+            var startupType = startup is StartupBaseMock mock ? mock.StartupType : startup.GetType();
+            var feature = blueprint.Dependencies.FirstOrDefault(x => x.Key == startupType).Value?.FirstOrDefault();
 
             // If the startup is not coming from an extension, associate it to the application feature.
             // For instance when Startup classes are registered with Configure<Startup>() from the application.

src/OrchardCore/OrchardCore/Shell/Builders/StartupBaseMock.cs

@@ -36,6 +36,8 @@ public StartupBaseMock(
     /// <inheritdoc />
     public override int ConfigureOrder { get; }
 
+    internal Type StartupType => _startup.GetType();
+
     public override void ConfigureServices(IServiceCollection services)
     {
         if (_configureService == null)

test/OrchardCore.Tests/Shell/ShellContainerFactoryTests.cs

@@ -169,6 +169,24 @@ public async Task AssignsTypeToMultipleFeatures()
         Assert.Equal(expectedFeatureInfos, typeFeatureProvider.GetFeaturesForDependency(typeof(TestService)));
     }
 
+    [Fact]
+    public async Task RawStartupIsAssignedToCorrectFeature()
+    {
+        var shellBlueprint = CreateBlueprint();
+
+        var expectedFeatureInfo = AddStartup(shellBlueprint, typeof(Startup));
+
+        var container = (await _shellContainerFactory
+            .CreateContainerAsync(_uninitializedDefaultShell, shellBlueprint))
+            .CreateScope()
+            .ServiceProvider;
+
+        var typeFeatureProvider = _applicationServiceProvider.GetService<ITypeFeatureProvider>();
+
+        Assert.IsType<TestService>(container.GetRequiredService(typeof(ITestService)));
+        Assert.Same(expectedFeatureInfo, typeFeatureProvider.GetFeatureForDependency(typeof(TestService)));
+    }
+
     private static ShellBlueprint CreateBlueprint()
     {
         return new ShellBlueprint
@@ -280,4 +298,15 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<ITwoHostSingletonsOfTheSameType, ShellScopedOfTheSametype>();
         }
     }
+
+    // A raw startup class that is not derived from StartupBase. Must be named Startup.
+    private sealed class Startup
+    {
+#pragma warning disable CA1822 // Mark members as static
+        public void ConfigureServices(IServiceCollection services)
+#pragma warning restore CA1822 // Mark members as static
+        {
+            services.AddScoped<ITestService, TestService>();
+        }
+    }
 }

test/OrchardCore.Tests/Stubs/StubExtensionManager.cs

@@ -27,7 +27,7 @@ public IEnumerable<IFeatureInfo> GetFeatureDependencies(string featureId)
 
     public IEnumerable<IFeatureInfo> GetFeatures()
     {
-        return [];
+        return [new FeatureInfo(GetType().Assembly.GetName().Name, new ExtensionInfo(GetType().Assembly.GetName().Name))];
     }
 
     public IEnumerable<IFeatureInfo> GetFeatures(string[] featureIdsToLoad)