Add support for auto-activated keyed singletons #4222

geeknoid · 2023-07-27T21:10:10Z

null

Microsoft Reviewers: Open in CodeFlow

geeknoid · 2023-07-27T21:11:43Z

Tests will fail in this PR until dotnet/runtime#89447 is fixed.

...raries/Microsoft.Extensions.DependencyInjection.AutoActivation.Tests/AcceptanceTest.Keyed.cs

RussKie · 2023-07-30T22:06:47Z

/azp run

azure-pipelines · 2023-07-30T22:06:56Z

Azure Pipelines successfully started running 1 pipeline(s).

RussKie · 2023-07-30T23:01:59Z

We're blocked by dotnet/aspnetcore#49704.

RussKie · 2023-08-03T02:05:05Z

/azp run

azure-pipelines · 2023-08-03T02:05:19Z

Azure Pipelines successfully started running 1 pipeline(s).

RussKie · 2023-08-03T04:17:28Z

Microsoft.Extensions.DependencyInjection.AutoActivation.Tests are failing

xakep139 · 2023-08-03T14:09:24Z

Microsoft.Extensions.DependencyInjection.AutoActivation.Tests are failing

Tests failed because of the same reason: System.InvalidOperationException : This service provider doesn't support keyed services.

xakep139 · 2023-08-03T14:11:05Z

dotnet/aspnetcore#49704 was merged 14 hours ago, I will try to update the repo.

xakep139 · 2023-08-03T14:44:52Z

It seems that the latest build failed: https://dev.azure.com/dnceng/internal/_build/results?buildId=2235253&view=logs&j=316d5c15-0c50-544e-8051-e6b14a1ab674&t=976ed21e-c736-59e1-f431-046bb8d7ebcd

Thus, there's no artifacts to consume on our side yet.

RussKie · 2023-08-04T07:40:12Z

Hopefully #4240 brought the latest changes.

xakep139 · 2023-08-04T08:15:16Z

@geeknoid can you please try to merge main into this branch and see whether it helps?

geeknoid · 2023-08-04T14:10:04Z

@geeknoid can you please try to merge main into this branch and see whether it helps?

Yep, the fundamental issue is fixed. Now I just have to get my own shitty code working :-)

...es/Microsoft.Extensions.DependencyInjection.AutoActivation/AutoActivationExtensions.Keyed.cs

geeknoid · 2023-08-05T05:44:16Z

@xakep139 This PR is finally ready to go...

xakep139 · 2023-08-05T08:37:39Z

...es/Microsoft.Extensions.DependencyInjection.AutoActivation/AutoActivationExtensions.Keyed.cs

+    /// <param name="serviceKey">The <see cref="ServiceDescriptor.ServiceKey"/> of the service.</param>
+    /// <returns>A reference to this instance after the operation has completed.</returns>
+    [Experimental(diagnosticId: Experiments.AutoActivation, UrlFormat = Experiments.UrlFormat)]
+    public static IServiceCollection ActivateKeyed<TService>(


Should we rename it to ActivateKeyedSingleton? All DI-related extension method specify desired lifetime it their name (e.g. AddScoped(), AddTransient(), etc.)

Alternatively, if we don't care about lifetime, we should remove singleton from XML docs

xakep139 · 2023-08-05T08:41:12Z

...es/Microsoft.Extensions.DependencyInjection.AutoActivation/AutoActivationExtensions.Keyed.cs

+    }
+
+    /// <summary>
+    /// Adds an auto-activated singleton service of the type specified in TService with an implementation


Suggested change

/// Adds an auto-activated singleton service of the type specified in TService with an implementation

/// Adds an auto-activated singleton service of the type specified in <c>TService</c> with an implementation

xakep139 · 2023-08-05T08:41:49Z

...es/Microsoft.Extensions.DependencyInjection.AutoActivation/AutoActivationExtensions.Keyed.cs

+
+    /// <summary>
+    /// Adds an auto-activated singleton service of the type specified in TService with an implementation
+    /// type specified in TImplementation using the factory specified in implementationFactory


Suggested change

/// type specified in TImplementation using the factory specified in implementationFactory

/// type specified in <c>TImplementation</c> using the factory specified in <paramref name="implementationFactory"/>

xakep139 · 2023-08-05T08:44:57Z

...es/Microsoft.Extensions.DependencyInjection.AutoActivation/AutoActivationExtensions.Keyed.cs

+    }
+
+    /// <summary>
+    /// Adds an auto-activated singleton service of the type specified in serviceType with a factory


There's no serviceType in this overload

xakep139 · 2023-08-05T08:48:16Z

