Skip to content

Commit 7f977ad

Browse files
committed
update package versions
1 parent 0c8e8b8 commit 7f977ad

File tree

12 files changed

+163
-118
lines changed

12 files changed

+163
-118
lines changed

Directory.Packages.props

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
<NoWarn>$(NoWarn);NU1507</NoWarn>
6+
</PropertyGroup>
7+
<ItemGroup>
8+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.1.1" />
9+
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.1.1" />
10+
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="13.1.1" />
11+
<PackageVersion Include="Aspire.Hosting.Redis" Version="13.1.1" />
12+
<PackageVersion Include="Aspire.StackExchange.Redis" Version="13.1.1" />
13+
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
14+
<PackageVersion Include="MassTransit" Version="8.1.2" />
15+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.24" />
16+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.24" />
17+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
18+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
19+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.24" />
20+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
21+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.24" />
22+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
23+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
24+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.3.0" />
25+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.3.0" />
26+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
27+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
28+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
29+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
30+
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.2" />
31+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
32+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
33+
<PackageVersion Include="StackExchange.Redis" Version="2.9.32" />
34+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
35+
<PackageVersion Include="xunit" Version="2.4.2" />
36+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
37+
<PackageVersion Include="Yarp.ReverseProxy" Version="2.1.0" />
38+
</ItemGroup>
39+
</Project>

src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<ProjectReference Include="..\..\Services\Basket.API\Basket.API.csproj" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.1" />
18+
<PackageReference Include="Aspire.Hosting.AppHost" />
19+
<PackageReference Include="Aspire.Hosting.PostgreSQL" />
20+
<PackageReference Include="Aspire.Hosting.Redis" />
1921
</ItemGroup>
2022
</Project>

src/Aspire/Aspire.AppHost/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var builder = DistributedApplication.CreateBuilder(args);
2-
var postgres = builder.AddPostgresContainer("postgres");
3-
var redisCache = builder.AddRedisContainer("redis");
2+
var postgres = builder.AddPostgres("postgres");
3+
var redisCache = builder.AddRedis("redis");
44

55
var catalogDb = postgres.AddDatabase("CatalogDb");
66
var identityDb = postgres.AddDatabase("IdentityDb");

src/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
</PropertyGroup>
99
<ItemGroup>
1010
<FrameworkReference Include="Microsoft.AspNetCore.App" />
11-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.24" />
12-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.3.0" />
13-
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.3.0" />
14-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0-alpha.1" />
15-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0-alpha.1" />
16-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
17-
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.2" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
19-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
11+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
12+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" />
13+
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" />
14+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
15+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
16+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
17+
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
19+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
2020
</ItemGroup>
2121
</Project>

src/Services/Basket.API/Basket.API.csproj

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@
66
<InvariantGlobalization>true</InvariantGlobalization>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.1.1" />
10-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.24" />
11-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.24" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.24">
9+
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
10+
<PackageReference Include="Aspire.Hosting.PostgreSQL" />
11+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" />
12+
<PackageReference Include="Swashbuckle.AspNetCore" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
1415
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1516
<PrivateAssets>all</PrivateAssets>
1617
</PackageReference>
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.24">
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
1819
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1920
<PrivateAssets>all</PrivateAssets>
2021
</PackageReference>
22+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
2123
</ItemGroup>
2224
<ItemGroup>
2325
<ProjectReference Include="..\..\Aspire\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />

src/Services/Catalog.API/Catalog.API.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@
99
<_Parameter1>Catalog.UnitTests</_Parameter1>
1010
</AssemblyAttribute>
1111
</ItemGroup>
12-
<PropertyGroup Condition=" '$(RunConfiguration)' == 'https' " />
13-
<PropertyGroup Condition=" '$(RunConfiguration)' == 'http' " />
1412
<ItemGroup>
15-
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.1.1" />
16-
<PackageReference Include="Aspire.StackExchange.Redis" Version="13.1.1" />
17-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.24" />
18-
<PackageReference Include="StackExchange.Redis" Version="2.7.10" />
19-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.24" />
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.24">
13+
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
14+
<PackageReference Include="Aspire.Hosting.PostgreSQL" />
15+
<PackageReference Include="Aspire.StackExchange.Redis" />
16+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" />
17+
<PackageReference Include="StackExchange.Redis" />
18+
<PackageReference Include="Swashbuckle.AspNetCore" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
2221
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2322
<PrivateAssets>all</PrivateAssets>
2423
</PackageReference>
25-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.24">
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
2625
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2726
<PrivateAssets>all</PrivateAssets>
2827
</PackageReference>
28+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
2929
</ItemGroup>
3030
<ItemGroup>
3131
<ProjectReference Include="..\..\Shared\Shared.csproj" />

