Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 0 additions & 14 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -270,20 +270,6 @@ parameters), you can annotate it with `[ImportingConstructor]` from either NuGet
or .NET MEF ([System.ComponentModel.Composition](https://www.nuget.org/packages/System.ComponentModel.Composition)).


### Customize Generated Class

You can customize the generated class namespace and name with the following
MSBuild properties:

```xml
<PropertyGroup>
<AddServicesNamespace>MyNamespace</AddServicesNamespace>
<AddServicesClassName>MyExtensions</AddServicesClassName>
</PropertyGroup>
```

They default to `Microsoft.Extensions.DependencyInjection` and `AddServicesExtension`
respectively.

<!-- include https://github.com/devlooped/sponsors/raw/main/footer.md -->
# Sponsors
Expand Down
8 changes: 4 additions & 4 deletions src/CodeAnalysis.Tests/AddServicesAnalyzerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static void Main()
{
Sources =
{
ThisAssembly.Resources.AttributedServicesExtension.Text,
ThisAssembly.Resources.AddServicesNoReflectionExtension.Text,
ThisAssembly.Resources.ServiceAttribute.Text,
ThisAssembly.Resources.ServiceAttribute_1.Text,
},
Expand Down Expand Up @@ -89,7 +89,7 @@ public static void Main()
{
Sources =
{
ThisAssembly.Resources.AttributedServicesExtension.Text,
ThisAssembly.Resources.AddServicesNoReflectionExtension.Text,
ThisAssembly.Resources.ServiceAttribute.Text,
ThisAssembly.Resources.ServiceAttribute_1.Text,
},
Expand Down Expand Up @@ -130,7 +130,7 @@ public static void Main()
{
Sources =
{
ThisAssembly.Resources.AttributedServicesExtension.Text,
ThisAssembly.Resources.AddServicesNoReflectionExtension.Text,
ThisAssembly.Resources.ServiceAttribute.Text,
ThisAssembly.Resources.ServiceAttribute_1.Text,
},
Expand Down Expand Up @@ -177,7 +177,7 @@ public static void Main()
{
Sources =
{
ThisAssembly.Resources.AttributedServicesExtension.Text,
ThisAssembly.Resources.AddServicesNoReflectionExtension.Text,
ThisAssembly.Resources.ServiceAttribute.Text,
ThisAssembly.Resources.ServiceAttribute_1.Text,
},
Expand Down
6 changes: 3 additions & 3 deletions src/CodeAnalysis.Tests/ConventionAnalyzerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static void Main()
{
Sources =
{
ThisAssembly.Resources.AttributedServicesExtension.Text,
ThisAssembly.Resources.AddServicesNoReflectionExtension.Text,
ThisAssembly.Resources.ServiceAttribute.Text,
ThisAssembly.Resources.ServiceAttribute_1.Text,
},
Expand Down Expand Up @@ -86,7 +86,7 @@ public static void Main()
{
Sources =
{
ThisAssembly.Resources.AttributedServicesExtension.Text,
ThisAssembly.Resources.AddServicesNoReflectionExtension.Text,
ThisAssembly.Resources.ServiceAttribute.Text,
ThisAssembly.Resources.ServiceAttribute_1.Text,
},
Expand Down Expand Up @@ -133,7 +133,7 @@ public static void Main()
{
Sources =
{
ThisAssembly.Resources.AttributedServicesExtension.Text,
ThisAssembly.Resources.AddServicesNoReflectionExtension.Text,
ThisAssembly.Resources.ServiceAttribute.Text,
ThisAssembly.Resources.ServiceAttribute_1.Text,
},
Expand Down
4 changes: 2 additions & 2 deletions src/DependencyInjection.Tests/ContentFiles.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<!-- Simulates including the files under contentFiles/cs/netstandard2.0 in the final package -->

<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)..\DependencyInjection\AttributedServicesExtension.cs" Link="AttributedServicesExtension.cs" Visible="false" />
<Compile Include="$(MSBuildThisFileDirectory)..\DependencyInjection\AddServicesNoReflectionExtension.cs" Link="AddServicesNoReflectionExtension.cs" Visible="false" />
<Compile Include="$(MSBuildThisFileDirectory)..\DependencyInjection\ServiceAttribute.cs" Link="ServiceAttribute.cs" Visible="false" />
<Compile Include="$(MSBuildThisFileDirectory)..\DependencyInjection\ServiceAttribute`1.cs" Link="ServiceAttribute`1.cs" Visible="false" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)..\DependencyInjection\AttributedServicesExtension.cs" Type="Non-Resx" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)..\DependencyInjection\AddServicesNoReflectionExtension.cs" Type="Non-Resx" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)..\DependencyInjection\ServiceAttribute.cs" Type="Non-Resx" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)..\DependencyInjection\ServiceAttribute`1.cs" Type="Non-Resx" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Microsoft.Extensions.DependencyInjection
/// compile-time discovered services to an <see cref="IServiceCollection"/>.
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
static partial class AttributedServicesExtension
static partial class AddServicesNoReflectionExtension
{
static readonly ServiceDescriptor servicesAddedDescriptor = new ServiceDescriptor(typeof(DDIAddServicesAttribute), _ => new DDIAddServicesAttribute(), ServiceLifetime.Singleton);

Expand Down
2 changes: 1 addition & 1 deletion src/DependencyInjection/DependencyInjection.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ItemGroup>
<None Update="Devlooped.Extensions.DependencyInjection.props" CopyToOutputDirectory="PreserveNewest" PackFolder="buildTransitive" />
<None Update="Devlooped.Extensions.DependencyInjection.targets" CopyToOutputDirectory="PreserveNewest" PackFolder="buildTransitive" />
<Compile Update="AttributedServicesExtension.cs" Pack="true" />
<Compile Update="AddServicesNoReflectionExtension.cs" Pack="true" />
<Compile Update="ServiceAttribute*.cs" Pack="true" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/DependencyInjection/IncrementalGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ void AddPartial(string methodName, SourceProductionContext ctx, (ImmutableArray<

namespace Microsoft.Extensions.DependencyInjection
{
static partial class AttributedServicesExtension
static partial class AddServicesNoReflectionExtension
{
static partial void {{methodName}}Services(IServiceCollection services)
{
Expand Down