Update eshop to Aspire 9.4

Directory.Packages.props

@@ -2,11 +2,10 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <AspnetVersion>9.0.5</AspnetVersion>
-    <MicrosoftExtensionsVersion>9.0.5</MicrosoftExtensionsVersion>
-    <MicrosoftExtensionsAIVersion>9.5.0</MicrosoftExtensionsAIVersion>
-    <AspireVersion>9.3.0</AspireVersion>
-    <AspireUnstablePackagesVersion>9.3.0-preview.1.25265.20</AspireUnstablePackagesVersion>
+    <AspnetVersion>9.0.7</AspnetVersion>
+    <MicrosoftExtensionsVersion>9.0.7</MicrosoftExtensionsVersion>
+    <AspireVersion>9.4.0-preview.1.25367.4</AspireVersion>
+    <AspireUnstablePackagesVersion>9.4.0-preview.1.25367.4</AspireUnstablePackagesVersion>
     <GrpcVersion>2.71.0</GrpcVersion>
     <DuendeVersion>7.1.1</DuendeVersion>
     <ApiVersioningVersion>8.1.0</ApiVersioningVersion>
@@ -18,6 +17,7 @@
     <PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.Redis" Version="$(AspireVersion)" />
+    <PackageVersion Include="Aspire.Hosting.Yarp" Version="$(AspireUnstablePackagesVersion)" />
     <PackageVersion Include="Aspire.Npgsql" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.RabbitMQ.Client" Version="$(AspireVersion)" />
@@ -45,7 +45,7 @@
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(AspnetVersion)" />
 
     <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="$(AspnetVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.5.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.7.0" />
 
     <PackageVersion Include="MSTest.TestFramework" Version="3.8.2" />
     <PackageVersion Include="MSTest.TestAdapter" Version="3.8.2" />
@@ -57,15 +57,10 @@
     <PackageVersion Include="Pgvector" Version="0.3.0" />
     <PackageVersion Include="Pgvector.EntityFrameworkCore" Version="0.2.1" />
     <!-- Version together with runtime -->
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
     <!-- Xabaril packages -->
     <PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
     <!-- AI -->
-    <PackageVersion Include="Microsoft.Extensions.AI" Version="$(MicrosoftExtensionsAIVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="$(MicrosoftExtensionsAIVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25265.7" />
     <PackageVersion Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="9.4.1-beta.289" />
     <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.4.1-beta.289" />
     <!-- Open Telemetry -->
@@ -92,13 +87,11 @@
     <!-- Miscellaneous -->
     <PackageVersion Include="Dapper" Version="2.1.35" />
     <PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0" />
-    <PackageVersion Include="Google.Protobuf" Version="3.30.2" />
+    <PackageVersion Include="Google.Protobuf" Version="3.31.1" />
     <PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
-    <PackageVersion Include="Polly.Core" Version="8.5.2" />
     <PackageVersion Include="System.Reflection.TypeExtensions" Version="4.7.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
-    <PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
     <PackageVersion Include="IdentityModel" Version="7.0.0" />
     <PackageVersion Include="Scalar.AspNetCore" Version="2.0.26"/>
     <!-- Before license change -->

eShop.Web.slnf

@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "eShop.sln",
+    "path": "eShop.slnx",
     "projects": [
       "src\\Basket.API\\Basket.API.csproj",
       "src\\Catalog.API\\Catalog.API.csproj",

eShop.slnx

@@ -0,0 +1,36 @@
+<Solution>
+  <Folder Name="/src/">
+    <Project Path="src/eShop.AppHost/eShop.AppHost.csproj" />
+    <Project Path="src/Basket.API/Basket.API.csproj" />
+    <Project Path="src/Catalog.API/Catalog.API.csproj" />
+    <Project Path="src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj" />
+    <Project Path="src/EventBus/EventBus.csproj" />
+    <Project Path="src/EventBusRabbitMQ/EventBusRabbitMQ.csproj" />
+    <Project Path="src/Identity.API/Identity.API.csproj" />
+    <Project Path="src/IntegrationEventLogEF/IntegrationEventLogEF.csproj" />
+    <Project Path="src/Ordering.API/Ordering.API.csproj" />
+    <Project Path="src/OrderProcessor/OrderProcessor.csproj" />
+    <Project Path="src/Ordering.Domain/Ordering.Domain.csproj" />
+    <Project Path="src/Ordering.Infrastructure/Ordering.Infrastructure.csproj" />
+    <Project Path="src/PaymentProcessor/PaymentProcessor.csproj" />
+    <Project Path="src/WebApp/WebApp.csproj" />
+    <Project Path="src/WebhookClient/WebhookClient.csproj" />
+    <Project Path="src/Webhooks.API/Webhooks.API.csproj" />
+    <Project Path="src/WebAppComponents/WebAppComponents.csproj" />
+    <Project Path="src/HybridApp/HybridApp.csproj" />
+    <Project Path="src/ClientApp/ClientApp.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/Basket.UnitTests/Basket.UnitTests.csproj" />
+    <Project Path="tests/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj" />
+    <Project Path="tests/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj" />
+    <Project Path="tests/Ordering.UnitTests/Ordering.UnitTests.csproj" />
+    <Project Path="tests/ClientApp.UnitTests/ClientApp.UnitTests.csproj" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path="Directory.Packages.props" />
+    <File Path="NuGet.config" />
+    <File Path="README.md" />
+  </Folder>
+</Solution>

nuget.config

@@ -4,6 +4,7 @@
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
   </packageSources>
 
   <packageSourceMapping>
@@ -12,5 +13,8 @@
     <packageSource key="nuget">
       <package pattern="*" />
     </packageSource>
+    <packageSource key="dotnet9">
+      <package pattern="*" />
+    </packageSource>
   </packageSourceMapping>
 </configuration>

src/Catalog.API/Catalog.API.csproj

@@ -31,8 +31,6 @@
   <!-- AI -->
   <ItemGroup>
     <PackageReference Include="Aspire.Azure.AI.OpenAI" />
-    <PackageReference Include="Microsoft.Extensions.AI" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
     <PackageReference Include="Pgvector" />
     <PackageReference Include="Pgvector.EntityFrameworkCore" />
   </ItemGroup>

src/EventBus/EventBus.csproj

@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Options" />
   </ItemGroup>
 

src/EventBusRabbitMQ/EventBusRabbitMQ.csproj

@@ -13,8 +13,6 @@
 
   <ItemGroup>
     <PackageReference Include="Aspire.RabbitMQ.Client" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
-    <PackageReference Include="Polly.Core" />
   </ItemGroup>
 
   <ItemGroup>