Skip to content
This repository was archived by the owner on Mar 16, 2025. It is now read-only.

Commit 5800517

Browse files
henrikfroehlinghenrikfroehling
committed
[v2] Refactoring (#153 #158)
Integrate HttpClientFactory library into core library to simplify extensibility for extension libraries. - create NuGet package for extension library in CI build
1 parent d31c212 commit 5800517

File tree

8 files changed

+18
-33
lines changed

8 files changed

+18
-33
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ jobs:
9393
environment_name: ${{ needs.init.outputs.environment_name }}
9494
target_branch_name: ${{ needs.init.outputs.target_branch_name }}
9595
working_directory: 'src'
96-
project_names: 'src/libs/Trakt.NET/Trakt.NET.csproj;src/libs/Trakt.NET.HttpClientFactory/Trakt.NET.HttpClientFactory.csproj'
96+
project_names: 'src/libs/Trakt.NET/Trakt.NET.csproj;src/libs/Trakt.NET.Extensions.TMDB/Trakt.NET.Extensions.TMDB.csproj'
9797
build_configuration: Release
98-
binaries_root_directories: 'src/libs/Trakt.NET/bin;src/libs/Trakt.NET.HttpClientFactory/bin'
98+
binaries_root_directories: 'src/libs/Trakt.NET/bin;src/libs/Trakt.NET.Extensions.TMDB/bin'
9999
artifacts_root_directory: 'artifacts-v2.0.0-alpha'
100100
artifacts_sub_directories: 'netstandard2.0,netstandard2.1,net5.0,net6.0,net7.0,net8.0,net9.0'
101101
artifacts_archive_name: 'Trakt.NET-CI-Build-v2.0.0-Alpha-${{ needs.init.outputs.target_branch_name }}'

‎src/Directory.Build.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<LibraryCommonNETPreviewTargets></LibraryCommonNETPreviewTargets>
1212

1313
<LibraryTargetFrameworks>$(LibraryNETStandardTargets);net5.0;$(LibraryCommonNETTargets)</LibraryTargetFrameworks>
14-
<HttpClientFactoryLibraryTargetFrameworks>$(LibraryNETStandardTargets);$(LibraryCommonNETTargets)</HttpClientFactoryLibraryTargetFrameworks>
1514
<TestTargetFrameworks>$(LibraryNETFrameworkTargets);$(LibraryCommonNETTargets)</TestTargetFrameworks>
1615

1716
<!-- These tests use Verify packages which only support these .NET versions >= 6. -->

‎src/Directory.Packages.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
</ItemGroup>
1313

1414
<!-- HttpClientFactory Dependencies -->
15+
<ItemGroup Condition="('$(TargetFramework)' == 'net5.0')">
16+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
17+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
18+
<PackageVersion Include="Microsoft.Extensions.Http" Version="5.0.0" />
19+
</ItemGroup>
20+
1521
<ItemGroup Condition="('$(TargetFramework)' == 'net6.0')">
1622
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.2" />
1723
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.2" />

‎src/Trakt.NET.sln‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Trakt.NET.Requests.Tests",
122122
EndProject
123123
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Trakt.NET.Modules.Tests", "tests\libs\Trakt.NET.Modules.Tests\Trakt.NET.Modules.Tests.csproj", "{991F0FB1-CDFD-412E-B7B2-81946E12D6D7}"
124124
EndProject
125-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Trakt.NET.HttpClientFactory", "libs\Trakt.NET.HttpClientFactory\Trakt.NET.HttpClientFactory.csproj", "{AE64986B-39E8-49C2-A3E0-48FBA888B437}"
126-
EndProject
127125
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Trakt.NET.Extensions.TMDB", "libs\Trakt.NET.Extensions.TMDB\Trakt.NET.Extensions.TMDB.csproj", "{5E6FE4C0-07D9-010B-E19B-DA162549E9E3}"
128126
EndProject
129127
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Trakt.NET.Extensions.TMDB.Tests", "tests\libs\Trakt.NET.Extensions.TMDB.Tests\Trakt.NET.Extensions.TMDB.Tests.csproj", "{CC693155-5F85-4C13-9082-8B9443FB85DA}"
@@ -166,10 +164,6 @@ Global
166164
{991F0FB1-CDFD-412E-B7B2-81946E12D6D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
167165
{991F0FB1-CDFD-412E-B7B2-81946E12D6D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
168166
{991F0FB1-CDFD-412E-B7B2-81946E12D6D7}.Release|Any CPU.Build.0 = Release|Any CPU
169-
{AE64986B-39E8-49C2-A3E0-48FBA888B437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
170-
{AE64986B-39E8-49C2-A3E0-48FBA888B437}.Debug|Any CPU.Build.0 = Debug|Any CPU
171-
{AE64986B-39E8-49C2-A3E0-48FBA888B437}.Release|Any CPU.ActiveCfg = Release|Any CPU
172-
{AE64986B-39E8-49C2-A3E0-48FBA888B437}.Release|Any CPU.Build.0 = Release|Any CPU
173167
{5E6FE4C0-07D9-010B-E19B-DA162549E9E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
174168
{5E6FE4C0-07D9-010B-E19B-DA162549E9E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
175169
{5E6FE4C0-07D9-010B-E19B-DA162549E9E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -208,7 +202,6 @@ Global
208202
{C479E397-69C6-4C3D-BD4D-19C8ECAB74EA} = {7CCCA937-44EC-4C43-9AEC-409BC790022C}
209203
{A5279041-12FE-4DEA-AC60-79B7FFF3D229} = {50AD22EC-EB56-476B-8DCE-4AF2B5BD8B09}
210204
{991F0FB1-CDFD-412E-B7B2-81946E12D6D7} = {50AD22EC-EB56-476B-8DCE-4AF2B5BD8B09}
211-
{AE64986B-39E8-49C2-A3E0-48FBA888B437} = {E7B2A7FC-F550-4546-8F2C-6FC9AA49F6B5}
212205
{5E6FE4C0-07D9-010B-E19B-DA162549E9E3} = {E7B2A7FC-F550-4546-8F2C-6FC9AA49F6B5}
213206
{CC693155-5F85-4C13-9082-8B9443FB85DA} = {50AD22EC-EB56-476B-8DCE-4AF2B5BD8B09}
214207
EndGlobalSection

‎src/libs/Directory.Build.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@
4747
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="All" />
4848
</ItemGroup>
4949

50+
<ItemGroup>
51+
<PackageReference Include="Microsoft.Extensions.Configuration" />
52+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
53+
<PackageReference Include="Microsoft.Extensions.Http" />
54+
</ItemGroup>
55+
5056
<ItemGroup Condition="$(DefineConstants.Contains(TRAKT_NETSTANDARD_TARGET))">
5157
<PackageReference Include="System.Text.Json" />
5258
</ItemGroup>

‎src/libs/Trakt.NET.HttpClientFactory/Trakt.NET.HttpClientFactory.csproj‎

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

src/libs/Trakt.NET.HttpClientFactory/HttpClientFactoryProvider.cs renamed to src/libs/Trakt.NET/Extensions/TraktHttpClientFactoryProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace TraktNET
22
{
3-
internal sealed class HttpClientFactoryProvider(IHttpClientFactory httpClientFactory) : HttpClientProvider<TraktContext>
3+
internal sealed class TraktHttpClientFactoryProvider(IHttpClientFactory httpClientFactory) : HttpClientProvider<TraktContext>
44
{
55
internal override HttpClient GetHttpClient(TraktContext context) => httpClientFactory.CreateClient(context.ID);
66
}

src/libs/Trakt.NET.HttpClientFactory/HttpClientFactoryExtensions.cs renamed to src/libs/Trakt.NET/Extensions/TraktServiceCollectionExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using Microsoft.Extensions.Configuration;
1+
using Microsoft.Extensions.Configuration;
22
using Microsoft.Extensions.DependencyInjection;
33

44
namespace TraktNET
55
{
6-
public static class HttpClientFactoryExtensions
6+
public static class TraktServiceCollectionExtensions
77
{
88
private const string ConfigurationKeyClientID = "TraktNET:ClientID";
99
private const string ConfigurationKeyClientSecret = "TraktNET:ClientSecret";
@@ -144,7 +144,7 @@ private static IHttpClientBuilder AddTypedClient(this IHttpClientBuilder httpCli
144144
httpClientBuilder.Services.AddTransient(serviceProvider =>
145145
{
146146
IHttpClientFactory httpClientFactory = serviceProvider.GetRequiredService<IHttpClientFactory>();
147-
context.HttpClientProvider = new HttpClientFactoryProvider(httpClientFactory);
147+
context.HttpClientProvider = new TraktHttpClientFactoryProvider(httpClientFactory);
148148
return new TraktClient(context);
149149
});
150150

0 commit comments

Comments
 (0)