Skip to content

Commit ed0ddf4

Browse files
author
Petr Rudzenkou
committed
Revert "Upgrading eshop to .NET 10 and Aspire 9.4.2 (dotnet#890)"
This reverts commit 318e037.
1 parent 67268ce commit ed0ddf4

File tree

45 files changed

+223
-532
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+223
-532
lines changed

‎.aspire/settings.json‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/workflows/playwright.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ jobs:
2222
- uses: actions/checkout@v4
2323
- uses: actions/setup-dotnet@v4
2424
with:
25-
dotnet-version: '10.0.x'
26-
dotnet-quality: 'preview'
25+
global-json-file: global.json
2726
- uses: actions/setup-node@v4
2827
with:
2928
node-version: lts/*
@@ -32,8 +31,8 @@ jobs:
3231
- name: Install .NET HTTPS Development Certificate
3332
# if: matrix.os == 'ubuntu-latest'
3433
run: |
35-
dotnet dev-certs https --clean
36-
dotnet dev-certs https --trust
34+
dotnet tool update -g linux-dev-certs
35+
dotnet linux-dev-certs install
3736
- name: Install Playwright Browsers
3837
run: npx playwright install chromium
3938
- name: Run Playwright tests

‎Directory.Packages.props‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5-
<AspnetVersion>10.0.0-preview.7.25380.108</AspnetVersion>
6-
<MicrosoftExtensionsVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsVersion>
7-
<AspireVersion>9.4.2</AspireVersion>
8-
<AspireUnstablePackagesVersion>9.4.2-preview.1.25428.12</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>
99
<GrpcVersion>2.71.0</GrpcVersion>
10-
<DuendeVersion>7.3.1</DuendeVersion>
10+
<DuendeVersion>7.1.1</DuendeVersion>
1111
<ApiVersioningVersion>8.1.0</ApiVersioningVersion>
1212
</PropertyGroup>
1313
<ItemGroup>
@@ -23,7 +23,7 @@
2323
<PackageVersion Include="Aspire.RabbitMQ.Client" Version="$(AspireVersion)" />
2424
<PackageVersion Include="Aspire.StackExchange.Redis" Version="$(AspireVersion)" />
2525
<PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="$(AspireUnstablePackagesVersion)" />
26-
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.0-rc.1.25451.107">
26+
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="$(AspnetVersion)">
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
<PrivateAssets>all</PrivateAssets>
2929
</PackageVersion>
@@ -34,34 +34,35 @@
3434
<PackageVersion Include="Asp.Versioning.Http.Client" Version="$(ApiVersioningVersion)" />
3535
<PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="$(ApiVersioningVersion)" />
3636
<!-- Version together with ASP.NET -->
37-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0-rc.1.25451.107" />
38-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0-rc.1.25451.107" />
39-
<PackageVersion Include="Microsoft.AspNetCore.Components.QuickGrid" Version="10.0.0-rc.1.25451.107" />
40-
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0-rc.1.25451.107" />
41-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0-rc.1.25451.107" />
42-
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.0-rc.1.25451.107" />
43-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-rc.1.25451.107" />
44-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0-rc.1.25451.107" />
45-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-rc.1.25451.107" />
46-
<PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="10.0.0-rc.1.25451.107" />
47-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" />
48-
<PackageVersion Include="Microsoft.OpenApi" Version="2.3.2" />
49-
<PackageVersion Include="MSTest.TestFramework" Version="3.10.4" />
50-
<PackageVersion Include="MSTest.TestAdapter" Version="3.10.4" />
37+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspnetVersion)" />
38+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(AspnetVersion)" />
39+
<PackageVersion Include="Microsoft.AspNetCore.Components.QuickGrid" Version="$(AspnetVersion)" />
40+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="$(AspnetVersion)" />
41+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspnetVersion)" />
42+
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="$(AspnetVersion)" />
43+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspnetVersion)" />
44+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(AspnetVersion)" />
45+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(AspnetVersion)" />
46+
47+
<PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="$(AspnetVersion)" />
48+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.7.0" />
49+
50+
<PackageVersion Include="MSTest.TestFramework" Version="3.8.2" />
51+
<PackageVersion Include="MSTest.TestAdapter" Version="3.8.2" />
5152
<!-- Version together with EF -->
52-
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0-rc.1" />
53-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0-rc.1.25451.107" />
53+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
54+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4" />
5455
<PackageVersion Include="NSubstitute" Version="5.3.0" />
5556
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
56-
<PackageVersion Include="Pgvector" Version="0.3.2" />
57-
<PackageVersion Include="Pgvector.EntityFrameworkCore" Version="0.2.2" />
57+
<PackageVersion Include="Pgvector" Version="0.3.0" />
58+
<PackageVersion Include="Pgvector.EntityFrameworkCore" Version="0.2.1" />
5859
<!-- Version together with runtime -->
59-
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0-rc.1.25451.107" />
60+
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsVersion)" />
6061
<!-- Xabaril packages -->
6162
<PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
6263
<!-- AI -->
63-
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="9.8.0-beta.395" />
64-
<PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.8.0-beta.395" />
64+
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="9.4.1-beta.289" />
65+
<PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.4.1-beta.289" />
6566
<!-- Open Telemetry -->
6667
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
6768
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
@@ -70,13 +71,13 @@
7071
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
7172
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
7273
<!-- IdentityServer -->
73-
<PackageVersion Include="Duende.IdentityServer" Version="7.3.2" />
74-
<PackageVersion Include="Duende.IdentityServer.AspNetIdentity" Version="7.3.2" />
75-
<PackageVersion Include="Duende.IdentityServer.EntityFramework" Version="7.3.2" />
76-
<PackageVersion Include="Duende.IdentityServer.EntityFramework.Storage" Version="7.3.2" />
77-
<PackageVersion Include="Duende.IdentityServer.Storage" Version="7.3.2" />
74+
<PackageVersion Include="Duende.IdentityServer" Version="$(DuendeVersion)" />
75+
<PackageVersion Include="Duende.IdentityServer.AspNetIdentity" Version="$(DuendeVersion)" />
76+
<PackageVersion Include="Duende.IdentityServer.EntityFramework" Version="$(DuendeVersion)" />
77+
<PackageVersion Include="Duende.IdentityServer.EntityFramework.Storage" Version="$(DuendeVersion)" />
78+
<PackageVersion Include="Duende.IdentityServer.Storage" Version="$(DuendeVersion)" />
7879
<!-- VS Test -->
79-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
80+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
8081
<!-- Scaffolding -->
8182
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0-rc.1.23461.3" />
8283
<!-- Grpc -->
@@ -85,16 +86,15 @@
8586
<PackageVersion Include="Grpc.Tools" Version="2.72.0" PrivateAssets="All" />
8687
<!-- Miscellaneous -->
8788
<PackageVersion Include="Dapper" Version="2.1.35" />
88-
<PackageVersion Include="FluentValidation" Version="12.0.0" />
89-
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
90-
<PackageVersion Include="Google.Protobuf" Version="3.32.1" />
91-
<PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="3.0.71" />
89+
<PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0" />
90+
<PackageVersion Include="Google.Protobuf" Version="3.31.1" />
91+
<PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
9292
<PackageVersion Include="System.Reflection.TypeExtensions" Version="4.7.0" />
9393
<PackageVersion Include="xunit" Version="2.9.3" />
94-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
94+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
9595
<PackageVersion Include="IdentityModel" Version="7.0.0" />
96-
<PackageVersion Include="Scalar.AspNetCore" Version="2.8.6" />
96+
<PackageVersion Include="Scalar.AspNetCore" Version="2.0.26"/>
9797
<!-- Before license change -->
98-
<PackageVersion Include="MediatR" Version="13.0.0" />
98+
<PackageVersion Include="MediatR" Version="12.5.0" />
9999
</ItemGroup>
100100
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.1.25451.107",
3+
"version": "9.0.200",
44
"rollForward": "latestFeature",
55
"allowPrerelease": true
66
}

‎src/Basket.API/Basket.API.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net10.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<UserSecretsId>2964ec8e-0d48-4541-b305-94cab537f867</UserSecretsId>
55
<PublishAot Condition="'$(EnableAotPublishing)' == 'true'">true</PublishAot>
66
</PropertyGroup>

‎src/Catalog.API/Catalog.API.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<UserSecretsId>d1b521ec-3411-4d39-98c6-8509466ed471</UserSecretsId>
77
</PropertyGroup>

0 commit comments

Comments
 (0)