...es/Microsoft.Extensions.DependencyInjection.AutoActivation/AutoActivationExtensions.Keyed.cs

+    }
+
+    /// <summary>
+    /// Adds an auto-activated singleton service of the type specified in TService with an implementation


Suggested change

/// Adds an auto-activated singleton service of the type specified in TService with an implementation

/// Adds an auto-activated keyed singleton service of the type specified in TService with an implementation

xakep139 · 2023-08-05T08:54:38Z

...raries/Microsoft.Extensions.DependencyInjection.AutoActivation.Tests/AcceptanceTest.Keyed.cs

+                .AddActivatedKeyedSingleton<IFakeService, FakeService>(serviceKey))
+            .StartAsync();
+
+        var service = host.Services.GetKeyedService<IFakeService>(serviceKey);


What if we also check that instanceCount.Counter equals to 1 before we get the service from the provider?

xakep139 · 2023-08-05T08:55:25Z

...raries/Microsoft.Extensions.DependencyInjection.AutoActivation.Tests/AcceptanceTest.Keyed.cs

+                .AddActivatedKeyedSingleton(typeof(IFakeService), serviceKey, typeof(FakeService))
+                .AddActivatedKeyedSingleton<IFactoryService, FactoryService>(serviceKey, (sp, sk) =>
+                {
+                    return new FactoryService(sp.GetKeyedService<IFakeService>(sk)!, sp.GetRequiredService<IFactoryServiceCounter>()!);


Suggested change

return new FactoryService(sp.GetKeyedService<IFakeService>(sk)!, sp.GetRequiredService<IFactoryServiceCounter>()!);

return new FactoryService(sp.GetKeyedService<IFakeService>(sk)!, sp.GetRequiredService<IFactoryServiceCounter>());

xakep139 · 2023-08-05T08:56:14Z

...raries/Microsoft.Extensions.DependencyInjection.AutoActivation.Tests/AcceptanceTest.Keyed.cs

+    }
+
+    [Fact]
+    public async Task ShouldAddAndActivateOnlyOnce_WhenHasChildAsync_Keyed()


Suggested change

public async Task ShouldAddAndActivateOnlyOnce_WhenHasChildAsync_Keyed()

public async Task ShouldAddAndActivateOnlyOnce_WhenHasChild_Keyed()

xakep139 · 2023-08-05T08:56:29Z

...raries/Microsoft.Extensions.DependencyInjection.AutoActivation.Tests/AcceptanceTest.Keyed.cs

+    }
+
+    [Fact]
+    public async Task ShouldResolveComponentsAutomaticallyAsync_Keyed()


Suggested change

public async Task ShouldResolveComponentsAutomaticallyAsync_Keyed()

public async Task ShouldResolveComponentsAutomatically_Keyed()

xakep139 · 2023-08-05T08:57:20Z

...raries/Microsoft.Extensions.DependencyInjection.AutoActivation.Tests/AcceptanceTest.Keyed.cs

+    }
+
+    [Fact]
+    public async Task CanActivateEnumerableAsync_Keyed()


Suggested change

public async Task CanActivateEnumerableAsync_Keyed()

public async Task CanActivateEnumerable_Keyed()

xakep139 · 2023-08-05T08:58:07Z

...raries/Microsoft.Extensions.DependencyInjection.AutoActivation.Tests/AcceptanceTest.Keyed.cs

+        Assert.Equal(0, anotherFakeServiceCount.Counter);
+    }
+
+    // ------------------------------------------------------------------------------


Remove that line?

ghost assigned geeknoid Jul 27, 2023

xakep139 reviewed Jul 28, 2023

View reviewed changes

...raries/Microsoft.Extensions.DependencyInjection.AutoActivation.Tests/AcceptanceTest.Keyed.cs Show resolved Hide resolved

CarnaViire mentioned this pull request Jul 28, 2023

Implement IKeyedServiceProvider interface on ServiceProviderEngineScope dotnet/runtime#89509

Merged

geeknoid force-pushed the geeknoid/keyed branch from 7afdea7 to bb47a31 Compare July 28, 2023 15:46

geeknoid force-pushed the geeknoid/keyed branch 2 times, most recently from ea12738 to 7500a1f Compare August 2, 2023 16:39

geeknoid force-pushed the geeknoid/keyed branch from 7500a1f to 8cadf6f Compare August 4, 2023 13:32

xakep139 reviewed Aug 4, 2023

View reviewed changes

...es/Microsoft.Extensions.DependencyInjection.AutoActivation/AutoActivationExtensions.Keyed.cs Outdated Show resolved Hide resolved

xakep139 reviewed Aug 4, 2023

View reviewed changes

