Skip to content

Commit be84830

Browse files
hikalkanhikalkan
committed
Resolved #381: Upgrade to Abp v2.1.1.
1 parent 1ad0c64 commit be84830

File tree

23 files changed

+123
-41
lines changed

23 files changed

+123
-41
lines changed

‎common.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>2.1.0</Version>
3+
<Version>2.1.1</Version>
44
<NoWarn>$(NoWarn);CS1591</NoWarn>
55
<PackageIconUrl>http://www.aspnetboilerplate.com/images/abp_nupkg.png</PackageIconUrl>
66
<PackageProjectUrl>http://www.aspnetboilerplate.com/</PackageProjectUrl>

‎src/Abp.Zero.Common/Abp.Zero.Common.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</ItemGroup>
4545

4646
<ItemGroup>
47-
<PackageReference Include="Abp" Version="2.1.0" />
47+
<PackageReference Include="Abp" Version="2.1.1" />
4848
</ItemGroup>
4949

5050
</Project>

‎src/Abp.Zero.EntityFramework/Abp.Zero.EntityFramework.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.EntityFramework" Version="2.1.0" />
21+
<PackageReference Include="Abp.EntityFramework" Version="2.1.1" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎src/Abp.Zero.EntityFrameworkCore/Abp.Zero.EntityFrameworkCore.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Abp.EntityFrameworkCore" Version="2.1.0" />
32+
<PackageReference Include="Abp.EntityFrameworkCore" Version="2.1.1" />
3333
</ItemGroup>
3434

3535
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

‎src/Abp.Zero.NHibernate/Abp.Zero.NHibernate.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Abp.NHibernate" Version="2.1.0" />
29-
<PackageReference Include="Abp.FluentMigrator" Version="2.1.0" />
28+
<PackageReference Include="Abp.NHibernate" Version="2.1.1" />
29+
<PackageReference Include="Abp.FluentMigrator" Version="2.1.1" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

‎src/Abp.ZeroCore.EntityFrameworkCore/Abp.ZeroCore.EntityFrameworkCore.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Abp.EntityFrameworkCore" Version="2.1.0" />
19+
<PackageReference Include="Abp.EntityFrameworkCore" Version="2.1.1" />
2020
</ItemGroup>
2121

2222
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

‎src/Abp.ZeroCore.IdentityServer4/Abp.ZeroCore.IdentityServer4.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<ItemGroup>
2121
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="1.0.1" />
22-
<PackageReference Include="Abp.AutoMapper" Version="2.1.0" />
22+
<PackageReference Include="Abp.AutoMapper" Version="2.1.1" />
2323
</ItemGroup>
2424

2525
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

‎src/Abp.ZeroCore/Authorization/Roles/AbpRoleStore.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public void Dispose()
280280

281281
Check.NotNull(role, nameof(role));
282282

283-
await _roleRepository.EnsureLoadedAsync(role, u => u.Claims, cancellationToken);
283+
await _roleRepository.EnsureCollectionLoadedAsync(role, u => u.Claims, cancellationToken);
284284

285285
return role.Claims.Select(c => new Claim(c.ClaimType, c.ClaimValue)).ToList();
286286
}
@@ -299,7 +299,7 @@ public void Dispose()
299299
Check.NotNull(role, nameof(role));
300300
Check.NotNull(claim, nameof(claim));
301301

302-
await _roleRepository.EnsureLoadedAsync(role, u => u.Claims, cancellationToken);
302+
await _roleRepository.EnsureCollectionLoadedAsync(role, u => u.Claims, cancellationToken);
303303

304304
role.Claims.Add(new RoleClaim(role, claim));
305305
}
@@ -316,7 +316,7 @@ public void Dispose()
316316
Check.NotNull(role, nameof(role));
317317
Check.NotNull(claim, nameof(claim));
318318

319-
await _roleRepository.EnsureLoadedAsync(role, u => u.Claims, cancellationToken);
319+
await _roleRepository.EnsureCollectionLoadedAsync(role, u => u.Claims, cancellationToken);
320320

321321
role.Claims.RemoveAll(c => c.ClaimValue == claim.Value && c.ClaimType == claim.Type);
322322
}

