Skip to content

Commit 8c4ca81

Browse files
futurum-devfuturum-dev
authored
Merge pull request #44 from futurum-dev/feature/Futurum.Microsoft.Extensions.DependencyInjection-reuse
Futurum.Microsoft.Extensions.DependencyInjection - reuse
2 parents c38b0d1 + f8b6f96 commit 8c4ca81

File tree

7 files changed

+7
-28
lines changed

7 files changed

+7
-28
lines changed

‎sample/Futurum.WebApiEndpoint.Micro.Sample/Futurum.WebApiEndpoint.Micro.Sample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Futurum.Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
15+
<PackageReference Include="Futurum.Microsoft.Extensions.DependencyInjection" Version="2.0.1" />
1616
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
1717
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
1818
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0" />

‎src/Futurum.WebApiEndpoint.Micro.Generator/WebApiVersionEndpointRegistrationWriter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private static void Write(IndentedStringBuilder codeBuilder, IEnumerable<WebApiV
2626
version = $"((global::Asp.Versioning.ApiVersion)new global::Futurum.WebApiEndpoint.Micro.WebApiEndpointVersion(new global::Futurum.WebApiEndpoint.Micro.Generator.WebApiEndpointApiVersion.WebApiEndpointStringApiVersion(\"{webApiEndpointStringApiVersion.Version}\"))).ToString()";
2727
}
2828

29-
codeBuilder.AppendLine($"global::Futurum.WebApiEndpoint.Micro.ServiceCollectionUniqueKeyExtensions.TryAddEquatableKeyedSingleton(serviceCollection, typeof(global::Futurum.WebApiEndpoint.Micro.IWebApiVersionEndpoint), {version}, typeof({webApiVersionEndpointDatum.NamespaceName}.{webApiVersionEndpointDatum.ImplementationType}));");
29+
codeBuilder.AppendLine($"global::Futurum.Microsoft.Extensions.DependencyInjection.ServiceCollectionDescriptorExtensions.TryAddEquatableKeyedSingleton(serviceCollection, typeof(global::Futurum.WebApiEndpoint.Micro.IWebApiVersionEndpoint), {version}, typeof({webApiVersionEndpointDatum.NamespaceName}.{webApiVersionEndpointDatum.ImplementationType}));");
3030
}
3131
}
3232
}

‎src/Futurum.WebApiEndpoint.Micro/Futurum.WebApiEndpoint.Micro.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<ItemGroup>
3737
<PackageReference Include="Asp.Versioning.Http" Version="8.0.0" />
3838
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.0.0" />
39+
<PackageReference Include="Futurum.Microsoft.Extensions.DependencyInjection" Version="2.0.1" />
3940
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
4041
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
4142
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />

‎src/Futurum.WebApiEndpoint.Micro/ServiceCollectionUniqueKeyExtensions.cs‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎test/Futurum.WebApiEndpoint.Micro.EndToEndTests/Futurum.WebApiEndpoint.Micro.EndToEndTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Futurum.Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
14+
<PackageReference Include="Futurum.Microsoft.Extensions.DependencyInjection" Version="2.0.1" />
1515
<PackageReference Include="FluentAssertions" Version="6.12.0" />
1616
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
1717
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />

‎test/Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests/Snapshots/WebApiVersionEndpointRegistrationWriterTests.check_multiple_version.verified.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ namespace Microsoft.Extensions.DependencyInjection
77
{
88
private static global::Microsoft.Extensions.DependencyInjection.IServiceCollection RegisterWebApiVersionEndpoints(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection serviceCollection)
99
{
10-
global::Futurum.WebApiEndpoint.Micro.ServiceCollectionUniqueKeyExtensions.TryAddEquatableKeyedSingleton(serviceCollection, typeof(global::Futurum.WebApiEndpoint.Micro.IWebApiVersionEndpoint), ((global::Asp.Versioning.ApiVersion)new global::Futurum.WebApiEndpoint.Micro.WebApiEndpointVersion(new global::Futurum.WebApiEndpoint.Micro.Generator.WebApiEndpointApiVersion.WebApiEndpointNumberApiVersion(1d, null))).ToString(), typeof(Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests.Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests.WebApiVersionEndpoint1));
11-
global::Futurum.WebApiEndpoint.Micro.ServiceCollectionUniqueKeyExtensions.TryAddEquatableKeyedSingleton(serviceCollection, typeof(global::Futurum.WebApiEndpoint.Micro.IWebApiVersionEndpoint), ((global::Asp.Versioning.ApiVersion)new global::Futurum.WebApiEndpoint.Micro.WebApiEndpointVersion(new global::Futurum.WebApiEndpoint.Micro.Generator.WebApiEndpointApiVersion.WebApiEndpointNumberApiVersion(2d, null))).ToString(), typeof(Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests.Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests.WebApiVersionEndpoint1));
10+
global::Futurum.Microsoft.Extensions.DependencyInjection.ServiceCollectionDescriptorExtensions.TryAddEquatableKeyedSingleton(serviceCollection, typeof(global::Futurum.WebApiEndpoint.Micro.IWebApiVersionEndpoint), ((global::Asp.Versioning.ApiVersion)new global::Futurum.WebApiEndpoint.Micro.WebApiEndpointVersion(new global::Futurum.WebApiEndpoint.Micro.Generator.WebApiEndpointApiVersion.WebApiEndpointNumberApiVersion(1d, null))).ToString(), typeof(Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests.Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests.WebApiVersionEndpoint1));
11+
global::Futurum.Microsoft.Extensions.DependencyInjection.ServiceCollectionDescriptorExtensions.TryAddEquatableKeyedSingleton(serviceCollection, typeof(global::Futurum.WebApiEndpoint.Micro.IWebApiVersionEndpoint), ((global::Asp.Versioning.ApiVersion)new global::Futurum.WebApiEndpoint.Micro.WebApiEndpointVersion(new global::Futurum.WebApiEndpoint.Micro.Generator.WebApiEndpointApiVersion.WebApiEndpointNumberApiVersion(2d, null))).ToString(), typeof(Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests.Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests.WebApiVersionEndpoint1));
1212
return serviceCollection;
1313
}
1414
}

‎test/Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests/Snapshots/WebApiVersionEndpointRegistrationWriterTests.check_single_version.verified.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Microsoft.Extensions.DependencyInjection
77
{
88
private static global::Microsoft.Extensions.DependencyInjection.IServiceCollection RegisterWebApiVersionEndpoints(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection serviceCollection)
99
{
10-
global::Futurum.WebApiEndpoint.Micro.ServiceCollectionUniqueKeyExtensions.TryAddEquatableKeyedSingleton(serviceCollection, typeof(global::Futurum.WebApiEndpoint.Micro.IWebApiVersionEndpoint), ((global::Asp.Versioning.ApiVersion)new global::Futurum.WebApiEndpoint.Micro.WebApiEndpointVersion(new global::Futurum.WebApiEndpoint.Micro.Generator.WebApiEndpointApiVersion.WebApiEndpointNumberApiVersion(1d, null))).ToString(), typeof(Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests.Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests.WebApiEndpoint1));
10+
global::Futurum.Microsoft.Extensions.DependencyInjection.ServiceCollectionDescriptorExtensions.TryAddEquatableKeyedSingleton(serviceCollection, typeof(global::Futurum.WebApiEndpoint.Micro.IWebApiVersionEndpoint), ((global::Asp.Versioning.ApiVersion)new global::Futurum.WebApiEndpoint.Micro.WebApiEndpointVersion(new global::Futurum.WebApiEndpoint.Micro.Generator.WebApiEndpointApiVersion.WebApiEndpointNumberApiVersion(1d, null))).ToString(), typeof(Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests.Futurum.WebApiEndpoint.Micro.Generator.Writer.Tests.WebApiEndpoint1));
1111
return serviceCollection;
1212
}
1313
}

0 commit comments

Comments
 (0)