Skip to content

Feature/update libraries #90

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

Merged
gpreviatti merged 2 commits into from
Jul 28, 2026
Merged

Feature/update libraries #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55d7d1a
chore: remove unused Polly dependencies and update package versions
Jul 28, 2026
dc4eab6
chore: remove unnecessary libraries from Bff project and update packa…
Jul 28, 2026
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 .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
uses: gpreviatti/github-actions-templates/.github/workflows/dotnet-pack.yml@v1
with:
dotnet_version: "${{ vars.PROJECT_DOTNET_VERSION }}"
package_version: "10.14.0"
package_version: "10.15.0"
secrets:
nuget_api_key: ${{ secrets.NUGET_API_KEY }}

2 changes: 1 addition & 1 deletion GPreviatti.Template.Hexagonal.Solution.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<RepositoryUrl>git://github.com/gpreviatti/hexagonal-solution-template</RepositoryUrl>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageReleaseNotes>
- Update templates libraries
- Remove unnecessary library from Bff project
</PackageReleaseNotes>
</PropertyGroup>
<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion templates/Bff/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="10.8.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.10" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="10.0.10" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.10" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageVersion Include="Moq" Version="4.20.72" />
Expand Down
1 change: 0 additions & 1 deletion templates/Bff/src/Infrastructure/Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" />
<PackageReference Include="Microsoft.Extensions.Caching.Hybrid" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" />
<PackageReference Include="OpenTelemetry.Extensions" />
<PackageReference Include="OpenTelemetry.Exporter.Console" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
Expand Down
28 changes: 8 additions & 20 deletions templates/Bff/src/Infrastructure/InfrastructureDependencyInjection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
using OpenTelemetry.Metrics;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
using Polly;
using Polly.Extensions.Http;
using Pyroscope.OpenTelemetry;

namespace Infrastructure;
Expand Down Expand Up @@ -113,7 +111,6 @@ internal IServiceCollection AddCache(IConfiguration configuration)

internal IServiceCollection AddHttp(List<ServiceConfiguration> serviceConfiguration)
{

var serviceKeys = Enum.GetValues<ServicesKey>();

foreach (var serviceKey in serviceKeys)
Expand All @@ -134,9 +131,7 @@ internal IServiceCollection AddHttp(List<ServiceConfiguration> serviceConfigurat
if (serviceConfig.Headers is Dictionary<string, string> headers && headers.Count > 0)
foreach (var header in headers)
client.DefaultRequestHeaders.Add(header.Key, header.Value);
})
.SetHandlerLifetime(TimeSpan.FromMinutes(5))
.AddPolicyHandler(GetRetryPolicy());
});