‎src/Abp.ZeroCore/Authorization/Users/AbpUserManager.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ public virtual async Task<IdentityResult> CheckDuplicateUsernameOrEmailAddressAs
391391

392392
public virtual async Task<IdentityResult> SetRoles(TUser user, string[] roleNames)
393393
{
394-
await AbpStore.UserRepository.EnsureLoadedAsync(user, u => u.Roles);
394+
await AbpStore.UserRepository.EnsureCollectionLoadedAsync(user, u => u.Roles);
395395

396396
//Remove from removed roles
397397
foreach (var userRole in user.Roles.ToList())

‎src/Abp.ZeroCore/Authorization/Users/AbpUserStore.cs

+11-11
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ join role in _roleRepository.GetAll() on userRole.RoleId equals role.Id
454454
return false;
455455
}
456456

457-
await UserRepository.EnsureLoadedAsync(user, u => u.Roles, cancellationToken);
457+
await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Roles, cancellationToken);
458458

459459
return user.Roles.Any(r => r.RoleId == role.Id);
460460
}
@@ -479,7 +479,7 @@ public void Dispose()
479479

480480
Check.NotNull(user, nameof(user));
481481

482-
await UserRepository.EnsureLoadedAsync(user, u => u.Claims, cancellationToken);
482+
await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Claims, cancellationToken);
483483

484484
return user.Claims.Select(c => new Claim(c.ClaimType, c.ClaimValue)).ToList();
485485
}
@@ -498,7 +498,7 @@ public void Dispose()
498498
Check.NotNull(user, nameof(user));
499499
Check.NotNull(claims, nameof(claims));
500500

501-
await UserRepository.EnsureLoadedAsync(user, u => u.Claims, cancellationToken);
501+
await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Claims, cancellationToken);
502502

503503
foreach (var claim in claims)
504504
{
@@ -522,7 +522,7 @@ public void Dispose()
522522
Check.NotNull(claim, nameof(claim));
523523
Check.NotNull(newClaim, nameof(newClaim));
524524

525-
await UserRepository.EnsureLoadedAsync(user, u => u.Claims, cancellationToken);
525+
await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Claims, cancellationToken);
526526

527527
var userClaims = user.Claims.Where(uc => uc.ClaimValue == claim.Value && uc.ClaimType == claim.Type);
528528
foreach (var userClaim in userClaims)
@@ -546,7 +546,7 @@ public void Dispose()
546546
Check.NotNull(user, nameof(user));
547547
Check.NotNull(claims, nameof(claims));
548548

549-
await UserRepository.EnsureLoadedAsync(user, u => u.Claims, cancellationToken);
549+
await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Claims, cancellationToken);
550550

551551
foreach (var claim in claims)
552552
{
@@ -568,7 +568,7 @@ public void Dispose()
568568
Check.NotNull(user, nameof(user));
569569
Check.NotNull(login, nameof(login));
570570

571-
await UserRepository.EnsureLoadedAsync(user, u => u.Logins, cancellationToken);
571+
await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Logins, cancellationToken);
572572

573573
user.Logins.Add(new UserLogin(user.TenantId, user.Id, login.LoginProvider, login.ProviderKey));
574574
}
@@ -589,7 +589,7 @@ public void Dispose()
589589
Check.NotNull(loginProvider, nameof(loginProvider));
590590
Check.NotNull(providerKey, nameof(providerKey));
591591

592-
await UserRepository.EnsureLoadedAsync(user, u => u.Logins, cancellationToken);
592+
await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Logins, cancellationToken);
593593

594594
user.Logins.RemoveAll(userLogin => userLogin.LoginProvider == loginProvider && userLogin.ProviderKey == providerKey);
595595
}
@@ -608,7 +608,7 @@ public void Dispose()
608608

609609
Check.NotNull(user, nameof(user));
610610

611-
await UserRepository.EnsureLoadedAsync(user, u => u.Logins, cancellationToken);
611+
await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Logins, cancellationToken);
612612

