Update to .NET Aspire 9.0

Directory.Packages.props

@@ -2,12 +2,11 @@
  <PropertyGroup>
  <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
- <AspnetVersion>9.0.0-rc.1.24452.1</AspnetVersion>
- <MicrosoftExtensionsVersion>9.0.0-rc.1.24431.7</MicrosoftExtensionsVersion>
- <EfVersion>9.0.0-preview.7.24405.3</EfVersion>
- <AspireVersion>8.2.0</AspireVersion>
- <AspireUnstablePackagesVersion>8.0.0-preview.8.24258.2</AspireUnstablePackagesVersion>
- <GrpcVersion>2.65.0</GrpcVersion>
+ <AspnetVersion>9.0.0-rc.2.24474.3</AspnetVersion>
+ <MicrosoftExtensionsVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsVersion>
+ <AspireVersion>9.0.0-rc.1.24511.1</AspireVersion>
+ <AspireUnstablePackagesVersion>9.0.0-preview.4.24511.1</AspireUnstablePackagesVersion>
+ <GrpcVersion>2.66.0</GrpcVersion>
  <DuendeVersion>7.0.6</DuendeVersion>
  <ApiVersioningVersion>8.1.0</ApiVersioningVersion>
  </PropertyGroup>
@@ -25,10 +24,11 @@
  <PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="$(AspireUnstablePackagesVersion)" />
  <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
  <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="$(AspireVersion)" />
- <!-- Version together with ASP.NET -->
+ <!-- Version together with Asp.Versioning -->
  <PackageVersion Include="Asp.Versioning.Http" Version="$(ApiVersioningVersion)" />
  <PackageVersion Include="Asp.Versioning.Http.Client" Version="$(ApiVersioningVersion)" />
  <PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="$(ApiVersioningVersion)" />
+ <!-- Version together with ASP.NET -->
  <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspnetVersion)" />
  <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(AspnetVersion)" />
  <PackageVersion Include="Microsoft.AspNetCore.Components.QuickGrid" Version="$(AspnetVersion)" />
@@ -43,8 +43,8 @@
  <PackageVersion Include="MSTest.TestAdapter" Version="3.5.2" />
  <PackageVersion Include="MSTest.TestFramework" Version="3.5.2" />
  <!-- Version together with EF -->
- <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0-preview.7" />
- <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EfVersion)" />
+ <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0-rc.2" />
+ <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-rc.2.24474.1" />
  <PackageVersion Include="NSubstitute" Version="5.1.0" />
  <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
  <PackageVersion Include="Pgvector" Version="0.3.0" />
@@ -56,8 +56,10 @@
  <!-- Xabaril packages -->
  <PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="8.0.1" />
  <!-- AI -->
- <PackageVersion Include="Microsoft.SemanticKernel" Version="1.17.1" />
- <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Onnx" Version="1.14.0-alpha" />
+ <PackageVersion Include="Microsoft.Extensions.AI" Version="9.0.0-preview.9.24507.7" />
+ <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.0.0-preview.9.24507.7" />
+ <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24507.7" />
+ <PackageVersion Include="Microsoft.Extensions.AI.Ollama" Version="9.0.0-preview.9.24507.7" />
  <!-- Open Telemetry -->
  <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
  <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
@@ -85,11 +87,11 @@
  <PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0" />
  <PackageVersion Include="MediatR" Version="12.4.0" />
  <PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
- <PackageVersion Include="Polly.Core" Version="8.4.1" />
+ <PackageVersion Include="Polly.Core" Version="8.4.2" />
  <PackageVersion Include="System.Reflection.TypeExtensions" Version="4.7.0" />
  <PackageVersion Include="xunit" Version="2.9.1" />
  <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
- <PackageVersion Include="Yarp.ReverseProxy" Version="2.1.0" />
+ <PackageVersion Include="Yarp.ReverseProxy" Version="2.2.0" />
  <PackageVersion Include="IdentityModel" Version="7.0.0" />
  <PackageVersion Include="Scalar.AspNetCore" Version="1.1.2"/>
  </ItemGroup>

global.json

