Skip to content
This repository has been archived by the owner on Jan 10, 2025. It is now read-only.

Upgrade to ABP version 9.0.0 #273

Merged
merged 3 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v2
with:
dotnet-version: 8.x
dotnet-version: 9.x
- name: Restore workloads
run: dotnet workload restore
- name: Restore dependencies
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This is a reference project for those who want to build microservice solutions with the ABP Framework.

See [the blog post](https://blog.abp.io/abp/Introducing-the-eShopOnAbp-Project) for more info.
See [the blog post](https://abp.io/blog/Introducing-the-eShopOnAbp-Project) for more info.

Live demo 👉 https://www.eshoponabp.com/

Expand All @@ -17,7 +17,7 @@ You can run it in Visual Studio or use [Microsoft Tye](https://github.com/dotnet
### Requirements

- .NET 6.0 Runtime (required for TYE)
- .NET 8.0 SDK
- .NET 9.0 SDK
- Docker
- Yarn v1.20+(not v2) or npm v6+ (already installed with Node)

Expand Down
20 changes: 10 additions & 10 deletions apps/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
},
"private": true,
"dependencies": {
"@abp/ng.account": "^8.3.1",
"@abp/ng.components": "^8.3.1",
"@abp/ng.core": "^8.3.1",
"@abp/ng.identity": "^8.3.1",
"@abp/ng.oauth": "^8.3.1",
"@abp/ng.setting-management": "^8.3.1",
"@abp/ng.tenant-management": "^8.3.1",
"@abp/ng.theme.basic": "^8.3.1",
"@abp/ng.account": "^9.0.0",
"@abp/ng.components": "^9.0.0",
"@abp/ng.core": "^9.0.0",
"@abp/ng.identity": "^9.0.0",
"@abp/ng.oauth": "^9.0.0",
"@abp/ng.setting-management": "^9.0.0",
"@abp/ng.tenant-management": "^9.0.0",
"@abp/ng.theme.basic": "^9.0.0",
"@abp/ng.theme.lepton-x": "~3.3.1",
"@abp/ng.theme.shared": "^8.3.1",
"@abp/ng.theme.shared": "^9.0.0",
"@angular/animations": "~18.1.0",
"@angular/common": "~18.1.0",
"@angular/compiler": "~18.1.0",
Expand All @@ -36,7 +36,7 @@
"zone.js": "~0.14.2"
},
"devDependencies": {
"@abp/ng.schematics": "^8.3.1",
"@abp/ng.schematics": "^9.0.0",
"@angular-devkit/build-angular": "~18.1.0",
"@angular/cli": "~18.1.0",
"@angular/compiler-cli": "~18.1.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.local
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0
COPY bin/Release/net8.0/publish/ app/
COPY bin/Release/net9.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EShopOnAbp.PublicWeb.dll"]
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.1" />
<PackageReference Include="Volo.CmsKit.Public.Web" Version="8.3.1" />
<PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.2.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="9.0.0" />
<PackageReference Include="Volo.CmsKit.Public.Web" Version="9.0.0" />
<PackageReference Include="Yarp.ReverseProxy" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.3.1" />
<PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="3.3.1" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="9.0.0" />
<PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="9.0.0" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="4.0.0" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="9.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
RoleClaimType = ClaimTypes.Role,
ValidateIssuer = true
};

options.Events.OnAuthorizationCodeReceived = async (authContext) =>
{
var userLoggedInEto = CreateUserLoggedInEto(authContext.Principal, authContext.HttpContext);
Expand Down Expand Up @@ -233,9 +233,9 @@ public override void ConfigureServices(ServiceConfigurationContext context)
await previousOnRedirectToIdentityProvider(ctx);
}
};
var previousOnRedirectToIdentityProviderForSignOut =
options.Events.OnRedirectToIdentityProviderForSignOut;
options.Events.OnRedirectToIdentityProviderForSignOut = async ctx =>
var previousOnRedirectToIdentityProviderForSignOut = options.Events.OnRedirectToIdentityProviderForSignOut;

options.Events.OnRedirectToIdentityProviderForSignOut = async (ctx) =>
{
// Intercept the redirection for signout so the browser navigates to the right URL in your host
ctx.ProtocolMessage.IssuerAddress = configuration["AuthServer:Authority"].EnsureEndsWith('/') +
Expand All @@ -245,6 +245,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
{
await previousOnRedirectToIdentityProviderForSignOut(ctx);
}

};
});
}
Expand Down Expand Up @@ -312,7 +313,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
});

app.UseCorrelationId();
app.UseStaticFiles();
app.MapAbpStaticAssets();
app.UseRouting();
app.UseAuthentication();
app.UseAbpSerilogEnrichers();
Expand Down
4 changes: 2 additions & 2 deletions apps/public-web/src/EShopOnAbp.PublicWeb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.3.1",
"@abp/signalr": "^8.3.1",
"@abp/cms-kit": "^8.3.1"
"@abp/signalr": "^9.0.0",
"@abp/cms-kit": "^9.0.0"
}
}
Loading
Loading