Skip to content

Commit da8455a

Browse files
hikalkanhikalkan
committed
Upgraded ABP and other packages to their latest version.
1 parent fddcfe5 commit da8455a

File tree

12 files changed

+64
-99
lines changed

12 files changed

+64
-99
lines changed

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
1717
</ItemGroup>
1818

19-
<ItemGroup>
20-
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
21-
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
22-
<PackageReference Include="Abp.AutoMapper" Version="2.0.2" />
23-
</ItemGroup>
24-
2519
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
2620
<Reference Include="System" />
2721
<Reference Include="Microsoft.CSharp" />

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp" Version="2.0.2" />
22-
<PackageReference Include="Abp.AutoMapper" Version="2.0.2" />
23-
<PackageReference Include="Abp.ZeroCore" Version="2.0.1" />
24-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="2.0.1" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.1" />
21+
<PackageReference Include="Abp.AutoMapper" Version="2.1.0" />
22+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="2.1.0" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.2" />
2826
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="2.0.0" />
2927
</ItemGroup>
3028

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/PermissionChecker.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
using Abp.Authorization;
22
using AbpCompanyName.AbpProjectName.Authorization.Roles;
33
using AbpCompanyName.AbpProjectName.Authorization.Users;
4-
using AbpCompanyName.AbpProjectName.MultiTenancy;
54

