Skip to content

Commit f1e8a87

Browse files
mehdihadelimehdihadeli
committed
refactor: ♻️ upgrade package versions
1 parent d8a66e1 commit f1e8a87

4 files changed

Lines changed: 65 additions & 64 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,36 @@
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
77
<EnablePackageVersionOverride>true</EnablePackageVersionOverride>
8-
<AspireVersion>9.4</AspireVersion>
8+
<AspireVersion>9.5.1</AspireVersion>
99
</PropertyGroup>
1010
<ItemGroup Label="ASP.NET Core">
1111
<PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0"/>
1212
<PackageVersion Include="AspNetCore.HealthChecks.NpgSql" Version="9.0.0"/>
1313
<PackageVersion Include="AspNetCore.HealthChecks.Rabbitmq" Version="9.0.0"/>
1414
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0"/>
15-
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="9.7.2"/>
16-
<PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.7.2"/>
1715
<PackageVersion Include="DistributedLock.Redis" Version="1.1.0"/>
1816
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0"/>
1917
<PackageVersion Include="Mediator.Abstractions" Version="3.0.1"/>
2018
<PackageVersion Include="Mediator.SourceGenerator" Version="3.0.1"/>
2119
<PackageVersion Include="MessagePack" Version="3.1.4"/>
22-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.8"/>
2320
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.Middleware" Version="9.8.0"/>
2421
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.9"/>
25-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.5"/>
26-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.5"/>
27-
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.8.0"/>
28-
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.8"/>
29-
<PackageVersion Include="Microsoft.Extensions.Compliance.Redaction" Version="9.8.0"/>
30-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8"/>
22+
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.9.0"/>
23+
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.9"/>
24+
<PackageVersion Include="Microsoft.Extensions.Compliance.Redaction" Version="9.9.0"/>
25+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9"/>
3126
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.9"/>
32-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.8.0"/>
33-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.1"/>
27+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0"/>
28+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.1"/>
3429
<PackageVersion Include="Microsoft.Extensions.VectorData.Abstractions" Version="9.7.0"/>
3530
<PackageVersion Include="System.Net.Http.Json" Version="9.0.9"/>
3631
<PackageVersion Include="System.Text.Json" Version="9.0.9"/>
3732
</ItemGroup>
3833
<ItemGroup Label="Entity Framework Core and Database">
3934
<PackageVersion Include="EFCore.NamingConventions" Version="9.0.0"/>
40-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.8"/>
41-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8"/>
42-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.8">
35+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9"/>
36+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9"/>
37+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.9">
4338
<PrivateAssets>all</PrivateAssets>
4439
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4540
</PackageVersion>
@@ -48,8 +43,8 @@
4843
<PackageVersion Include="Dapper" Version="2.1.66"/>
4944
</ItemGroup>
5045
<ItemGroup Label="API Documentation-Versioning">
51-
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.3"/>
52-
<PackageVersion Include="Scalar.AspNetCore" Version="2.6.9"/>
46+
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.6"/>
47+
<PackageVersion Include="Scalar.AspNetCore" Version="2.8.10"/>
5348
<PackageVersion Include="Asp.Versioning.Http" Version="$(ApiVersioningVersion)"/>
5449
<PackageVersion Include="Asp.Versioning.Http.Client" Version="$(ApiVersioningVersion)"/>
5550
</ItemGroup>
@@ -59,7 +54,7 @@
5954
</ItemGroup>
6055
<ItemGroup Label="Testing">
6156
<!-- Testing Packages -->
62-
<PackageVersion Include="Bogus" Version="35.6.3"/>
57+
<PackageVersion Include="Bogus" Version="35.6.4"/>
6358
<PackageVersion Include="Shouldly" Version="4.3.0"/>
6459
<PackageVersion Include="NSubstitute" Version="5.3.0"/>
6560
<PackageVersion Include="Respawn" Version="6.2.1"/>
@@ -75,21 +70,23 @@
7570
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3"/>
7671
</ItemGroup>
7772
<ItemGroup Label="Aspire">
78-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.4.0"/>
73+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.5.1"/>
7974
<PackageVersion Include="Aspire.Hosting.Docker" Version="9.4.0-preview.1.25378.8"/>
8075
<PackageVersion Include="Aspire.Hosting.Kubernetes" Version="9.4.0-preview.1.25378.8"/>
81-
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="9.4.1"/>
82-
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.4.1"/>
76+
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="9.5.1"/>
77+
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.5.1"/>
8378
<PackageVersion Include="Scalar.Aspire" Version="0.3.2"/>
84-
<PackageVersion Include="Aspire.Hosting.Qdrant" Version="9.4.2"/>
85-
<PackageVersion Include="Aspire.Hosting.Redis" Version="9.4.2"/>
86-
<PackageVersion Include="Aspire.Qdrant.Client" Version="9.4.2"/>
79+
<PackageVersion Include="Aspire.Hosting.Qdrant" Version="9.5.1"/>
80+
<PackageVersion Include="Aspire.Hosting.Redis" Version="9.5.1"/>
81+
<PackageVersion Include="Aspire.Qdrant.Client" Version="9.5.1"/>
8782
<PackageVersion Include="Aspire.RabbitMQ.Client.v7" Version="9.4.1"/>
88-
<PackageVersion Include="Aspire.StackExchange.Redis" Version="9.4.1"/>
83+
<PackageVersion Include="Aspire.StackExchange.Redis" Version="9.5.1"/>
84+
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="9.8.0"/>
85+
<PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.8.0"/>
8986
</ItemGroup>
9087
<ItemGroup Label="OpenTelemetry">
91-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0"/>
92-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0"/>
88+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.0"/>
89+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.13.0"/>
9390
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0"/>
9491
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.12.0-beta.1"/>
9592
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0"/>