@@ -1,6 +1,6 @@
 {
  "sdk": {
- "version": "9.0.100-rc.1.24452.12",
+ "version": "9.0.100-rc.2.24474.11",
  "rollForward": "latestFeature",
  "allowPrerelease": true
  }

src/Catalog.API/Catalog.API.csproj

@@ -3,7 +3,6 @@
  <PropertyGroup>
  <TargetFramework>net9.0</TargetFramework>
  <UserSecretsId>d1b521ec-3411-4d39-98c6-8509466ed471</UserSecretsId>
- <NoWarn>$(NoWarn);SKEXP0001;SKEXP0010;SKEXP0070</NoWarn>
  </PropertyGroup>
 
  <ItemGroup>
@@ -23,8 +22,9 @@
  <!-- AI -->
  <ItemGroup>
  <PackageReference Include="Aspire.Azure.AI.OpenAI" />
- <PackageReference Include="Microsoft.SemanticKernel" />
- <PackageReference Include="Microsoft.SemanticKernel.Connectors.Onnx" />
+ <PackageReference Include="Microsoft.Extensions.AI" />
+ <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
+ <PackageReference Include="Microsoft.Extensions.AI.Ollama" />
  <PackageReference Include="Pgvector" />
  <PackageReference Include="Pgvector.EntityFrameworkCore" />
  </ItemGroup>

src/Catalog.API/Extensions/Extensions.cs

@@ -1,5 +1,6 @@
 using eShop.Catalog.API.Services;
-using Microsoft.SemanticKernel;
+using Microsoft.Extensions.AI;
+using OpenAI;
 
 public static class Extensions
 {
@@ -28,17 +29,24 @@ public static void AddApplicationServices(this IHostApplicationBuilder builder)
  builder.Services.AddOptions<CatalogOptions>()
  .BindConfiguration(nameof(CatalogOptions));
 
- if (builder.Configuration["AI:Onnx:EmbeddingModelPath"] is string modelPath &&
- builder.Configuration["AI:Onnx:EmbeddingVocabPath"] is string vocabPath)
+ if (builder.Configuration["AI:Ollama:Endpoint"] is string ollamaEndpoint && !string.IsNullOrWhiteSpace(ollamaEndpoint))
  {
- builder.Services.AddBertOnnxTextEmbeddingGeneration(modelPath, vocabPath);
+ builder.Services.AddEmbeddingGenerator<string, Embedding<float>>(b => b
+ .UseOpenTelemetry()
+ .UseLogging()
+ .Use(new OllamaEmbeddingGenerator(
+ new Uri(ollamaEndpoint),
+ builder.Configuration["AI:Ollama:EmbeddingModel"])));
  }
  else if (!string.IsNullOrWhiteSpace(builder.Configuration.GetConnectionString("openai")))
  {
- builder.AddAzureOpenAIClient("openai");
- builder.Services.AddOpenAITextEmbeddingGeneration(builder.Configuration["AIOptions:OpenAI:EmbeddingName"] ?? "text-embedding-3-small");
+ builder.AddOpenAIClientFromConfiguration("openai");
+ builder.Services.AddEmbeddingGenerator<string, Embedding<float>>(b => b
+ .UseOpenTelemetry()
+ .UseLogging()
+ .Use(b.Services.GetRequiredService<OpenAIClient>().AsEmbeddingGenerator(builder.Configuration["AI:OpenAI:EmbeddingModel"]!)));
  }
 
- builder.Services.AddSingleton<ICatalogAI, CatalogAI>();
+ builder.Services.AddScoped<ICatalogAI, CatalogAI>();
  }
 }

src/Catalog.API/Services/CatalogAI.cs

@@ -1,20 +1,20 @@
 using System.Diagnostics;
-using Microsoft.SemanticKernel.Embeddings;
+using Microsoft.Extensions.AI;
 using Pgvector;
 
 namespace eShop.Catalog.API.Services;
 
 public sealed class CatalogAI : ICatalogAI
 {
  private const int EmbeddingDimensions = 384;
- private readonly ITextEmbeddingGenerationService _embeddingGenerator;
+ private readonly IEmbeddingGenerator<string, Embedding<float>> _embeddingGenerator;
 
  /// <summary>The web host environment.</summary>
  private readonly IWebHostEnvironment _environment;
  /// <summary>Logger for use in AI operations.</summary>
  private readonly ILogger _logger;
 
- public CatalogAI(IWebHostEnvironment environment, ILogger<CatalogAI> logger, ITextEmbeddingGenerationService embeddingGenerator = null)
+ public CatalogAI(IWebHostEnvironment environment, ILogger<CatalogAI> logger, IEmbeddingGenerator<string, Embedding<float>> embeddingGenerator = null)
  {
  _embeddingGenerator = embeddingGenerator;
  _environment = environment;
@@ -37,8 +37,8 @@ public async ValueTask<IReadOnlyList<Vector>> GetEmbeddingsAsync(IEnumerable<Cat
  {
  long timestamp = Stopwatch.GetTimestamp();
 
- IList<ReadOnlyMemory<float>> embeddings = await _embeddingGenerator.GenerateEmbeddingsAsync(items.Select(CatalogItemToString).ToList());
- var results = embeddings.Select(m => new Vector(m[0..EmbeddingDimensions])).ToList();
+ GeneratedEmbeddings<Embedding<float>> embeddings = await _embeddingGenerator.GenerateAsync(items.Select(CatalogItemToString));
+ var results = embeddings.Select(m => new Vector(m.Vector[0..EmbeddingDimensions])).ToList();
 
  if (_logger.IsEnabled(LogLevel.Trace))
  {
@@ -58,7 +58,7 @@ public async ValueTask<Vector> GetEmbeddingAsync(string text)
  {
  long timestamp = Stopwatch.GetTimestamp();
 
- ReadOnlyMemory<float> embedding = await _embeddingGenerator.GenerateEmbeddingAsync(text);
+ var embedding = (await _embeddingGenerator.GenerateAsync(text))[0].Vector;
  embedding = embedding[0..EmbeddingDimensions];
 
  if (_logger.IsEnabled(LogLevel.Trace))

src/Catalog.API/appsettings.json

@@ -23,14 +23,14 @@
  },
  "CatalogOptions": {
  "UseCustomizationData": false
+ },
+ "AI": {
+ "OpenAI": {
+ "EmbeddingModel": "text-embedding-3-small"
+ },
+ "Ollama": {
+ "Endpoint": "",
+ "EmbeddingModel": "all-minilm"
+ }
  }
- //"AI": {
- // "OpenAI": {
- // "EmbeddingName": ""
- // },
- // "Onnx": {
- // "EmbeddingModelPath": "",
- // "EmbeddingVocabPath": ""
- // }
- //}
 }

src/WebApp/AIOptions.cs

@@ -10,5 +10,5 @@ public class OpenAIOptions
 {
  /// <summary>The name of the chat model to use.</summary>
  /// <remarks>When using Azure OpenAI, this should be the "Deployment name" of the chat model.</remarks>
- public string ChatModel { get; set; } = "gpt-3.5-turbo-16k";
+ public string ChatModel { get; set; } = "gpt-4o-mini";
 }