Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revive M.E.DependencyInjection.AutoActivation #4181

Merged
merged 1 commit into from
Jul 18, 2023
Merged

Revive M.E.DependencyInjection.AutoActivation #4181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...icrosoft.AspNetCore.Telemetry.Middleware/Microsoft.AspNetCore.Telemetry.Middleware.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\ToBeMoved\DependencyInjection.AutoActivation\DependencyInjection.AutoActivation.csproj" />
<ProjectReference Include="..\..\Libraries\Microsoft.Extensions.DependencyInjection.AutoActivation\Microsoft.Extensions.DependencyInjection.AutoActivation.csproj" />
<ProjectReference Include="..\Microsoft.Extensions.Compliance.Abstractions\Microsoft.Extensions.Compliance.Abstractions.csproj" />
<ProjectReference Include="..\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj" />
<ProjectReference Include="..\Microsoft.AspNetCore.Telemetry\Microsoft.AspNetCore.Telemetry.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/Microsoft.Extensions.AsyncState/Microsoft.Extensions.AsyncState.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\ToBeMoved\DependencyInjection.AutoActivation\DependencyInjection.AutoActivation.csproj" />
<ProjectReference Include="..\..\Libraries\Microsoft.Extensions.DependencyInjection.AutoActivation\Microsoft.Extensions.DependencyInjection.AutoActivation.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...icrosoft.Extensions.Compliance.Redaction/Microsoft.Extensions.Compliance.Redaction.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<ItemGroup>
<ProjectReference Include="..\Microsoft.Extensions.Compliance.Abstractions\Microsoft.Extensions.Compliance.Abstractions.csproj" />
<ProjectReference Include="..\..\ToBeMoved\DependencyInjection.AutoActivation\DependencyInjection.AutoActivation.csproj" />
<ProjectReference Include="..\..\Libraries\Microsoft.Extensions.DependencyInjection.AutoActivation\Microsoft.Extensions.DependencyInjection.AutoActivation.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
20 changes: 11 additions & 9 deletions ...utoActivation/AutoActivationExtensions.cs → ...utoActivation/AutoActivationExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static IServiceCollection Activate<TService>(this IServiceCollection serv
}

/// <summary>
/// Adds an autoactivated singleton service of the type specified in TService with an implementation
/// 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
/// to the specified <see cref="IServiceCollection"/>.
/// </summary>
Expand All @@ -50,7 +50,7 @@ public static IServiceCollection AddActivatedSingleton<TService, TImplementation
}

/// <summary>
/// Adds an autoactivated singleton service of the type specified in TService with a factory specified
/// Adds an auto-activated singleton service of the type specified in TService with a factory specified
/// in implementationFactory to the specified <see cref="IServiceCollection"/>.
/// </summary>
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
Expand All @@ -64,7 +64,7 @@ public static IServiceCollection AddActivatedSingleton<TService>(this IServiceCo
}

/// <summary>
/// Adds an autoactivated singleton service of the type specified in TService to the specified <see cref="IServiceCollection"/>.
/// Adds an auto-activated singleton service of the type specified in TService to the specified <see cref="IServiceCollection"/>.
/// </summary>
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
/// <typeparam name="TService">The type of the service to add.</typeparam>
Expand Down Expand Up @@ -140,7 +140,7 @@ public static IServiceCollection AddActivatedSingleton(this IServiceCollection s
}

/// <summary>
/// Adds an autoactivated singleton service of the type specified in serviceType to the specified
/// Adds an auto-activated singleton service of the type specified in serviceType to the specified
/// <see cref="IServiceCollection"/> if the service type hasn't already been registered.
/// </summary>
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
Expand All @@ -154,7 +154,7 @@ public static void TryAddActivatedSingleton(this IServiceCollection services, Ty
}

/// <summary>
/// Adds an autoactivated singleton service of the type specified in serviceType with an implementation
/// Adds an auto-activated singleton service of the type specified in serviceType with an implementation
/// of the type specified in implementationType to the specified <see cref="IServiceCollection"/>
/// if the service type hasn't already been registered.
/// </summary>
Expand All @@ -171,7 +171,7 @@ public static void TryAddActivatedSingleton(this IServiceCollection services, Ty
}