‎Versions.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project>
22
<PropertyGroup>
33
<ApiVersioningVersion>8.1.0</ApiVersioningVersion>
4-
<MicorosoftExtensionsVersion>9.7.0</MicorosoftExtensionsVersion>
54
</PropertyGroup>
65
</Project>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<PackageReference Include="Humanizer.Core" />
1818
</ItemGroup>
1919

20-
<ItemGroup>
21-
<Folder Include="AspireIntegrations\" />
22-
</ItemGroup>
23-
2420
<ItemGroup>
2521
<ProjectReference Include="..\..\Mcp\McpServer\McpServer.csproj" />
2622
<ProjectReference Include="..\..\Services\Carts\Carts.csproj" />

‎src/BuildingBlocks/AI/SemanticKernel/DependencyInjectionExtensions.cs‎

Lines changed: 41 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,7 @@ private static void AddSemanticChatCompletion(this IHostApplicationBuilder build
4141
case ProviderType.Ollama:
4242
// https://learn.microsoft.com/en-us/dotnet/aspire/community-toolkit/ollama?tabs=dotnet-cli%2Cdocker#client-integration
4343
// https://learn.microsoft.com/en-us/semantic-kernel/concepts/ai-services/chat-completion/?tabs=csharp-Ollama%2Cpython-AzureOpenAI%2Cjava-AzureOpenAI&pivots=programming-language-csharp
44-
if (builder.Configuration.GetConnectionString(AspireResources.OllamaChat) is { } connectionString)
45-
{
46-
var connectionBuilder = new DbConnectionStringBuilder { ConnectionString = connectionString };
47-
48-
if (connectionBuilder.ContainsKey("Endpoint"))
49-
{
50-
options.ChatEndpoint = connectionBuilder["Endpoint"].ToString();
51-
}
52-
53-
if (connectionBuilder.ContainsKey("Model"))
54-
{
55-
options.ChatModel = (string)connectionBuilder["Model"];
56-
}
57-
}
44+
CheckAspireChatModelOption(builder, options);
5845

5946
ArgumentException.ThrowIfNullOrEmpty(options.ChatEndpoint);
6047
ArgumentException.ThrowIfNullOrEmpty(options.ChatModel);
@@ -113,20 +100,7 @@ SemanticKernelOptions options
113100
case ProviderType.Ollama:
114101
// https://learn.microsoft.com/en-us/dotnet/aspire/community-toolkit/ollama?tabs=dotnet-cli%2Cdocker#client-integration
115102
// https://learn.microsoft.com/en-us/semantic-kernel/concepts/ai-services/embedding-generation/?tabs=csharp-Ollama&pivots=programming-language-csharp
116-
if (builder.Configuration.GetConnectionString(AspireResources.OllamaEmbedding) is { } connectionString)
117-
{
118-
var connectionBuilder = new DbConnectionStringBuilder { ConnectionString = connectionString };
119-
120-
if (connectionBuilder.ContainsKey("Endpoint"))
121-
{
122-
options.EmbeddingEndpoint = connectionBuilder["Endpoint"].ToString();
123-
}
124-
125-
if (connectionBuilder.ContainsKey("Model"))
126-
{
127-
options.EmbeddingModel = (string)connectionBuilder["Model"];
128-
}
129-
}
103+
CheckAspireEmbeddingModelOption(builder, options);
130104

131105
if (string.IsNullOrEmpty(options.EmbeddingEndpoint) || string.IsNullOrEmpty(options.EmbeddingModel))
132106
return;
@@ -171,10 +145,7 @@ private static void AddOpenTelemetry(IHostApplicationBuilder builder)
171145
// https://devblogs.microsoft.com/semantic-kernel/observability-in-semantic-kernel/
172146
// https://github.com/open-telemetry/semantic-conventions/blob/main/docs/gen-ai/README.md
173147
// https://learn.microsoft.com/en-us/semantic-kernel/concepts/enterprise-readiness/observability/telemetry-with-aspire-dashboard?tabs=Powershell&pivots=programming-language-csharp
174-
AppContext.SetSwitch(
175-
"Microsoft.SemanticKernel.Experimental.GenAI.EnableOTelDiagnosticsSensitive",
176-
builder.Environment.IsDevelopment()
177-
);
148+
AppContext.SetSwitch("Microsoft.SemanticKernel.Experimental.GenAI.EnableOTelDiagnosticsSensitive", true);
178149

179150
builder
180151
.Services.AddOpenTelemetry()
@@ -187,4 +158,42 @@ private static void AddOpenTelemetry(IHostApplicationBuilder builder)
187158
tracing.AddSource(TaskManager.ActivitySource.Name).AddSource(A2AJsonRpcProcessor.ActivitySource.Name)
188159
);
189160
}
161+
162+
private static void CheckAspireEmbeddingModelOption(IHostApplicationBuilder builder, SemanticKernelOptions options)
163+
{
164+
if (builder.Configuration.GetConnectionString(AspireResources.OllamaEmbedding) is { } connectionString)
165+
{
166+
var connectionBuilder = new DbConnectionStringBuilder { ConnectionString = connectionString };
167+
168+
if (connectionBuilder.ContainsKey("Endpoint"))
169+
{
170+
options.EmbeddingEndpoint = connectionBuilder["Endpoint"].ToString();
171+
}
172+
173+
if (connectionBuilder.ContainsKey("Model"))
174+
{
175+
options.EmbeddingModel = (string)connectionBuilder["Model"];
176+
}
177+
}
178+
}
179+
180+
private static void CheckAspireChatModelOption(IHostApplicationBuilder builder, SemanticKernelOptions options)
181+
{
182+
if (builder.Configuration.GetConnectionString(AspireResources.OllamaChat) is { } connectionString)
183+
{
184+
var connectionBuilder = new DbConnectionStringBuilder { ConnectionString = connectionString };
185+
186+
if (connectionBuilder.ContainsKey("Endpoint"))
187+
{
188+
// override existing chat endpoint with aspire connection string
189+
options.ChatEndpoint = connectionBuilder["Endpoint"].ToString();
190+
}
191+
192+
if (connectionBuilder.ContainsKey("Model"))
193+
{
194+
// override the existing chat model with aspire connection string
195+
options.ChatModel = (string)connectionBuilder["Model"];
196+
}
197+
}
198+
}
190199
}

0 commit comments

Comments
 (0)