Skip to content

Commit f49ed37

Browse files
ismcagdasismcagdas
committed
2 parents 92c0845 + 28ec72f commit f49ed37

File tree

19 files changed

+239
-304
lines changed

19 files changed

+239
-304
lines changed

‎src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,17 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
40-
<HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
41-
<Private>True</Private>
39+
<Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
4241
</Reference>
43-
<Reference Include="Abp.AutoMapper, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
44-
<HintPath>..\packages\Abp.AutoMapper.7.0.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
45-
<Private>True</Private>
42+
<Reference Include="Abp.AutoMapper, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.AutoMapper.7.1.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4644
</Reference>
47-
<Reference Include="Abp.Zero, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
48-
<HintPath>..\packages\Abp.Zero.7.0.0\lib\net461\Abp.Zero.dll</HintPath>
49-
<Private>True</Private>
45+
<Reference Include="Abp.Zero, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.Zero.7.1.0\lib\net461\Abp.Zero.dll</HintPath>
5047
</Reference>
51-
<Reference Include="Abp.Zero.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
52-
<HintPath>..\packages\Abp.Zero.Common.7.0.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
53-
<Private>True</Private>
48+
<Reference Include="Abp.Zero.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Zero.Common.7.1.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
5450
</Reference>
5551
<Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5652
<HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>

‎src/AbpCompanyName.AbpProjectName.Application/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="7.0.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="7.0.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="7.0.0" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="7.0.0" targetFramework="net461" />
3+
<package id="Abp" version="7.1.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="7.1.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="7.1.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="7.1.0" targetFramework="net461" />
77
<package id="AutoMapper" version="10.1.1" targetFramework="net461" />
88
<package id="AutoMapper.Collection" version="7.0.1" targetFramework="net461" />
99
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
@@ -16,13 +16,13 @@
1616
<package id="Microsoft.AspNet.Identity.Core" version="2.2.3" targetFramework="net461" />
1717
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
1818
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
19-
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
20-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
21-
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
2219
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
2320
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
2421
<package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
22+
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
23+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
2524
<package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
25+
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
2626
<package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
2727
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
2828
<package id="Nito.AsyncEx" version="5.1.2" targetFramework="net461" />

‎src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,14 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
40-
<HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
41-
<Private>True</Private>
39+
<Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
4241
</Reference>
43-
<Reference Include="Abp.Zero, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
44-
<HintPath>..\packages\Abp.Zero.7.0.0\lib\net461\Abp.Zero.dll</HintPath>
45-
<Private>True</Private>
42+
<Reference Include="Abp.Zero, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.Zero.7.1.0\lib\net461\Abp.Zero.dll</HintPath>
4644
</Reference>
47-
<Reference Include="Abp.Zero.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
48-
<HintPath>..\packages\Abp.Zero.Common.7.0.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
49-
<Private>True</Private>
45+
<Reference Include="Abp.Zero.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.Zero.Common.7.1.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
5047
</Reference>
5148
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5249
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>

‎src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserManager.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ public UserManager(
2525
ILocalizationManager localizationManager,
2626
ISettingManager settingManager,
2727
IdentityEmailMessageService emailService,
28-
IUserTokenProviderAccessor userTokenProviderAccessor)
28+
IUserTokenProviderAccessor userTokenProviderAccessor,
29+
IRepository<UserLogin,long> userLogin)
2930
: base(
3031
userStore,
3132
roleManager,
@@ -38,7 +39,8 @@ public UserManager(
3839
localizationManager,
3940
emailService,
4041
settingManager,
41-
userTokenProviderAccessor)
42+
userTokenProviderAccessor,
43+
userLogin)
4244
{
4345
}
4446
}

‎src/AbpCompanyName.AbpProjectName.Core/packages.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="7.0.0" targetFramework="net461" />
4-
<package id="Abp.Zero" version="7.0.0" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="7.0.0" targetFramework="net461" />
3+
<package id="Abp" version="7.1.0" targetFramework="net461" />
4+
<package id="Abp.Zero" version="7.1.0" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="7.1.0" targetFramework="net461" />
66
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
77
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
88
<package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
@@ -13,13 +13,13 @@
1313
<package id="Microsoft.AspNet.Identity.Core" version="2.2.3" targetFramework="net461" />
1414
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
16-
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
17-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
18-
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
1916
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
2017
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
2118
<package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
20+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
2221
<package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
22+
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
2323
<package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
2424
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
2525
<package id="Nito.AsyncEx" version="5.1.2" targetFramework="net461" />

