Skip to content

Commit e72585a

Browse files
committed
Upgraded to ABP 9.1
1 parent 717d53b commit e72585a

File tree

10 files changed

+31
-40
lines changed

10 files changed

+31
-40
lines changed

angular/src/shared/auth/app-auth.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export class AppAuthService {
3131
abp.utils.deleteCookie(AppConsts.authorization.encryptedAuthTokenName);
3232

3333
if (reload !== false) {
34-
location.href = AppConsts.appBaseUrl + 'index.html';
34+
location.href = AppConsts.appBaseUrl + '/index.html';
3535
}
3636
}
3737

@@ -92,7 +92,7 @@ export class AppAuthService {
9292

9393
let initialUrl = UrlHelper.initialUrl;
9494
if (initialUrl.indexOf('/login') > 0) {
95-
initialUrl = AppConsts.appBaseUrl + 'index.html';
95+
initialUrl = AppConsts.appBaseUrl + '/index.html';
9696
}
9797

9898
location.href = initialUrl;

aspnet-core/src/EventCloud.Application/Events/EventAppService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public async Task<EventDetailOutput> GetDetailAsync(EntityDto<Guid> input)
6161

6262
public async Task CreateAsync(CreateEventInput input)
6363
{
64-
var tenantId = (int)AbpSession.TenantId.Value;
64+
var tenantId = AbpSession.TenantId.Value;
6565
var @event = Event.Create(tenantId, input.Title, input.Date, input.Description, input.MaxRegistrationCount);
6666
await _eventManager.CreateAsync(@event);
6767
}

aspnet-core/src/EventCloud.Core/EventCloud.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<EmbeddedResource Include="Localization\SourceFiles\*.xml" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Abp.AutoMapper" Version="9.0.0" />
19-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="9.0.0" />
18+
<PackageReference Include="Abp.AutoMapper" Version="9.1.0" />
19+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="9.1.0" />
2020
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="4.1.0" />
2121
</ItemGroup>
2222
</Project>

aspnet-core/src/EventCloud.Core/Identity/SecurityStampValidator.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ public class SecurityStampValidator : AbpSecurityStampValidator<Tenant, Role, Us
1515
public SecurityStampValidator(
1616
IOptions<SecurityStampValidatorOptions> options,
1717
SignInManager signInManager,
18-
ISystemClock systemClock,
1918
ILoggerFactory loggerFactory,
2019
IUnitOfWorkManager unitOfWorkManager)
21-
: base(options, signInManager, systemClock, loggerFactory, unitOfWorkManager)
20+
: base(options, signInManager, loggerFactory, unitOfWorkManager)
2221
{
2322
}
2423
}

aspnet-core/src/EventCloud.EntityFrameworkCore/EventCloud.EntityFrameworkCore.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
<Compile Remove="Migrations\20190111071724_Upgraded_To_Abp_v4_1_0.cs" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2020
</PackageReference>
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>

aspnet-core/src/EventCloud.Migrator/EventCloud.Migrator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</None>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Abp.Castle.Log4Net" Version="9.0.0" />
18+
<PackageReference Include="Abp.Castle.Log4Net" Version="9.1.0" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<ProjectReference Include="..\EventCloud.Core\EventCloud.Core.csproj" />

aspnet-core/src/EventCloud.Web.Core/EventCloud.Web.Core.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
<ProjectReference Include="..\EventCloud.EntityFrameworkCore\EventCloud.EntityFrameworkCore.csproj" />
2424
</ItemGroup>
2525
<ItemGroup>
26-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
26+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
2727
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
28-
<PackageReference Include="Abp.AspNetCore" Version="9.0.0" />
29-
<PackageReference Include="Abp.ZeroCore" Version="9.0.0" />
30-
<PackageReference Include="Abp.AspNetCore.SignalR" Version="9.0.0" />
28+
<PackageReference Include="Abp.AspNetCore" Version="9.1.0" />
29+
<PackageReference Include="Abp.ZeroCore" Version="9.1.0" />
30+
<PackageReference Include="Abp.AspNetCore.SignalR" Version="9.1.0" />
3131
</ItemGroup>
3232
</Project>

aspnet-core/src/EventCloud.Web.Host/EventCloud.Web.Host.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<ProjectReference Include="..\EventCloud.Web.Core\EventCloud.Web.Core.csproj" />
3333
</ItemGroup>
3434
<ItemGroup>
35-
<PackageReference Include="Abp.Castle.Log4Net" Version="9.0.0" />
36-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
35+
<PackageReference Include="Abp.Castle.Log4Net" Version="9.1.0" />
36+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
3737
<PrivateAssets>all</PrivateAssets>
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3939
</PackageReference>

aspnet-core/src/EventCloud.Web.Host/Startup/Startup.cs

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
using System;
2-
using System.Linq;
3-
using System.Reflection;
4-
using Microsoft.AspNetCore.Builder;
5-
using Microsoft.AspNetCore.Hosting;
6-
using Microsoft.Extensions.Configuration;
7-
using Microsoft.Extensions.DependencyInjection;
8-
using Microsoft.Extensions.Logging;
9-
using Castle.Facilities.Logging;
10-
using Abp.AspNetCore;
1+
using Abp.AspNetCore;
112
using Abp.AspNetCore.Mvc.Antiforgery;
3+
using Abp.AspNetCore.SignalR.Hubs;
124
using Abp.Castle.Logging.Log4Net;
135
using Abp.Extensions;
6+
using Castle.Facilities.Logging;
147
using EventCloud.Configuration;
158
using EventCloud.Identity;
16-
using Abp.AspNetCore.SignalR.Hubs;
17-
using Abp.Dependency;
18-
using Abp.Json;
9+
using Microsoft.AspNetCore.Builder;
10+
using Microsoft.AspNetCore.Hosting;
11+
using Microsoft.Extensions.Configuration;
12+
using Microsoft.Extensions.DependencyInjection;
1913
using Microsoft.Extensions.Hosting;
14+
using Microsoft.Extensions.Logging;
2015
using Microsoft.OpenApi.Models;
21-
using Newtonsoft.Json.Serialization;
16+
using System;
2217
using System.IO;
18+
using System.Linq;
19+
using System.Reflection;
2320

2421
namespace EventCloud.Web.Host.Startup
2522
{
@@ -41,14 +38,9 @@ public Startup(IWebHostEnvironment env)
4138
public void ConfigureServices(IServiceCollection services)
4239
{
4340
//MVC
44-
services.AddControllersWithViews(
45-
options => { options.Filters.Add(new AbpAutoValidateAntiforgeryTokenAttribute()); }
46-
).AddNewtonsoftJson(options =>
41+
services.AddControllersWithViews(options =>
4742
{
48-
options.SerializerSettings.ContractResolver = new AbpMvcContractResolver(IocManager.Instance)
49-
{
50-
NamingStrategy = new CamelCaseNamingStrategy()
51-
};
43+
options.Filters.Add(new AbpAutoValidateAntiforgeryTokenAttribute());
5244
});
5345

5446
IdentityRegistrar.Register(services);

aspnet-core/test/EventCloud.Tests/EventCloud.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2626
</PackageReference>
27-
<PackageReference Include="Abp.TestBase" Version="9.0.0" />
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
27+
<PackageReference Include="Abp.TestBase" Version="9.1.0" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
2929
<PackageReference Include="Castle.Core" Version="5.1.1" />
3030
</ItemGroup>
3131
<ItemGroup>

0 commit comments

Comments
 (0)