Merge pull request #273 from abpframework/net9

Upgrade to ABP version 9.0.0

.github/workflows/dotnet.yml

@@ -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

README.md

@@ -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/
 
@@ -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)
 

apps/angular/package.json

@@ -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",
@@ -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",

apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.local

@@ -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"]

apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj

@@ -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>

apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs

@@ -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);
@@ -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('/') +
@@ -245,6 +245,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                     {
                         await previousOnRedirectToIdentityProviderForSignOut(ctx);
                     }
+
                 };
             });
         }
@@ -312,7 +313,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         });
 
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpSerilogEnrichers();

apps/public-web/src/EShopOnAbp.PublicWeb/package.json

@@ -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"
   }
 }