613613
return user.Logins.Select(l => new UserLoginInfo(l.LoginProvider, l.ProviderKey, l.LoginProvider)).ToList();
614614
}
@@ -1100,7 +1100,7 @@ public virtual async Task SetTokenAsync([NotNull] TUser user, string loginProvid
11001100

11011101
Check.NotNull(user, nameof(user));
11021102

1103-
await UserRepository.EnsureLoadedAsync(user, u => u.Tokens, cancellationToken);
1103+
await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Tokens, cancellationToken);
11041104

11051105
var token = user.Tokens.FirstOrDefault(t => t.LoginProvider == loginProvider && t.Name == name);
11061106
if (token == null)
@@ -1127,7 +1127,7 @@ public async Task RemoveTokenAsync(TUser user, string loginProvider, string name
11271127

11281128
Check.NotNull(user, nameof(user));
11291129

1130-
await UserRepository.EnsureLoadedAsync(user, u => u.Tokens, cancellationToken);
1130+
await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Tokens, cancellationToken);
11311131

11321132
user.Tokens.RemoveAll(t => t.LoginProvider == loginProvider && t.Name == name);
11331133
}
@@ -1146,7 +1146,7 @@ public async Task<string> GetTokenAsync(TUser user, string loginProvider, string
11461146

11471147
Check.NotNull(user, nameof(user));
11481148

1149-
await UserRepository.EnsureLoadedAsync(user, u => u.Tokens, cancellationToken);
1149+
await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Tokens, cancellationToken);
11501150

11511151
return user.Tokens.FirstOrDefault(t => t.LoginProvider == loginProvider && t.Name == name)?.Value;
11521152
}

‎test/Abp.Zero.SampleApp.EntityFrameworkCore.ConsoleAppTest/Abp.Zero.SampleApp.EntityFrameworkCore.ConsoleAppTest.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.0" />
15+
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.1" />
1616
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="2.0.0" />
1717
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="2.0.0" />
1818
</ItemGroup>

‎test/Abp.Zero.SampleApp.EntityFrameworkCore.Tests/Abp.Zero.SampleApp.EntityFrameworkCore.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Abp.TestBase" Version="2.1.0" />
16+
<PackageReference Include="Abp.TestBase" Version="2.1.1" />
1717
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="2.0.0" />
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
1919
<PackageReference Include="xunit" Version="2.2.0" />

‎test/Abp.Zero.SampleApp.NHibernateTests/Abp.Zero.SampleApp.NHibernateTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Abp.TestBase" Version="2.1.0" />
26+
<PackageReference Include="Abp.TestBase" Version="2.1.1" />
2727
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
2828
<PackageReference Include="xunit" Version="2.2.0" />
2929
<PackageReference Include="xunit.extensibility.execution" Version="2.2.0" />

‎test/Abp.Zero.SampleApp.Tests/Abp.Zero.SampleApp.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Abp.TestBase" Version="2.1.0" />
23+
<PackageReference Include="Abp.TestBase" Version="2.1.1" />
2424
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
2525
<PackageReference Include="xunit" Version="2.2.0" />
2626
<PackageReference Include="xunit.extensibility.execution" Version="2.2.0" />

‎test/Abp.ZeroCore.IdentityServer4.Tests/Abp.ZeroCore.IdentityServer4.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Abp.TestBase" Version="2.1.0" />
14+
<PackageReference Include="Abp.TestBase" Version="2.1.1" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
1616
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="2.0.0" />
1717
<PackageReference Include="xunit" Version="2.2.0" />

‎test/Abp.ZeroCore.SampleApp/Abp.ZeroCore.SampleApp.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Abp.AutoMapper" Version="2.1.0" />
9+
<PackageReference Include="Abp.AutoMapper" Version="2.1.1" />
1010
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="2.0.0" />
1111
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" />
1212
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.1" />

‎test/Abp.ZeroCore.Tests/Abp.ZeroCore.Tests.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="1.1.2" />
14-
<PackageReference Include="Abp.TestBase" Version="2.1.0" />
13+
<PackageReference Include="Microsoft.Data.Sqlite" Version="1.1.1" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="1.1.2" />
15+
<PackageReference Include="Abp.TestBase" Version="2.1.1" />
1516
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
1617
<PackageReference Include="xunit" Version="2.2.0" />
1718
<PackageReference Include="xunit.extensibility.execution" Version="2.2.0" />