services.AddKeyedScoped<BaseHttpService>(serviceKey, (serviceProvider, _) =>
{
Expand All @@ -154,25 +149,18 @@ internal IServiceCollection AddHttp(List<ServiceConfiguration> serviceConfigurat
internal IServiceCollection AddGrpc(List<ServiceConfiguration> serviceConfiguration)
{
services.AddGrpc();
services
.AddGrpcClient<PaymentService.PaymentServiceClient>(nameof(PaymentsService), o =>
{
var paymentsConfiguration = serviceConfiguration.FirstOrDefault(x =>
string.Equals(x.Name, ServicesKey.Payments.ToString(), StringComparison.OrdinalIgnoreCase))
?? throw new ArgumentNullException($"{ServicesKey.Payments} gRPC service configuration is not configured.");
services.AddGrpcClient<PaymentService.PaymentServiceClient>(nameof(PaymentsService), o =>
{
var paymentsConfiguration = serviceConfiguration.FirstOrDefault(x =>
string.Equals(x.Name, ServicesKey.Payments.ToString(), StringComparison.OrdinalIgnoreCase))
?? throw new ArgumentNullException($"{ServicesKey.Payments} gRPC service configuration is not configured.");

o.Address = new Uri(paymentsConfiguration.BaseAddress);
})
.SetHandlerLifetime(TimeSpan.FromMinutes(5))
.AddPolicyHandler(GetRetryPolicy());
o.Address = new Uri(paymentsConfiguration.BaseAddress);
});

services.AddScoped<PaymentsService>();

return services;
}

internal static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy() => HttpPolicyExtensions
.HandleTransientHttpError()
.WaitAndRetryAsync(3, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
}
}
94 changes: 35 additions & 59 deletions templates/Bff/src/Infrastructure/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,6 @@
"StackExchange.Redis": "2.7.27"
}
},
"Microsoft.Extensions.Http.Polly": {
"type": "Direct",
"requested": "[10.0.10, )",
"resolved": "10.0.10",
"contentHash": "ceKyX9V/C+mtapMfXQ0ClKRkxDHAW2AAJoDgTcsh7UdOteCQKB5wRTFgHJ82Lh/3O+UlPA47LRGEZkRxtz/lCA==",
"dependencies": {
"Microsoft.Extensions.Http": "10.0.10",
"Polly": "7.2.4",
"Polly.Extensions.Http": "3.0.0"
}
},
"OpenTelemetry.Exporter.Console": {
"type": "Direct",
"requested": "[1.17.0, )",
Expand Down Expand Up @@ -223,28 +212,28 @@
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
"resolved": "10.0.10",
"contentHash": "plJWK2zpWuuyxI8F8s2scx6Je7N1Ajjs6HvYUGKwRnDMWIVIz9FHwAkiT7ASgrvAOd10T0FPVlh9BzAJJME+jg==",
"resolved": "10.0.0",
"contentHash": "H4SWETCh/cC5L1WtWchHR6LntGk3rDTTznZMssr4cL8IbDmMWBxY+MOGDc/ASnqNolLKPIWHWeuC1ddiL/iNPw==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.10",
"Microsoft.Extensions.Primitives": "10.0.10"
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0",
"Microsoft.Extensions.Primitives": "10.0.0"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
"type": "Transitive",
"resolved": "10.0.10",
"contentHash": "5Vnd2I75DmZCVEjSynIdJ/0EGafgnLQwgR3t2C2/fkjx/nRG+cLwxLLdInoHeCEpkD5K4Ov/g9ZCRYrl4TRsaA==",
"resolved": "10.0.0",
"contentHash": "d2kDKnCsJvY7mBVhcjPSp9BkJk48DsaHPg5u+Oy4f8XaOqnEedRy/USyvnpHL92wpJ6DrTPy7htppUUzskbCXQ==",
"dependencies": {
"Microsoft.Extensions.Primitives": "10.0.10"
"Microsoft.Extensions.Primitives": "10.0.0"
}
},
"Microsoft.Extensions.Configuration.Binder": {
"type": "Transitive",
"resolved": "10.0.10",
"contentHash": "GqmN2o1CkJvk7uWp+p4CwBYW0w/zfoEbvsiFDbO2G8l1Uz+mrDAbAcZiXhU2lufKPby1cjAUdd5GTWpebYOkOA==",
"resolved": "10.0.0",
"contentHash": "tMF9wNh+hlyYDWB8mrFCQHQmWHlRosol1b/N2Jrefy1bFLnuTlgSYmPyHNmz8xVQgs7DpXytBRWxGhG+mSTp0g==",
"dependencies": {
"Microsoft.Extensions.Configuration": "10.0.10",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.10"
"Microsoft.Extensions.Configuration": "10.0.0",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0"
}
},
"Microsoft.Extensions.Configuration.EnvironmentVariables": {
Expand All @@ -263,21 +252,21 @@
},
"Microsoft.Extensions.Diagnostics": {
"type": "Transitive",
"resolved": "10.0.10",
"contentHash": "Kr/e7lUf4+N8tacbqJ2Ctwe/HarKdAc9ZkgKVVqvtJDBKbez+T/KnUwu82KSlnBp/SrpBcxc7u7xkE2oUZT/5Q==",
"resolved": "8.0.0",
"contentHash": "3PZp/YSkIXrF7QK7PfC1bkyRYwqOHpWFad8Qx+4wkuumAeXo1NHaxpS9LboNA9OvNSAu+QOVlXbMyoY+pHSqcw==",
"dependencies": {
"Microsoft.Extensions.Configuration": "10.0.10",
"Microsoft.Extensions.Diagnostics.Abstractions": "10.0.10",
"Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.10"
"Microsoft.Extensions.Configuration": "8.0.0",
"Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0",
"Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0"
}
},
"Microsoft.Extensions.Diagnostics.Abstractions": {
"type": "Transitive",
"resolved": "10.0.10",
"contentHash": "9uWiKpeOVac355STyChWR/pliFX/5CeLqChW9kKsaxyDH4EUTZxMkT4Jwp/J/peLm0GBFmSX5c0WCse3yCnq1Q==",
"resolved": "10.0.0",
"contentHash": "SfK89ytD61S7DgzorFljSkUeluC1ncn6dtZgwc0ot39f/BEYWBl5jpgvodxduoYAs1d9HG8faCDRZxE95UMo2A==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.10",
"Microsoft.Extensions.Options": "10.0.10"
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0",
"Microsoft.Extensions.Options": "10.0.0"
}
},
"Microsoft.Extensions.FileProviders.Abstractions": {
Expand All @@ -302,15 +291,15 @@
},
"Microsoft.Extensions.Http": {
"type": "Transitive",
"resolved": "10.0.10",
"contentHash": "DuEBLw2y7ZBfilnaJtlge8f2M49932v43t7j1InceXVjcZzxNrSEkobYXdgZkXuPFnFbKcbWpAS+fZgYEW1BhA==",
"resolved": "8.0.0",
"contentHash": "cWz4caHwvx0emoYe7NkHPxII/KkTI8R/LC9qdqJqnKv2poTJ4e2qqPGQqvRoQ5kaSA4FU5IV3qFAuLuOhoqULQ==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.10",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.10",
"Microsoft.Extensions.Diagnostics": "10.0.10",
"Microsoft.Extensions.Logging": "10.0.10",
"Microsoft.Extensions.Logging.Abstractions": "10.0.10",
"Microsoft.Extensions.Options": "10.0.10"
"Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
"Microsoft.Extensions.Diagnostics": "8.0.0",
"Microsoft.Extensions.Logging": "8.0.0",
"Microsoft.Extensions.Logging.Abstractions": "8.0.0",
"Microsoft.Extensions.Options": "8.0.0"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
Expand Down Expand Up @@ -347,14 +336,14 @@
},
"Microsoft.Extensions.Options.ConfigurationExtensions": {
"type": "Transitive",
"resolved": "10.0.10",
"contentHash": "tnBmu/LwF25ZQK+HBNCu2xrwnkKoB/XEbJyooGGoYxHrhvxbSKi7eOFiJ4AXBy/QU4vtCvCJfoi8k9Ej72qzOQ==",
"resolved": "10.0.0",
"contentHash": "tL9cSl3maS5FPzp/3MtlZI21ExWhni0nnUCF8HY4npTsINw45n9SNDbkKXBMtFyUFGSsQep25fHIDN4f/Vp3AQ==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.10",
"Microsoft.Extensions.Configuration.Binder": "10.0.10",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.10",
"Microsoft.Extensions.Options": "10.0.10",
"Microsoft.Extensions.Primitives": "10.0.10"
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0",
"Microsoft.Extensions.Configuration.Binder": "10.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0",
"Microsoft.Extensions.Options": "10.0.0",
"Microsoft.Extensions.Primitives": "10.0.0"
}
},
"Microsoft.Extensions.Primitives": {
Expand Down Expand Up @@ -387,19 +376,6 @@
"resolved": "2.2.8",
"contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ=="
},
"Polly": {
"type": "Transitive",
"resolved": "7.2.4",
"contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA=="
},
"Polly.Extensions.Http": {
"type": "Transitive",
"resolved": "3.0.0",
"contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==",
"dependencies": {
"Polly": "7.1.0"
}
},
"Pyroscope": {
"type": "Transitive",
"resolved": "1.3.0",
Expand Down
24 changes: 0 additions & 24 deletions templates/Bff/src/WebApp/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,19 +123,6 @@
"resolved": "2.2.8",
"contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ=="
},
"Polly": {
"type": "Transitive",
"resolved": "7.2.4",
"contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA=="
},
"Polly.Extensions.Http": {
"type": "Transitive",
"resolved": "3.0.0",
"contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==",
"dependencies": {
"Polly": "7.1.0"
}
},
"Pyroscope": {
"type": "Transitive",
"resolved": "1.3.0",
Expand All @@ -161,7 +148,6 @@
"Contracts": "[1.0.0, )",
"Microsoft.Extensions.Caching.Hybrid": "[10.8.0, )",
"Microsoft.Extensions.Caching.StackExchangeRedis": "[10.0.10, )",
"Microsoft.Extensions.Http.Polly": "[10.0.10, )",
"OpenTelemetry.Exporter.Console": "[1.17.0, )",
"OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions": "[1.17.0-beta.1, )",
Expand Down Expand Up @@ -201,16 +187,6 @@
"StackExchange.Redis": "2.7.27"
}
},
"Microsoft.Extensions.Http.Polly": {
"type": "CentralTransitive",
"requested": "[10.0.10, )",
"resolved": "10.0.10",
"contentHash": "ceKyX9V/C+mtapMfXQ0ClKRkxDHAW2AAJoDgTcsh7UdOteCQKB5wRTFgHJ82Lh/3O+UlPA47LRGEZkRxtz/lCA==",
"dependencies": {
"Polly": "7.2.4",
"Polly.Extensions.Http": "3.0.0"
}
},
"Microsoft.OpenApi": {
"type": "CentralTransitive",
"requested": "[2.11.0, )",
Expand Down
41 changes: 8 additions & 33 deletions templates/Bff/tests/IntegrationTests/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,15 +332,15 @@
},
"Microsoft.Extensions.Http": {
"type": "Transitive",
"resolved": "10.0.10",
"contentHash": "DuEBLw2y7ZBfilnaJtlge8f2M49932v43t7j1InceXVjcZzxNrSEkobYXdgZkXuPFnFbKcbWpAS+fZgYEW1BhA==",
"resolved": "8.0.0",
"contentHash": "cWz4caHwvx0emoYe7NkHPxII/KkTI8R/LC9qdqJqnKv2poTJ4e2qqPGQqvRoQ5kaSA4FU5IV3qFAuLuOhoqULQ==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.10",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.10",
"Microsoft.Extensions.Diagnostics": "10.0.10",
"Microsoft.Extensions.Logging": "10.0.10",
"Microsoft.Extensions.Logging.Abstractions": "10.0.10",
"Microsoft.Extensions.Options": "10.0.10"
"Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
"Microsoft.Extensions.Diagnostics": "8.0.0",
"Microsoft.Extensions.Logging": "8.0.0",
"Microsoft.Extensions.Logging.Abstractions": "8.0.0",
"Microsoft.Extensions.Options": "8.0.0"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
Expand Down Expand Up @@ -476,19 +476,6 @@
"resolved": "2.2.8",
"contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ=="
},
"Polly": {
"type": "Transitive",
"resolved": "7.2.4",
"contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA=="
},
"Polly.Extensions.Http": {
"type": "Transitive",
"resolved": "3.0.0",
"contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==",
"dependencies": {
"Polly": "7.1.0"
}
},
"Pyroscope": {
"type": "Transitive",
"resolved": "1.3.0",
Expand Down Expand Up @@ -552,7 +539,6 @@
"Contracts": "[1.0.0, )",
"Microsoft.Extensions.Caching.Hybrid": "[10.8.0, )",
"Microsoft.Extensions.Caching.StackExchangeRedis": "[10.0.10, )",
"Microsoft.Extensions.Http.Polly": "[10.0.10, )",
"OpenTelemetry.Exporter.Console": "[1.17.0, )",
"OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.17.0, )",
"OpenTelemetry.Extensions": "[1.17.0-beta.1, )",
Expand Down Expand Up @@ -659,17 +645,6 @@
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.10"
}
},
"Microsoft.Extensions.Http.Polly": {
"type": "CentralTransitive",
"requested": "[10.0.10, )",
"resolved": "10.0.10",
"contentHash": "ceKyX9V/C+mtapMfXQ0ClKRkxDHAW2AAJoDgTcsh7UdOteCQKB5wRTFgHJ82Lh/3O+UlPA47LRGEZkRxtz/lCA==",
"dependencies": {
"Microsoft.Extensions.Http": "10.0.10",
"Polly": "7.2.4",
"Polly.Extensions.Http": "3.0.0"
}
},
"Microsoft.Extensions.Logging": {
"type": "CentralTransitive",
"requested": "[10.0.10, )",
Expand Down
Loading