Skip to content

Commit 1c90ec9

Browse files
eerhardtjoperezr
andauthored
Update eshop to Aspire 9.4 (#858)
* Update eshop to Aspire 9.4 Take advantage of the new Aspire.Hosting.Yarp integration and remove the Mobile.Bff.Shopping service. Remove unnecessary package references and versions * Fix product images when https is enabled. * Update to .slnx * Refactor OpenAI configuration to use parameters * Apply suggestions from code review * Remove Mobile.Bff.Shopping project from solution file * Update Aspire.AppHost.Sdk version to 9.4.0 in project files --------- Co-authored-by: Jose Perez Rodriguez <[email protected]>
1 parent 826ab84 commit 1c90ec9

File tree

21 files changed

+198
-639
lines changed

21 files changed

+198
-639
lines changed

Directory.Packages.props

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5-
<AspnetVersion>9.0.5</AspnetVersion>
6-
<MicrosoftExtensionsVersion>9.0.5</MicrosoftExtensionsVersion>
7-
<MicrosoftExtensionsAIVersion>9.5.0</MicrosoftExtensionsAIVersion>
8-
<AspireVersion>9.3.0</AspireVersion>
9-
<AspireUnstablePackagesVersion>9.3.0-preview.1.25265.20</AspireUnstablePackagesVersion>
5+
<AspnetVersion>9.0.7</AspnetVersion>
6+
<MicrosoftExtensionsVersion>9.0.7</MicrosoftExtensionsVersion>
7+
<AspireVersion>9.4.0</AspireVersion>
8+
<AspireUnstablePackagesVersion>9.4.0-preview.1.25378.8</AspireUnstablePackagesVersion>
109
<GrpcVersion>2.71.0</GrpcVersion>
1110
<DuendeVersion>7.1.1</DuendeVersion>
1211
<ApiVersioningVersion>8.1.0</ApiVersioningVersion>
@@ -18,6 +17,7 @@
1817
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="$(AspireVersion)" />
1918
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="$(AspireVersion)" />
2019
<PackageVersion Include="Aspire.Hosting.Redis" Version="$(AspireVersion)" />
20+
<PackageVersion Include="Aspire.Hosting.Yarp" Version="$(AspireUnstablePackagesVersion)" />
2121
<PackageVersion Include="Aspire.Npgsql" Version="$(AspireVersion)" />
2222
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(AspireVersion)" />
2323
<PackageVersion Include="Aspire.RabbitMQ.Client" Version="$(AspireVersion)" />
@@ -45,7 +45,7 @@
4545
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(AspnetVersion)" />
4646

4747
<PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="$(AspnetVersion)" />
48-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.5.0" />
48+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.7.0" />
4949

5050
<PackageVersion Include="MSTest.TestFramework" Version="3.8.2" />
5151
<PackageVersion Include="MSTest.TestAdapter" Version="3.8.2" />
@@ -57,15 +57,10 @@
5757
<PackageVersion Include="Pgvector" Version="0.3.0" />
5858
<PackageVersion Include="Pgvector.EntityFrameworkCore" Version="0.2.1" />
5959
<!-- Version together with runtime -->
60-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsVersion)" />
6160
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsVersion)" />
62-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
6361
<!-- Xabaril packages -->
6462
<PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
6563
<!-- AI -->
66-
<PackageVersion Include="Microsoft.Extensions.AI" Version="$(MicrosoftExtensionsAIVersion)" />
67-
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="$(MicrosoftExtensionsAIVersion)" />
68-
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25265.7" />
6964
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="9.4.1-beta.289" />
7065
<PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.4.1-beta.289" />
7166
<!-- Open Telemetry -->
@@ -92,13 +87,11 @@
9287
<!-- Miscellaneous -->
9388
<PackageVersion Include="Dapper" Version="2.1.35" />
9489
<PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0" />
95-
<PackageVersion Include="Google.Protobuf" Version="3.30.2" />
90+
<PackageVersion Include="Google.Protobuf" Version="3.31.1" />
9691
<PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
97-
<PackageVersion Include="Polly.Core" Version="8.5.2" />
9892
<PackageVersion Include="System.Reflection.TypeExtensions" Version="4.7.0" />
9993
<PackageVersion Include="xunit" Version="2.9.3" />
10094
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
101-
<PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
10295
<PackageVersion Include="IdentityModel" Version="7.0.0" />
10396
<PackageVersion Include="Scalar.AspNetCore" Version="2.0.26"/>
10497
<!-- Before license change -->

eShop.Web.slnf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
{
22
"solution": {
3-
"path": "eShop.sln",
3+
"path": "eShop.slnx",
44
"projects": [
55
"src\\Basket.API\\Basket.API.csproj",
66
"src\\Catalog.API\\Catalog.API.csproj",
77
"src\\EventBusRabbitMQ\\EventBusRabbitMQ.csproj",
88
"src\\EventBus\\EventBus.csproj",
99
"src\\Identity.API\\Identity.API.csproj",
1010
"src\\IntegrationEventLogEF\\IntegrationEventLogEF.csproj",
11-
"src\\Mobile.Bff.Shopping\\Mobile.Bff.Shopping.csproj",
1211
"src\\Ordering.API\\Ordering.API.csproj",
1312
"src\\OrderProcessor\\OrderProcessor.csproj",
1413
"src\\Ordering.Domain\\Ordering.Domain.csproj",

0 commit comments

Comments
 (0)