‎test/Abp.ZeroCore.Tests/Zero/AbpZeroTestBase.cs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Abp.Events.Bus.Entities;
88
using Abp.Runtime.Session;
99
using Abp.TestBase;
10+
using Abp.Zero.TestData;
1011
using Abp.ZeroCore.SampleApp.Core;
1112
using Abp.ZeroCore.SampleApp.EntityFramework;
1213
using Microsoft.EntityFrameworkCore;

‎test/Abp.ZeroCore.Tests/Zero/Roles/RoleStore_Tests.cs

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
using System.Threading.Tasks;
2+
using Abp.Domain.Uow;
3+
using Abp.ZeroCore.SampleApp.Core;
4+
using Shouldly;
5+
using Xunit;
6+
7+
namespace Abp.Zero.Roles
8+
{
9+
public class RoleStore_Tests : AbpZeroTestBase
10+
{
11+
private readonly RoleStore _roleStore;
12+
13+
public RoleStore_Tests()
14+
{
15+
_roleStore = Resolve<RoleStore>();
16+
}
17+
18+
[Fact]
19+
public async Task Should_Get_Role_Claims()
20+
{
21+
using (var uow = Resolve<IUnitOfWorkManager>().Begin())
22+
{
23+
var role = await _roleStore.FindByNameAsync("ADMIN");
24+
role.ShouldNotBeNull();
25+
26+
var claims = await _roleStore.GetClaimsAsync(role);
27+
28+
claims.ShouldNotBeNull();
29+
30+
await uow.CompleteAsync();
31+
}
32+
}
33+
}
34+
}

‎test/Abp.ZeroCore.Tests/Zero/TestDataBuilder.cs renamed to ‎test/Abp.ZeroCore.Tests/Zero/TestData/TestDataBuilder.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Abp.ZeroCore.SampleApp.EntityFramework;
22

3-
namespace Abp.Zero
3+
namespace Abp.Zero.TestData
44
{
55
public class TestDataBuilder
66
{
@@ -15,6 +15,7 @@ public TestDataBuilder(SampleAppDbContext context, int tenantId)
1515

1616
public void Create()
1717
{
18+
new TestRolesBuilder(_context, _tenantId).Create();
1819
new TestOrganizationUnitsBuilder(_context, _tenantId).Create();
1920

2021
_context.SaveChanges();

‎test/Abp.ZeroCore.Tests/Zero/TestOrganizationUnitsBuilder.cs renamed to ‎test/Abp.ZeroCore.Tests/Zero/TestData/TestOrganizationUnitsBuilder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Abp.Organizations;
22
using Abp.ZeroCore.SampleApp.EntityFramework;
33

4-
namespace Abp.Zero
4+
namespace Abp.Zero.TestData
55
{
66
/* Creates OU tree for default tenant as shown below:
77
*

‎test/Abp.ZeroCore.Tests/Zero/TestData/TestRolesBuilder.cs

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
using System.Collections.Generic;
2+
using System.Security.Claims;
3+
using Abp.Authorization.Roles;
4+
using Abp.ZeroCore.SampleApp.Core;
5+
using Abp.ZeroCore.SampleApp.EntityFramework;
6+
7+
namespace Abp.Zero.TestData
8+
{
9+
public class TestRolesBuilder
10+
{
11+
private readonly SampleAppDbContext _context;
12+
private readonly int _tenantId;
13+
14+
public TestRolesBuilder(SampleAppDbContext context, int tenantId)
15+
{
16+
_context = context;
17+
_tenantId = tenantId;
18+
}
19+
20+
public void Create()
21+
{
22+
var role = new Role(_tenantId, "ADMIN", "ADMIN")
23+
{
24+
Claims = new List<RoleClaim>()
25+
};
26+
27+
role.Claims.Add(new RoleClaim(role, new Claim("MyClaim1", "MyClaim1Value")));
28+
role.Claims.Add(new RoleClaim(role, new Claim("MyClaim2", "MyClaim2Value")));
29+
30+
_context.Roles.Add(role);
31+
32+
_context.SaveChanges();
33+
}
34+
}
35+
}

0 commit comments

Comments
 (0)