src/Services/Identity.API/Identity.API.csproj

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@
66
<InvariantGlobalization>true</InvariantGlobalization>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.24" />
10-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.24" />
11-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
12-
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.1.1" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.24" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.24">
9+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
10+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" />
11+
<PackageReference Include="Swashbuckle.AspNetCore" />
12+
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
13+
<PackageReference Include="Aspire.Hosting.PostgreSQL" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
1516
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1617
<PrivateAssets>all</PrivateAssets>
1718
</PackageReference>
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.24">
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
1920
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2021
<PrivateAssets>all</PrivateAssets>
2122
</PackageReference>
23+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
2224
</ItemGroup>
2325
<ItemGroup>
2426
<ProjectReference Include="..\..\Aspire\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />

src/Services/LoadBalancer/Extensions/Extensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public static class Extensions
77
public static IReverseProxyBuilder AddServiceDiscoveryDestinationResolver(this IReverseProxyBuilder builder)
88
{
99
builder.Services.AddServiceDiscoveryCore();
10-
builder.Services.AddSingleton<IDestinationResolver, ServiceDiscoveryDestinationResolver>();
10+
// builder.Services.AddSingleton<IDestinationResolver, ServiceDiscoveryDestinationResolver>();
1111
return builder;
1212
}
1313
}

src/Services/LoadBalancer/Extensions/ServiceDiscoveryDestinationResolver.cs

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -5,80 +5,80 @@
55

66
namespace LoadBalancer.Extensions;
77