...es/Microsoft.Extensions.DependencyInjection.AutoActivation/AutoActivationExtensions.Keyed.cs Outdated Show resolved Hide resolved

geeknoid force-pushed the geeknoid/keyed branch 3 times, most recently from ad309ad to 2c787ce Compare August 5, 2023 03:14

xakep139 reviewed Aug 5, 2023

View reviewed changes

xakep139 approved these changes Aug 5, 2023

View reviewed changes

geeknoid force-pushed the geeknoid/keyed branch from 2c787ce to 842146c Compare August 5, 2023 14:27

Add support for auto-activated keyed singletons

5da0e9d

geeknoid force-pushed the geeknoid/keyed branch from 842146c to 5da0e9d Compare August 5, 2023 14:33

geeknoid merged commit 0316e5e into main Aug 5, 2023
6 checks passed

geeknoid deleted the geeknoid/keyed branch August 5, 2023 15:15

ghost added this to the 8.0 RC1 milestone Aug 5, 2023

ghost locked as resolved and limited conversation to collaborators Sep 4, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for auto-activated keyed singletons #4222

Add support for auto-activated keyed singletons #4222

geeknoid commented Jul 27, 2023 •

edited by ghost

Loading

geeknoid commented Jul 27, 2023

RussKie commented Jul 30, 2023

azure-pipelines bot commented Jul 30, 2023

RussKie commented Jul 30, 2023

RussKie commented Aug 3, 2023

azure-pipelines bot commented Aug 3, 2023

RussKie commented Aug 3, 2023

xakep139 commented Aug 3, 2023

xakep139 commented Aug 3, 2023

xakep139 commented Aug 3, 2023 •

edited

Loading

RussKie commented Aug 4, 2023

xakep139 commented Aug 4, 2023

geeknoid commented Aug 4, 2023

geeknoid commented Aug 5, 2023

xakep139 Aug 5, 2023 •

edited

Loading

xakep139 Aug 5, 2023

xakep139 Aug 5, 2023

xakep139 Aug 5, 2023

xakep139 Aug 5, 2023

xakep139 Aug 5, 2023

xakep139 Aug 5, 2023

xakep139 Aug 5, 2023

xakep139 Aug 5, 2023

xakep139 Aug 5, 2023

xakep139 Aug 5, 2023

xakep139 Aug 5, 2023

	/// Adds an auto-activated singleton service of the type specified in TService with an implementation
	/// Adds an auto-activated singleton service of the type specified in <c>TService</c> with an implementation

	/// type specified in TImplementation using the factory specified in implementationFactory
	/// type specified in <c>TImplementation</c> using the factory specified in <paramref name="implementationFactory"/>

	/// Adds an auto-activated singleton service of the type specified in TService with an implementation
	/// Adds an auto-activated keyed singleton service of the type specified in TService with an implementation

	return new FactoryService(sp.GetKeyedService<IFakeService>(sk)!, sp.GetRequiredService<IFactoryServiceCounter>()!);
	return new FactoryService(sp.GetKeyedService<IFakeService>(sk)!, sp.GetRequiredService<IFactoryServiceCounter>());

	public async Task ShouldAddAndActivateOnlyOnce_WhenHasChildAsync_Keyed()
	public async Task ShouldAddAndActivateOnlyOnce_WhenHasChild_Keyed()

	public async Task ShouldResolveComponentsAutomaticallyAsync_Keyed()
	public async Task ShouldResolveComponentsAutomatically_Keyed()

	public async Task CanActivateEnumerableAsync_Keyed()
	public async Task CanActivateEnumerable_Keyed()

Add support for auto-activated keyed singletons #4222

Add support for auto-activated keyed singletons #4222

Conversation

geeknoid commented Jul 27, 2023 • edited by ghost Loading

Microsoft Reviewers: Open in CodeFlow

geeknoid commented Jul 27, 2023

RussKie commented Jul 30, 2023

azure-pipelines bot commented Jul 30, 2023

RussKie commented Jul 30, 2023

RussKie commented Aug 3, 2023

azure-pipelines bot commented Aug 3, 2023

RussKie commented Aug 3, 2023

xakep139 commented Aug 3, 2023

xakep139 commented Aug 3, 2023

xakep139 commented Aug 3, 2023 • edited Loading

RussKie commented Aug 4, 2023

xakep139 commented Aug 4, 2023

geeknoid commented Aug 4, 2023

geeknoid commented Aug 5, 2023

xakep139 Aug 5, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

geeknoid commented Jul 27, 2023 •

edited by ghost

Loading

xakep139 commented Aug 3, 2023 •

edited

Loading

xakep139 Aug 5, 2023 •

edited

Loading