Skip to content

Commit e5a6239

Browse files
hikalkanhikalkan
committed
Upgraded to Abp.Zero v0.8.3.0
1 parent f487c92 commit e5a6239

File tree

20 files changed

+357
-157
lines changed

20 files changed

+357
-157
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Abp, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.8.2.0\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.8.3.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.8.3.0\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.AutoMapper, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.AutoMapper.0.8.2.0\lib\net452\Abp.AutoMapper.dll</HintPath>
40+
<Reference Include="Abp.AutoMapper, Version=0.8.3.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.AutoMapper.0.8.3.0\lib\net452\Abp.AutoMapper.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.0.8.2.0\lib\net452\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=0.8.3.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.0.8.3.0\lib\net452\Abp.Zero.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">

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

Lines changed: 3 additions & 3 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="0.8.2.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="0.8.2.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="0.8.2.0" targetFramework="net461" />
3+
<package id="Abp" version="0.8.3.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="0.8.3.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="0.8.3.0" targetFramework="net461" />
66
<package id="AutoMapper" version="4.1.1" targetFramework="net451" />
77
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
88
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Abp, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.8.2.0\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.8.3.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.8.3.0\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.Zero, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.Zero.0.8.2.0\lib\net452\Abp.Zero.dll</HintPath>
40+
<Reference Include="Abp.Zero, Version=0.8.3.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.Zero.0.8.3.0\lib\net452\Abp.Zero.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
4444
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public UserManager(
2828
ICacheManager cacheManager,
2929
IRepository<OrganizationUnit, long> organizationUnitRepository,
3030
IRepository<UserOrganizationUnit, long> userOrganizationUnitRepository,
31-
IOrganizationUnitSettings organizationUnitSettings
31+
IOrganizationUnitSettings organizationUnitSettings,
32+
IRepository<UserLoginAttempt, long> userLoginAttemptRepository
3233
)
3334
: base(
3435
store,
@@ -43,7 +44,8 @@ IOrganizationUnitSettings organizationUnitSettings
4344
cacheManager,
4445
organizationUnitRepository,
4546
userOrganizationUnitRepository,
46-
organizationUnitSettings)
47+
organizationUnitSettings,
48+
userLoginAttemptRepository)
4749
{
4850
}
4951
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.8.2.0" targetFramework="net461" />
4-
<package id="Abp.Zero" version="0.8.2.0" targetFramework="net461" />
3+
<package id="Abp" version="0.8.3.0" targetFramework="net461" />
4+
<package id="Abp.Zero" version="0.8.3.0" targetFramework="net461" />
55
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
66
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
77
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />

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

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Abp, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.8.2.0\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.8.3.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.8.3.0\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.EntityFramework, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.EntityFramework.0.8.2.0\lib\net452\Abp.EntityFramework.dll</HintPath>
40+
<Reference Include="Abp.EntityFramework, Version=0.8.3.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.EntityFramework.0.8.3.0\lib\net452\Abp.EntityFramework.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.0.8.2.0\lib\net452\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=0.8.3.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.0.8.3.0\lib\net452\Abp.Zero.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
48-
<Reference Include="Abp.Zero.EntityFramework, Version=0.8.2.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Abp.Zero.EntityFramework.0.8.2.0\lib\net452\Abp.Zero.EntityFramework.dll</HintPath>
48+
<Reference Include="Abp.Zero.EntityFramework, Version=0.8.3.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Zero.EntityFramework.0.8.3.0\lib\net452\Abp.Zero.EntityFramework.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
5252
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
@@ -65,8 +65,8 @@
6565
<SpecificVersion>False</SpecificVersion>
6666
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
6767
</Reference>
68-
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.6.0, Culture=neutral, processorArchitecture=MSIL">
69-
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.6\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
68+
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.7.0, Culture=neutral, processorArchitecture=MSIL">
69+
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.7\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
7070
<Private>True</Private>
7171
</Reference>
7272
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
@@ -149,6 +149,10 @@
149149
<Compile Include="Migrations\201603021000202_Upgrade_Abp_And_Module_Zero_To_0_8_2.Designer.cs">
150150
<DependentUpon>201603021000202_Upgrade_Abp_And_Module_Zero_To_0_8_2.cs</DependentUpon>
151151
</Compile>
152+
<Compile Include="Migrations\201603220639423_Upgraded_To_Module_Zero_0_8_3.cs" />
153+
<Compile Include="Migrations\201603220639423_Upgraded_To_Module_Zero_0_8_3.Designer.cs">
154+
<DependentUpon>201603220639423_Upgraded_To_Module_Zero_0_8_3.cs</DependentUpon>
155+
</Compile>
152156
<Compile Include="Migrations\Configuration.cs" />
153157
<Compile Include="AbpProjectNameDataModule.cs" />
154158
<Compile Include="Migrations\SeedData\DefaultEditionsBuilder.cs" />
@@ -198,6 +202,9 @@
198202
<EmbeddedResource Include="Migrations\201603021000202_Upgrade_Abp_And_Module_Zero_To_0_8_2.resx">
199203
<DependentUpon>201603021000202_Upgrade_Abp_And_Module_Zero_To_0_8_2.cs</DependentUpon>
200204
</EmbeddedResource>
205+
<EmbeddedResource Include="Migrations\201603220639423_Upgraded_To_Module_Zero_0_8_3.resx">
206+
<DependentUpon>201603220639423_Upgraded_To_Module_Zero_0_8_3.cs</DependentUpon>
207+
</EmbeddedResource>
201208
</ItemGroup>
202209
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
203210
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