8-
internal sealed class ServiceDiscoveryDestinationResolver(ServiceEndPointResolverRegistry registry) : IDestinationResolver
9-
{
10-
/// <inheritdoc/>
11-
public async ValueTask<ResolvedDestinationCollection> ResolveDestinationsAsync(IReadOnlyDictionary<string, DestinationConfig> destinations, CancellationToken cancellationToken)
12-
{
13-
Dictionary<string, DestinationConfig> results = new();
14-
var tasks = new List<Task<(List<(string Name, DestinationConfig Config)>, IChangeToken ChangeToken)>>(destinations.Count);
15-
foreach (var (destinationId, destinationConfig) in destinations)
16-
{
17-
tasks.Add(ResolveHostAsync(destinationId, destinationConfig, cancellationToken));
18-
}
8+
// internal sealed class ServiceDiscoveryDestinationResolver(ServiceEndPointResolverRegistry registry) : IDestinationResolver
9+
// {
10+
// /// <inheritdoc/>
11+
// public async ValueTask<ResolvedDestinationCollection> ResolveDestinationsAsync(IReadOnlyDictionary<string, DestinationConfig> destinations, CancellationToken cancellationToken)
12+
// {
13+
// Dictionary<string, DestinationConfig> results = new();
14+
// var tasks = new List<Task<(List<(string Name, DestinationConfig Config)>, IChangeToken ChangeToken)>>(destinations.Count);
15+
// foreach (var (destinationId, destinationConfig) in destinations)
16+
// {
17+
// tasks.Add(ResolveHostAsync(destinationId, destinationConfig, cancellationToken));
18+
// }
1919

20-
await Task.WhenAll(tasks).ConfigureAwait(false);
21-
var changeTokens = new List<IChangeToken>();
22-
foreach (var task in tasks)
23-
{
24-
var (configs, changeToken) = await task.ConfigureAwait(false);
25-
if (changeToken is not null)
26-
{
27-
changeTokens.Add(changeToken);
28-
}
20+
// await Task.WhenAll(tasks).ConfigureAwait(false);
21+
// var changeTokens = new List<IChangeToken>();
22+
// foreach (var task in tasks)
23+
// {
24+
// var (configs, changeToken) = await task.ConfigureAwait(false);
25+
// if (changeToken is not null)
26+
// {
27+
// changeTokens.Add(changeToken);
28+
// }
2929

30-
foreach (var (name, config) in configs)
31-
{
32-
results[name] = config;
33-
}
34-
}
30+
// foreach (var (name, config) in configs)
31+
// {
32+
// results[name] = config;
33+
// }
34+
// }
3535

36-
return new ResolvedDestinationCollection(results, new CompositeChangeToken(changeTokens));
37-
}
36+
// return new ResolvedDestinationCollection(results, new CompositeChangeToken(changeTokens));
37+
// }
3838

39-
private async Task<(List<(string Name, DestinationConfig Config)>, IChangeToken ChangeToken)> ResolveHostAsync(
40-
string originalName,
41-
DestinationConfig originalConfig,
42-
CancellationToken cancellationToken)
43-
{
44-
var originalUri = new Uri(originalConfig.Address);
45-
var originalHost = originalConfig.Host is { Length: > 0 } h ? h : originalUri.Authority;
46-
var serviceName = originalUri.GetLeftPart(UriPartial.Authority);
39+
// private async Task<(List<(string Name, DestinationConfig Config)>, IChangeToken ChangeToken)> ResolveHostAsync(
40+
// string originalName,
41+
// DestinationConfig originalConfig,
42+
// CancellationToken cancellationToken)
43+
// {
44+
// var originalUri = new Uri(originalConfig.Address);
45+
// var originalHost = originalConfig.Host is { Length: > 0 } h ? h : originalUri.Authority;
46+
// var serviceName = originalUri.GetLeftPart(UriPartial.Authority);
4747

48-
var endPoints = await registry.GetEndPointsAsync(serviceName, cancellationToken).ConfigureAwait(false);
49-
var results = new List<(string Name, DestinationConfig Config)>(endPoints.Count);
50-
var uriBuilder = new UriBuilder(originalUri);
51-
var healthUri = originalConfig.Health is { Length: > 0 } health ? new Uri(health) : null;
52-
var healthUriBuilder = healthUri is { } ? new UriBuilder(healthUri) : null;
53-
foreach (var endPoint in endPoints)
54-
{
55-
var addressString = endPoint.GetEndPointString();
56-
Uri result;
57-
if (!addressString.Contains("://"))
58-
{
59-
result = new Uri($"https://{addressString}");
60-
}
61-
else
62-
{
63-
result = new Uri(addressString);
64-
}
48+
// var endPoints = await registry.GetEndPointsAsync(serviceName, cancellationToken).ConfigureAwait(false);
49+
// var results = new List<(string Name, DestinationConfig Config)>(endPoints.Count);
50+
// var uriBuilder = new UriBuilder(originalUri);
51+
// var healthUri = originalConfig.Health is { Length: > 0 } health ? new Uri(health) : null;
52+
// var healthUriBuilder = healthUri is { } ? new UriBuilder(healthUri) : null;
53+
// foreach (var endPoint in endPoints)
54+
// {
55+
// var addressString = endPoint.GetEndPointString();
56+
// Uri result;
57+
// if (!addressString.Contains("://"))
58+
// {
59+
// result = new Uri($"https://{addressString}");
60+
// }
61+
// else
62+
// {
63+
// result = new Uri(addressString);
64+
// }
6565

66-
uriBuilder.Host = result.Host;
67-
uriBuilder.Port = result.Port;
68-
var resolvedAddress = uriBuilder.Uri.ToString();
69-
var healthAddress = originalConfig.Health;
70-
if (healthUriBuilder is not null)
71-
{
72-
healthUriBuilder.Host = result.Host;
73-
healthUriBuilder.Port = result.Port;
74-
healthAddress = healthUriBuilder.Uri.ToString();
75-
}
66+
// uriBuilder.Host = result.Host;
67+
// uriBuilder.Port = result.Port;
68+
// var resolvedAddress = uriBuilder.Uri.ToString();
69+
// var healthAddress = originalConfig.Health;
70+
// if (healthUriBuilder is not null)
71+
// {
72+
// healthUriBuilder.Host = result.Host;
73+
// healthUriBuilder.Port = result.Port;
74+
// healthAddress = healthUriBuilder.Uri.ToString();
75+
// }
7676

77-
var name = $"{originalName}[{addressString}]";
78-
var config = originalConfig with { Host = originalHost, Address = resolvedAddress, Health = healthAddress };
79-
results.Add((name, config));
80-
}
77+
// var name = $"{originalName}[{addressString}]";
78+
// var config = originalConfig with { Host = originalHost, Address = resolvedAddress, Health = healthAddress };
79+
// results.Add((name, config));
80+
// }
8181

82-
return (results, endPoints.ChangeToken);
83-
}
84-
}
82+
// return (results, endPoints.ChangeToken);
83+
// }
84+
// }

src/Services/LoadBalancer/LoadBalancer.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<InvariantGlobalization>true</InvariantGlobalization>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
11-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
12-
<PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
9+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
11+
<PackageReference Include="Swashbuckle.AspNetCore" />
12+
<PackageReference Include="Yarp.ReverseProxy" />
1313
</ItemGroup>
1414
<ItemGroup>
1515
<ProjectReference Include="..\..\Aspire\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />

0 commit comments

Comments
 (0)