‎src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,23 @@
3737
<WarningLevel>4</WarningLevel>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
41-
<HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
42-
<Private>True</Private>
40+
<Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
4342
</Reference>
44-
<Reference Include="Abp.EntityFramework, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
45-
<HintPath>..\packages\Abp.EntityFramework.7.0.0\lib\net461\Abp.EntityFramework.dll</HintPath>
46-
<Private>True</Private>
43+
<Reference Include="Abp.EntityFramework, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Abp.EntityFramework.7.1.0\lib\net461\Abp.EntityFramework.dll</HintPath>
4745
</Reference>
48-
<Reference Include="Abp.EntityFramework.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
49-
<HintPath>..\packages\Abp.EntityFramework.Common.7.0.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
50-
<Private>True</Private>
46+
<Reference Include="Abp.EntityFramework.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
47+
<HintPath>..\packages\Abp.EntityFramework.Common.7.1.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
5148
</Reference>
52-
<Reference Include="Abp.Zero, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
53-
<HintPath>..\packages\Abp.Zero.7.0.0\lib\net461\Abp.Zero.dll</HintPath>
54-
<Private>True</Private>
49+
<Reference Include="Abp.Zero, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
50+
<HintPath>..\packages\Abp.Zero.7.1.0\lib\net461\Abp.Zero.dll</HintPath>
5551
</Reference>
56-
<Reference Include="Abp.Zero.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
57-
<HintPath>..\packages\Abp.Zero.Common.7.0.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
58-
<Private>True</Private>
52+
<Reference Include="Abp.Zero.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Abp.Zero.Common.7.1.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
5954
</Reference>
60-
<Reference Include="Abp.Zero.EntityFramework, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
61-
<HintPath>..\packages\Abp.Zero.EntityFramework.7.0.0\lib\net461\Abp.Zero.EntityFramework.dll</HintPath>
62-
<Private>True</Private>
55+
<Reference Include="Abp.Zero.EntityFramework, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\packages\Abp.Zero.EntityFramework.7.1.0\lib\net461\Abp.Zero.EntityFramework.dll</HintPath>
6357
</Reference>
6458
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
6559
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>

‎src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="7.0.0" targetFramework="net461" />
4-
<package id="Abp.EntityFramework" version="7.0.0" targetFramework="net461" />
5-
<package id="Abp.EntityFramework.Common" version="7.0.0" targetFramework="net461" />
6-
<package id="Abp.Zero" version="7.0.0" targetFramework="net461" />
7-
<package id="Abp.Zero.Common" version="7.0.0" targetFramework="net461" />
8-
<package id="Abp.Zero.EntityFramework" version="7.0.0" targetFramework="net461" />
3+
<package id="Abp" version="7.1.0" targetFramework="net461" />
4+
<package id="Abp.EntityFramework" version="7.1.0" targetFramework="net461" />
5+
<package id="Abp.EntityFramework.Common" version="7.1.0" targetFramework="net461" />
6+
<package id="Abp.Zero" version="7.1.0" targetFramework="net461" />
7+
<package id="Abp.Zero.Common" version="7.1.0" targetFramework="net461" />
8+
<package id="Abp.Zero.EntityFramework" version="7.1.0" targetFramework="net461" />
99
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
1010
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
1111
<package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
@@ -18,13 +18,13 @@
1818
<package id="Microsoft.AspNet.Identity.Core" version="2.2.3" targetFramework="net461" />
1919
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
2020
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
21-
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
22-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
23-
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
2421
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
2522
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
2623
<package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
24+
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
25+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
2726
<package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
27+
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
2828
<package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
2929
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
3030
<package id="Nito.AsyncEx" version="5.1.2" targetFramework="net461" />

‎src/AbpCompanyName.AbpProjectName.WebApi/AbpCompanyName.AbpProjectName.WebApi.csproj‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,33 +36,26 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
40-
<HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
41-
<Private>True</Private>
39+
<Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
4241
</Reference>
43-
<Reference Include="Abp.AutoMapper, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
44-
<HintPath>..\packages\Abp.AutoMapper.7.0.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
45-
<Private>True</Private>
42+
<Reference Include="Abp.AutoMapper, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.AutoMapper.7.1.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4644
</Reference>
47-
<Reference Include="Abp.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
48-
<HintPath>..\packages\Abp.Web.7.0.0\lib\net461\Abp.Web.dll</HintPath>
49-
<Private>True</Private>
45+
<Reference Include="Abp.Web, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.Web.7.1.0\lib\net461\Abp.Web.dll</HintPath>
5047
</Reference>
51-
<Reference Include="Abp.Web.Api, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
52-
<HintPath>..\packages\Abp.Web.Api.7.0.0\lib\net461\Abp.Web.Api.dll</HintPath>
53-
<Private>True</Private>
48+
<Reference Include="Abp.Web.Api, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Web.Api.7.1.0\lib\net461\Abp.Web.Api.dll</HintPath>
5450
</Reference>
55-
<Reference Include="Abp.Web.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
56-
<HintPath>..\packages\Abp.Web.Common.7.0.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
57-
<Private>True</Private>
51+
<Reference Include="Abp.Web.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Abp.Web.Common.7.1.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
5853
</Reference>
59-
<Reference Include="Abp.Zero, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
60-
<HintPath>..\packages\Abp.Zero.7.0.0\lib\net461\Abp.Zero.dll</HintPath>
61-
<Private>True</Private>
54+
<Reference Include="Abp.Zero, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
55+
<HintPath>..\packages\Abp.Zero.7.1.0\lib\net461\Abp.Zero.dll</HintPath>
6256
</Reference>
63-
<Reference Include="Abp.Zero.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
64-
<HintPath>..\packages\Abp.Zero.Common.7.0.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
65-
<Private>True</Private>
57+
<Reference Include="Abp.Zero.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
58+
<HintPath>..\packages\Abp.Zero.Common.7.1.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
6659
</Reference>
6760
<Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
6861
<HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>

0 commit comments

Comments
 (0)