Skip to content

Commit eea2dbd

Browse files
gdlcf88gdlcf88
committed
Upgrade to ABP 9.2.1
1 parent 587a478 commit eea2dbd

33 files changed

Lines changed: 310 additions & 461 deletions

File tree

‎.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@v2
12+
uses: actions/checkout@v4
1313
with:
1414
persist-credentials: false
1515
fetch-depth: 0

‎.github/workflows/publish.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ on:
66
- main
77
jobs:
88
publish:
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-22.04
1010
steps:
11-
- uses: actions/checkout@v2
12-
- uses: NuGet/setup-nuget@v1
13-
- uses: actions/setup-dotnet@v3
11+
- uses: actions/checkout@v4
12+
- uses: NuGet/setup-nuget@v2
13+
- uses: actions/setup-dotnet@v4
1414
with:
1515
dotnet-version: '9.0.x'
1616

‎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.1.1</AbpVersion>
4-
<EasyAbpAbpVerificationCodeModuleVersion>1.12.0</EasyAbpAbpVerificationCodeModuleVersion>
5-
<EasyAbpAbpSmsTencentCloudModuleVersion>1.15.0</EasyAbpAbpSmsTencentCloudModuleVersion>
3+
<AbpVersion>9.2.1</AbpVersion>
4+
<EasyAbpAbpVerificationCodeModuleVersion>1.13.0</EasyAbpAbpVerificationCodeModuleVersion>
5+
<EasyAbpAbpSmsTencentCloudModuleVersion>1.16.0</EasyAbpAbpSmsTencentCloudModuleVersion>
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>1.13.0</Version>
4+
<Version>1.14.0</Version>
55
<NoWarn>$(NoWarn);CS1591</NoWarn>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>EasyAbp Team</Authors>
@@ -28,3 +28,4 @@
2828

2929
</Project>
3030

31+

‎providers/Default/EasyAbp.Abp.PhoneNumberLogin.Provider.Default.Tests/EasyAbp.Abp.PhoneNumberLogin.Provider.Default.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
10-
<PackageReference Include="NSubstitute" Version="5.1.0" />
11-
<PackageReference Include="Shouldly" Version="4.2.1" />
12-
<PackageReference Include="xunit" Version="2.9.2" />
13-
<PackageReference Include="xunit.extensibility.execution" Version="2.9.2" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
10+
<PackageReference Include="NSubstitute" Version="5.3.0" />
11+
<PackageReference Include="Shouldly" Version="4.3.0" />
12+
<PackageReference Include="xunit" Version="2.9.3" />
13+
<PackageReference Include="xunit.extensibility.execution" Version="2.9.3" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" />
1515
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
1616
<PackageReference Include="Volo.Abp.Authorization" Version="$(AbpVersion)" />
1717
<PackageReference Include="Volo.Abp.TestBase" Version="$(AbpVersion)" />

‎samples/PhoneNumberLoginSample/src/PhoneNumberLoginSample.DbMigrator/PhoneNumberLoginSample.DbMigrator.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
21-
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
22-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
20+
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.1" />
21+
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
22+
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
2323
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
2424
</ItemGroup>
2525

‎samples/PhoneNumberLoginSample/src/PhoneNumberLoginSample.Domain.Shared/PhoneNumberLoginSample.Domain.Shared.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.4" />
2929
</ItemGroup>
3030

3131
<ItemGroup>

‎samples/PhoneNumberLoginSample/src/PhoneNumberLoginSample.EntityFrameworkCore/PhoneNumberLoginSample.EntityFrameworkCore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4">
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2727
<PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
2828
</PackageReference>

‎samples/PhoneNumberLoginSample/src/PhoneNumberLoginSample.Web/Pages/Account/Login.cshtml.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using Microsoft.AspNetCore.Authentication;
1+
using JetBrains.Annotations;
2+
using Microsoft.AspNetCore.Authentication;
3+
using Microsoft.AspNetCore.Hosting;
24
using Microsoft.AspNetCore.Identity;
35
using Microsoft.AspNetCore.Mvc;
46
using Microsoft.Extensions.Options;
@@ -17,12 +19,11 @@ public class CustomLoginModel : LoginModel
1719
[BindProperty(SupportsGet = true)]
1820
public string Method { get; set; } = PhoneNumberMethodName;
1921

20-
public CustomLoginModel(
21-
IAuthenticationSchemeProvider schemeProvider,
22-
IOptions<AbpAccountOptions> accountOptions,
23-
IOptions<IdentityOptions> identityOptions,
24-
IdentityDynamicClaimsPrincipalContributorCache cache)
25-
: base(schemeProvider, accountOptions, identityOptions, cache)
22+
public CustomLoginModel(IAuthenticationSchemeProvider schemeProvider,
23+
IOptions<AbpAccountOptions> accountOptions, IOptions<IdentityOptions> identityOptions,
24+
IdentityDynamicClaimsPrincipalContributorCache identityDynamicClaimsPrincipalContributorCache,
25+
IWebHostEnvironment webHostEnvironment) : base(schemeProvider, accountOptions,
26+
identityOptions, identityDynamicClaimsPrincipalContributorCache, webHostEnvironment)
2627
{
2728
}
2829
}

‎samples/PhoneNumberLoginSample/src/PhoneNumberLoginSample.Web/PhoneNumberLoginSample.Web.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
35-
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
34+
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
35+
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

0 commit comments

Comments
 (0)