Skip to content

Commit d8d30bb

Browse files
gdlcf88gdlcf88
committed
Upgrade to ABP 10.0.1
1 parent 85ddb8d commit d8d30bb

File tree

185 files changed

+39095
-23117
lines changed

Some content is hidden

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

185 files changed

+39095
-23117
lines changed

‎.github/workflows/publish-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v5
1313
with:
1414
persist-credentials: false
1515
fetch-depth: 0

‎.github/workflows/publish.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
publish:
99
runs-on: ubuntu-22.04
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v5
1212
- uses: NuGet/setup-nuget@v2
13-
- uses: actions/setup-dotnet@v4
13+
- uses: actions/setup-dotnet@v5
1414
with:
15-
dotnet-version: '9.0.x'
15+
dotnet-version: '10.0.x'
1616

1717
- name: read common.props
1818
id: commonProps

‎Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<AbpVersion>9.3.3</AbpVersion>
4-
<EasyAbpPrivateMessagingModuleVersion>3.1.0</EasyAbpPrivateMessagingModuleVersion>
5-
<EasyAbpAbpWeChatModuleVersion>3.7.0</EasyAbpAbpWeChatModuleVersion>
3+
<AbpVersion>10.0.1</AbpVersion>
4+
<EasyAbpPrivateMessagingModuleVersion>3.2.0</EasyAbpPrivateMessagingModuleVersion>
5+
<EasyAbpAbpWeChatModuleVersion>3.8.0</EasyAbpAbpWeChatModuleVersion>
66
</PropertyGroup>
77
</Project>

‎common.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<LangVersion>latest</LangVersion>
4-
<Version>3.5.0</Version>
4+
<Version>3.6.0</Version>
55
<NoWarn>$(NoWarn);CS1591</NoWarn>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>EasyAbp Team</Authors>
@@ -30,3 +30,4 @@
3030

3131

3232

33+

‎host/EasyAbp.NotificationService.Host.Shared/EasyAbp.NotificationService.Host.Shared.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>net9.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
<RootNamespace>EasyAbp.NotificationService</RootNamespace>
88
</PropertyGroup>
99

‎host/EasyAbp.NotificationService.HttpApi.Host/EasyAbp.NotificationService.HttpApi.Host.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>net9.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
<RootNamespace>EasyAbp.NotificationService</RootNamespace>
88
<PreserveCompilationReferences>true</PreserveCompilationReferences>
99
<UserSecretsId>EasyAbp.NotificationService-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>
@@ -12,10 +12,10 @@
1212
<ItemGroup>
1313
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
1414
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
15-
<PackageReference Include="IdentityModel" Version="7.0.0" />
16-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.5" />
17-
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.5" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.5" />
15+
<PackageReference Include="Duende.IdentityModel" Version="7.1.0" />
16+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" />
17+
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.0" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" />
1919
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
2020
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="$(AbpVersion)" />
2121
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="$(AbpVersion)" />

‎host/EasyAbp.NotificationService.HttpApi.Host/NotificationServiceHttpApiHostModule.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.IO;
44
using System.Linq;
55
using System.Security.Claims;
6-
using IdentityModel;
6+
using Duende.IdentityModel;
77
using Microsoft.AspNetCore.Authentication.JwtBearer;
88
using Microsoft.AspNetCore.Builder;
99
using Microsoft.AspNetCore.Cors;
@@ -177,8 +177,8 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
177177

178178
app.UseHttpsRedirection();
179179
app.UseCorrelationId();
180-
app.MapAbpStaticAssets();
181180
app.UseRouting();
181+
app.MapAbpStaticAssets();
182182
app.UseCors(DefaultCorsPolicyName);
183183
app.UseAuthentication();
184184
app.UseAbpClaimsMap();

‎host/EasyAbp.NotificationService.IdentityServer/EasyAbp.NotificationService.IdentityServer.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<RootNamespace>EasyAbp.NotificationService</RootNamespace>
66
<PreserveCompilationReferences>true</PreserveCompilationReferences>
77
<UserSecretsId>EasyAbp.NotificationService-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>
@@ -10,8 +10,8 @@
1010
<ItemGroup>
1111
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
1212
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
13-
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.5" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.5" />
13+
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.0" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" />
1515
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(AbpVersion)" />
1616
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="$(AbpVersion)" />
1717
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="$(AbpVersion)" />

0 commit comments

Comments
 (0)