‎src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/201603220639423_Upgraded_To_Module_Zero_0_8_3.Designer.cs‎

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/201603220639423_Upgraded_To_Module_Zero_0_8_3.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
namespace AbpCompanyName.AbpProjectName.Migrations
2+
{
3+
using System;
4+
using System.Data.Entity.Migrations;
5+
6+
public partial class Upgraded_To_Module_Zero_0_8_3 : DbMigration
7+
{
8+
public override void Up()
9+
{
10+
CreateTable(
11+
"dbo.AbpUserLoginAttempts",
12+
c => new
13+
{
14+
Id = c.Long(nullable: false, identity: true),
15+
TenantId = c.Int(),
16+
TenancyName = c.String(maxLength: 64),
17+
UserId = c.Long(),
18+
UserNameOrEmailAddress = c.String(maxLength: 256),
19+
ClientIpAddress = c.String(maxLength: 64),
20+
ClientName = c.String(maxLength: 128),
21+
BrowserInfo = c.String(maxLength: 256),
22+
Result = c.Byte(nullable: false),
23+
CreationTime = c.DateTime(nullable: false),
24+
})
25+
.PrimaryKey(t => t.Id)
26+
.Index(t => new { t.TenancyName, t.UserNameOrEmailAddress, t.Result });
27+
28+
}
29+
30+
public override void Down()
31+
{
32+
DropIndex("dbo.AbpUserLoginAttempts", new[] { "TenancyName", "UserNameOrEmailAddress", "Result" });
33+
DropTable("dbo.AbpUserLoginAttempts");
34+
}
35+
}
36+
}

‎src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/201603220639423_Upgraded_To_Module_Zero_0_8_3.resx‎

Lines changed: 126 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.8.2.0" targetFramework="net461" />
4-
<package id="Abp.EntityFramework" version="0.8.2.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="0.8.2.0" targetFramework="net461" />
6-
<package id="Abp.Zero.EntityFramework" version="0.8.2.0" targetFramework="net461" />
3+
<package id="Abp" version="0.8.3.0" targetFramework="net461" />
4+
<package id="Abp.EntityFramework" version="0.8.3.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="0.8.3.0" targetFramework="net461" />
6+
<package id="Abp.Zero.EntityFramework" version="0.8.3.0" targetFramework="net461" />
77
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
88
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
99
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
1010
<package id="EntityFramework" version="6.1.3" targetFramework="net451" />
11-
<package id="EntityFramework.DynamicFilters" version="1.4.6" targetFramework="net452" />
11+
<package id="EntityFramework.DynamicFilters" version="1.4.7" targetFramework="net461" />
1212
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
1313
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
1414
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />

0 commit comments

Comments
 (0)