65
namespace AbpCompanyName.AbpProjectName.Authorization
76
{
8-
public class PermissionChecker : PermissionChecker<Tenant, Role, User>
7+
public class PermissionChecker : PermissionChecker<Role, User>
98
{
109
public PermissionChecker(UserManager userManager)
1110
: base(userManager)

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Identity/IdentityRegistrar.cs

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,33 @@
1-
using AbpCompanyName.AbpProjectName.Authorization.Roles;
1+
using AbpCompanyName.AbpProjectName.Authorization;
2+
using AbpCompanyName.AbpProjectName.Authorization.Roles;
23
using AbpCompanyName.AbpProjectName.Authorization.Users;
4+
using AbpCompanyName.AbpProjectName.Editions;
35
using AbpCompanyName.AbpProjectName.MultiTenancy;
46
using Microsoft.Extensions.DependencyInjection;
57

68
namespace AbpCompanyName.AbpProjectName.Identity
79
{
810
public static class IdentityRegistrar
911
{
10-
public static void Register(ServiceCollection services)
12+
public static void Register(IServiceCollection services)
1113
{
1214
services.AddLogging();
1315

14-
services.AddAbpIdentity<Tenant, User, Role, SecurityStampValidator>(options =>
16+
services.AddAbpIdentity<Tenant, User, Role>(options =>
1517
{
1618
options.Cookies.ApplicationCookie.AuthenticationScheme = "AbpZeroTemplateAuthSchema";
1719
options.Cookies.ApplicationCookie.CookieName = "AbpZeroTemplateAuth";
1820
})
19-
.AddUserManager<UserManager>()
20-
.AddRoleManager<RoleManager>()
21-
.AddSignInManager<SignInManager>()
22-
.AddClaimsPrincipalFactory<UserClaimsPrincipalFactory>()
21+
.AddAbpTenantManager<TenantManager>()
22+
.AddAbpUserManager<UserManager>()
23+
.AddAbpRoleManager<RoleManager>()
24+
.AddAbpEditionManager<EditionManager>()
25+
.AddAbpUserStore<UserStore>()
26+
.AddAbpRoleStore<RoleStore>()
27+
.AddAbpLogInManager<LogInManager>()
28+
.AddAbpSignInManager<SignInManager>()
29+
.AddAbpSecurityStampValidator<SecurityStampValidator>()
30+
.AddAbpUserClaimsPrincipalFactory<UserClaimsPrincipalFactory>()
2331
.AddDefaultTokenProviders();
2432
}
2533
}

‎aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,12 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.2" />
1413
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" />
1514
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.1" />
1615
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" />
1716
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.1" />
1817
</ItemGroup>
1918

20-
<ItemGroup>
21-
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.1" />
22-
</ItemGroup>
23-
2419
<ItemGroup>
2520
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
2621
</ItemGroup>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.Castle.Log4Net" Version="2.0.2" />
21+
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,24 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
31-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.1" />
32-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="1.1.1" />
33-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="1.1.1" />
34-
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="1.1.1" />
35-
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.1.1" />
30+
<PackageReference Include="System.ValueTuple" Version="4.3.1" />
31+
<PackageReference Include="System.Net.Http" Version="4.3.2" />
32+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.2" />
33+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="1.1.2" />
34+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="1.1.2" />
35+
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="1.1.2" />
36+
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.1.2" />
3637
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
37-
<PackageReference Include="Abp.AspNetCore" Version="2.0.2" />
38-
<PackageReference Include="Abp.ZeroCore" Version="2.0.1" />
38+
<PackageReference Include="Abp.AspNetCore" Version="2.1.0" />
39+
<PackageReference Include="Abp.ZeroCore" Version="2.1.0" />
3940
</ItemGroup>
4041

4142
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
4243
<Reference Include="System" />
4344
<Reference Include="Microsoft.CSharp" />
4445

45-
<PackageReference Include="Abp.Web.SignalR" Version="2.0.2" />
46-
<PackageReference Include="Abp.Owin" Version="2.0.2" />
46+
<PackageReference Include="Abp.Web.SignalR" Version="2.1.0" />
47+
<PackageReference Include="Abp.Owin" Version="2.1.0" />
4748
</ItemGroup>
4849

4950
</Project>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="1.1.0">
36+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="1.1.1">
3737
<PrivateAssets>All</PrivateAssets>
3838
</PackageReference>
3939
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="2.0.0" />
40-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.1" />
41-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
42-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
43-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
44-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
45-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
46-
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.0" />
47-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
48-
<PackageReference Include="Abp.Castle.Log4Net" Version="2.0.1" />
40+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
41+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
42+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
43+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
44+
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
45+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
46+
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.2" />
47+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
48+
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.0" />
4949
</ItemGroup>
5050

5151
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
using System.Linq;
33
using Abp.AspNetCore;
44
using Abp.Castle.Logging.Log4Net;
5-
using AbpCompanyName.AbpProjectName.Authorization.Roles;
6-
using AbpCompanyName.AbpProjectName.Authorization.Users;
75
using AbpCompanyName.AbpProjectName.Configuration;
86
using AbpCompanyName.AbpProjectName.Identity;
9-
using AbpCompanyName.AbpProjectName.MultiTenancy;
107
using Castle.Facilities.Logging;
118
using Microsoft.AspNetCore.Builder;
129
using Microsoft.AspNetCore.Hosting;
@@ -47,16 +44,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
4744
options.Filters.Add(new CorsAuthorizationFilterFactory(DefaultCorsPolicyName));
4845
});
4946

50-
services.AddAbpIdentity<Tenant, User, Role, SecurityStampValidator>(options =>
51-
{
52-
options.Cookies.ApplicationCookie.AuthenticationScheme = "AbpProjectNameAuthSchema";
53-
options.Cookies.ApplicationCookie.CookieName = "AbpProjectNameAuth";
54-
})
55-
.AddUserManager<UserManager>()
56-
.AddRoleManager<RoleManager>()
57-
.AddSignInManager<SignInManager>()
58-
.AddClaimsPrincipalFactory<UserClaimsPrincipalFactory>()
59-
.AddDefaultTokenProviders();
47+
IdentityRegistrar.Register(services);
6048

6149
//Configure CORS for angular2 UI
6250
services.AddCors(options =>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,30 +38,25 @@
3838
</ItemGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="1.1.0">
41+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="1.1.1">
4242
<PrivateAssets>All</PrivateAssets>
4343
</PackageReference>
44-
<PackageReference Include="AspNet.Security.OpenIdConnect.Server" Version="1.0.0-rc1-final" />
44+
<PackageReference Include="AspNet.Security.OpenIdConnect.Server" Version="1.0.0" />
4545
<PackageReference Include="PaulMiami.AspNetCore.Mvc.Recaptcha" Version="1.2.0" />
4646
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="2.0.0" />
47-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.1" />
48-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="1.1.1" />
49-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="1.1.1" />
50-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.1" />
51-
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="1.1.1" />
52-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="1.1.1" />
53-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.1" />
54-
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.1.1" />
55-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
56-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
57-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
58-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
59-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
60-
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.0" />
61-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
62-
<PackageReference Include="Abp.HangFire" Version="2.0.1" />
63-
<PackageReference Include="Abp.RedisCache" Version="2.0.1" />
64-
<PackageReference Include="Abp.Castle.Log4Net" Version="2.0.1" />
47+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.2" />
48+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="1.1.2" />
49+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
50+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
51+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
52+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
53+
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
54+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
55+
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.2" />
56+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
57+
<PackageReference Include="Abp.HangFire" Version="2.1.0" />
58+
<PackageReference Include="Abp.RedisCache" Version="2.1.0" />
59+
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.0" />
6560
</ItemGroup>
6661

6762
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

0 commit comments

Comments
 (0)