/// <summary>
/// Adds an autoactivated singleton service of the type specified in serviceType with a factory
/// Adds an auto-activated singleton service of the type specified in serviceType with a factory
/// specified in implementationFactory to the specified <see cref="IServiceCollection"/>
/// if the service type hasn't already been registered.
/// </summary>
Expand All @@ -188,7 +188,7 @@ public static void TryAddActivatedSingleton(this IServiceCollection services, Ty
}

/// <summary>
/// Adds an autoactivated singleton service of the type specified in TService
/// Adds an auto-activated singleton service of the type specified in TService
/// to the specified <see cref="IServiceCollection"/>
/// if the service type hasn't already been registered.
/// </summary>
Expand All @@ -203,7 +203,7 @@ public static void TryAddActivatedSingleton<TService>(this IServiceCollection se
}

/// <summary>
/// Adds an autoactivated singleton service of the type specified in TService with an implementation
/// 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
/// to the specified <see cref="IServiceCollection"/>
/// if the service type hasn't already been registered.
Expand All @@ -221,7 +221,7 @@ public static void TryAddActivatedSingleton<TService, TImplementation>(this ISer
}

/// <summary>
/// Adds an autoactivated singleton service of the type specified in serviceType with a factory
/// Adds an auto-activated singleton service of the type specified in serviceType with a factory
/// specified in implementationFactory to the specified <see cref="IServiceCollection"/>
/// if the service type hasn't already been registered.
/// </summary>
Expand Down Expand Up @@ -276,6 +276,8 @@ private static IServiceCollection Activate(this IServiceCollection services, [Dy
return services;
}

// exclude from coverage until https://github.com/microsoft/codecoverage/issues/38 is addressed
[ExcludeFromCodeCoverage]
private static IServiceCollection AddHostedServiceIfNotExist(this IServiceCollection services)
{
#if NETFRAMEWORK
geeknoid marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
0 ...Activation/AutoActivationHostedService.cs → ...Activation/AutoActivationHostedService.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...on.AutoActivation/AutoActivatorOptions.cs → ...on.AutoActivation/AutoActivatorOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ namespace Microsoft.Extensions.DependencyInjection;

internal sealed class AutoActivatorOptions
{
public HashSet<Type> AutoActivators { get; } = new HashSet<Type>();
public HashSet<Type> AutoActivators { get; } = new();
}
5 changes: 0 additions & 5 deletions ...DependencyInjection.AutoActivation.csproj → ...DependencyInjection.AutoActivation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>Microsoft.Extensions.DependencyInjection.AutoActivation</AssemblyName>
<RootNamespace>Microsoft.Extensions.DependencyInjection</RootNamespace>
<Description>Extensions to auto-activate registered singletons in the dependency injection system.</Description>
<Workstream>Fundamentals</Workstream>
<Category>Dependency Injection</Category>
</PropertyGroup>

<PropertyGroup>
<Stage>normal</Stage>
<TempMinCodeCoverage>66</TempMinCodeCoverage>
<MinCodeCoverage>100</MinCodeCoverage>
<MinMutationScore>100</MinMutationScore>
</PropertyGroup>
Expand All @@ -23,5 +19,4 @@
<ItemGroup>
<InternalsVisibleToTest Include="$(AssemblyName).Tests" />
</ItemGroup>

</Project>
67 changes: 67 additions & 0 deletions ...encyInjection.AutoActivation/Microsoft.Extensions.DependencyInjection.AutoActivation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{
"Name": "Microsoft.Extensions.DependencyInjection.AutoActivation, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35",
"Types": [
{
"Type": "static class Microsoft.Extensions.DependencyInjection.AutoActivationExtensions",
"Stage": "Stable",
"Methods": [
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.Activate<TService>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.AddActivatedSingleton<TService, TImplementation>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Func<System.IServiceProvider, TImplementation> implementationFactory);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.AddActivatedSingleton<TService>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Func<System.IServiceProvider, TService> implementationFactory);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.AddActivatedSingleton<TService>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.AddActivatedSingleton(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Type serviceType);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.AddActivatedSingleton<TService, TImplementation>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.AddActivatedSingleton(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Type serviceType, System.Func<System.IServiceProvider, object> implementationFactory);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.AddActivatedSingleton(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Type serviceType, System.Type implementationType);",
"Stage": "Stable"
},
{
"Member": "static void Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.TryAddActivatedSingleton(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Type serviceType);",
"Stage": "Stable"
},
{
"Member": "static void Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.TryAddActivatedSingleton(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Type serviceType, System.Type implementationType);",
"Stage": "Stable"
},
{
"Member": "static void Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.TryAddActivatedSingleton(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Type serviceType, System.Func<System.IServiceProvider, object> implementationFactory);",
"Stage": "Stable"
},
{
"Member": "static void Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.TryAddActivatedSingleton<TService>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);",
"Stage": "Stable"
},
{
"Member": "static void Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.TryAddActivatedSingleton<TService, TImplementation>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);",
"Stage": "Stable"
},
{
"Member": "static void Microsoft.Extensions.DependencyInjection.AutoActivationExtensions.TryAddActivatedSingleton<TService>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Func<System.IServiceProvider, TService> implementationFactory);",
"Stage": "Stable"
}
]
}
]
}
2 changes: 1 addition & 1 deletion ...Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<ItemGroup>
<ProjectReference Include="..\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj" />
<ProjectReference Include="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
<ProjectReference Include="..\..\ToBeMoved\DependencyInjection.AutoActivation\DependencyInjection.AutoActivation.csproj" />
<ProjectReference Include="..\..\Libraries\Microsoft.Extensions.DependencyInjection.AutoActivation\Microsoft.Extensions.DependencyInjection.AutoActivation.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/Microsoft.Extensions.Http.Telemetry/Microsoft.Extensions.Http.Telemetry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\ToBeMoved\DependencyInjection.AutoActivation\DependencyInjection.AutoActivation.csproj" />
<ProjectReference Include="..\..\Libraries\Microsoft.Extensions.DependencyInjection.AutoActivation\Microsoft.Extensions.DependencyInjection.AutoActivation.csproj" />
<ProjectReference Include="..\Microsoft.Extensions.Telemetry\Microsoft.Extensions.Telemetry.csproj" />
<ProjectReference Include="..\Microsoft.Extensions.EnumStrings\Microsoft.Extensions.EnumStrings.csproj" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\ToBeMoved\DependencyInjection.AutoActivation\DependencyInjection.AutoActivation.csproj" />
<ProjectReference Include="..\..\Libraries\Microsoft.Extensions.DependencyInjection.AutoActivation\Microsoft.Extensions.DependencyInjection.AutoActivation.csproj" />
<ProjectReference Include="..\Microsoft.Extensions.AmbientMetadata.Application\Microsoft.Extensions.AmbientMetadata.Application.csproj" />
<ProjectReference Include="..\Microsoft.Extensions.Compliance.Abstractions\Microsoft.Extensions.Compliance.Abstractions.csproj" />
<ProjectReference Include="..\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,4 +636,4 @@
]
}
]
}
}
0 ...on.AutoActivation.Tests/AcceptanceTest.cs → ...on.AutoActivation.Tests/AcceptanceTest.cs
View file
Open in desktop
File renamed without changes.
0 ...on.Tests/AutoActivationExtensionsTests.cs → ...on.Tests/AutoActivationExtensionsTests.cs
View file
Open in desktop
File renamed without changes.
0 ...Tests/AutoActivationHostedServiceTests.cs → ...Tests/AutoActivationHostedServiceTests.cs
View file
Open in desktop
File renamed without changes.
0 ...ivation.Tests/Fakes/AnotherFakeService.cs → ...ivation.Tests/Fakes/AnotherFakeService.cs
View file
Open in desktop
File renamed without changes.
0 ...ivation.Tests/Fakes/DifferentPocoClass.cs → ...ivation.Tests/Fakes/DifferentPocoClass.cs
View file
Open in desktop
File renamed without changes.
0 ...oActivation.Tests/Fakes/FactoryService.cs → ...oActivation.Tests/Fakes/FactoryService.cs
View file
Open in desktop
File renamed without changes.
0 ...ion.Tests/Fakes/FakeOneMultipleService.cs → ...ion.Tests/Fakes/FakeOneMultipleService.cs
View file
Open in desktop
File renamed without changes.
0 ...ion.Tests/Fakes/FakeOpenGenericService.cs → ...ion.Tests/Fakes/FakeOpenGenericService.cs
View file
Open in desktop
File renamed without changes.
0 ...AutoActivation.Tests/Fakes/FakeService.cs → ...AutoActivation.Tests/Fakes/FakeService.cs
View file
Open in desktop
File renamed without changes.
0 ...Activation.Tests/Fakes/IFactoryService.cs → ...Activation.Tests/Fakes/IFactoryService.cs
View file
Open in desktop
File renamed without changes.
0 ...ation.Tests/Fakes/IFakeMultipleService.cs → ...ation.Tests/Fakes/IFakeMultipleService.cs
View file
Open in desktop
File renamed without changes.
0 ...on.Tests/Fakes/IFakeOpenGenericService.cs → ...on.Tests/Fakes/IFakeOpenGenericService.cs
View file
Open in desktop
File renamed without changes.
0 ...utoActivation.Tests/Fakes/IFakeService.cs → ...utoActivation.Tests/Fakes/IFakeService.cs
View file
Open in desktop
File renamed without changes.
0 ...n.AutoActivation.Tests/Fakes/PocoClass.cs → ...n.AutoActivation.Tests/Fakes/PocoClass.cs
View file
Open in desktop
File renamed without changes.
0 ...ests/Helpers/AnotherFakeServiceCounter.cs → ...ests/Helpers/AnotherFakeServiceCounter.cs
View file
Open in desktop
File renamed without changes.
0 ...sts/Helpers/IAnotherFakeServiceCounter.cs → ...sts/Helpers/IAnotherFakeServiceCounter.cs
View file
Open in desktop
File renamed without changes.
0 ...n.Tests/Helpers/IFactoryServiceCounter.cs → ...n.Tests/Helpers/IFactoryServiceCounter.cs
View file
Open in desktop
File renamed without changes.
0 ...ion.Tests/Helpers/IFakeMultipleCounter.cs → ...ion.Tests/Helpers/IFakeMultipleCounter.cs
View file
Open in desktop
File renamed without changes.
0 ....Tests/Helpers/IFakeOpenGenericCounter.cs → ....Tests/Helpers/IFakeOpenGenericCounter.cs
View file
Open in desktop
File renamed without changes.
0 ...tion.Tests/Helpers/IFakeServiceCounter.cs → ...tion.Tests/Helpers/IFakeServiceCounter.cs
View file
Open in desktop
File renamed without changes.
0 ....Tests/Helpers/InstanceCreatingCounter.cs → ....Tests/Helpers/InstanceCreatingCounter.cs
View file
Open in desktop
File renamed without changes.
10 changes: 6 additions & 4 deletions ...encyInjection.AutoActivation.Tests.csproj → ...encyInjection.AutoActivation.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>Microsoft.Extensions.DependencyInjection.AutoActivation.Tests</AssemblyName>
<RootNamespace>Microsoft.Extensions.DependencyInjection.Test</RootNamespace>
<Description>Tests for Microsoft.Extensions.DependencyInjection.AutoActivation</Description>
<Description>Unit tests for Microsoft.Extensions.DependencyInjection.AutoActivation.</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" />
<ProjectReference Include="..\..\..\src\ToBeMoved\DependencyInjection.AutoActivation\DependencyInjection.AutoActivation.csproj" ProjectUnderTest="true" />
<ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.DependencyInjection.AutoActivation\Microsoft.Extensions.DependencyInjection.AutoActivation.csproj" ProjectUnderTest="true" />
<ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.Hosting.Testing\Microsoft.Extensions.Hosting.Testing.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" />
</ItemGroup>
</Project>