Skip to content

Commit c37330f

Browse files
ismcagdasismcagdas
authored
Merge pull request #180 from aspnetboilerplate/upgrade-to-abp-5-4
Upgrade to Abp v5.4
2 parents 553481c + ac66fb8 commit c37330f

25 files changed

+488
-241
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.5.2.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.5.4.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.5.2.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.5.4.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.5.2.0\lib\net461\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.5.4.0\lib\net461\Abp.Zero.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Zero.Common, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.Common.5.2.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
47+
<Reference Include="Abp.Zero.Common, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.5.4.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4949
</Reference>
5050
<Reference Include="AutoMapper, Version=9.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5151
<HintPath>..\packages\AutoMapper.9.0.0\lib\net461\AutoMapper.dll</HintPath>

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

Lines changed: 4 additions & 4 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="5.2.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="5.2.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="5.2.0" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="5.2.0" targetFramework="net461" />
3+
<package id="Abp" version="5.4.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="5.4.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="5.4.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="5.4.0" targetFramework="net461" />
77
<package id="AutoMapper" version="9.0.0" targetFramework="net461" />
88
<package id="AutoMapper.Collection" version="6.0.0" targetFramework="net461" />
99
<package id="Castle.Core" version="4.4.0" targetFramework="net461" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.5.2.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.5.4.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.Zero, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.Zero.5.2.0\lib\net461\Abp.Zero.dll</HintPath>
41+
<Reference Include="Abp.Zero, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.Zero.5.4.0\lib\net461\Abp.Zero.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero.Common, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.Common.5.2.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
44+
<Reference Include="Abp.Zero.Common, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.Common.5.4.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4646
</Reference>
4747
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4848
<HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>

‎src/AbpCompanyName.AbpProjectName.Core/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="5.2.0" targetFramework="net461" />
4-
<package id="Abp.Zero" version="5.2.0" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="5.2.0" targetFramework="net461" />
3+
<package id="Abp" version="5.4.0" targetFramework="net461" />
4+
<package id="Abp.Zero" version="5.4.0" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="5.4.0" targetFramework="net461" />
66
<package id="Castle.Core" version="4.4.0" targetFramework="net461" />
77
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
88
<package id="Castle.LoggingFacility" version="5.0.1" targetFramework="net461" />

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

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,23 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Abp, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.5.2.0\lib\netstandard2.0\Abp.dll</HintPath>
39+
<Reference Include="Abp, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.5.4.0\lib\netstandard2.0\Abp.dll</HintPath>
4141
</Reference>
42-
<Reference Include="Abp.EntityFramework, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Abp.EntityFramework.5.2.0\lib\net461\Abp.EntityFramework.dll</HintPath>
42+
<Reference Include="Abp.EntityFramework, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.EntityFramework.5.4.0\lib\net461\Abp.EntityFramework.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Abp.EntityFramework.Common, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Abp.EntityFramework.Common.5.2.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
45+
<Reference Include="Abp.EntityFramework.Common, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.EntityFramework.Common.5.4.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
4747
</Reference>
48-
<Reference Include="Abp.Zero, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Abp.Zero.5.2.0\lib\net461\Abp.Zero.dll</HintPath>
48+
<Reference Include="Abp.Zero, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Zero.5.4.0\lib\net461\Abp.Zero.dll</HintPath>
5050
</Reference>
51-
<Reference Include="Abp.Zero.Common, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Abp.Zero.Common.5.2.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
51+
<Reference Include="Abp.Zero.Common, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Abp.Zero.Common.5.4.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
5353
</Reference>
54-
<Reference Include="Abp.Zero.EntityFramework, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\Abp.Zero.EntityFramework.5.2.0\lib\net461\Abp.Zero.EntityFramework.dll</HintPath>
54+
<Reference Include="Abp.Zero.EntityFramework, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
55+
<HintPath>..\packages\Abp.Zero.EntityFramework.5.4.0\lib\net461\Abp.Zero.EntityFramework.dll</HintPath>
5656
</Reference>
5757
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5858
<HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
@@ -269,6 +269,10 @@
269269
<Compile Include="Migrations\202002201201162_Ugraded_To_ABP_5_2_0.designer.cs">
270270
<DependentUpon>202002201201162_Ugraded_To_ABP_5_2_0.cs</DependentUpon>
271271
</Compile>
272+
<Compile Include="Migrations\202003201250482_Ugraded_To_ABP_5_4_0.cs" />
273+
<Compile Include="Migrations\202003201250482_Ugraded_To_ABP_5_4_0.designer.cs">
274+
<DependentUpon>202003201250482_Ugraded_To_ABP_5_4_0.cs</DependentUpon>
275+
</Compile>
272276
<Compile Include="Migrations\AbpZeroDbMigrator.cs" />
273277
<Compile Include="Migrations\Configuration.cs" />
274278
<Compile Include="Migrations\SeedData\DefaultEditionsCreator.cs" />
@@ -321,6 +325,9 @@
321325
<EmbeddedResource Include="Migrations\202002201201162_Ugraded_To_ABP_5_2_0.resx">
322326
<DependentUpon>202002201201162_Ugraded_To_ABP_5_2_0.cs</DependentUpon>
323327
</EmbeddedResource>
328+
<EmbeddedResource Include="Migrations\202003201250482_Ugraded_To_ABP_5_4_0.resx">
329+
<DependentUpon>202003201250482_Ugraded_To_ABP_5_4_0.cs</DependentUpon>
330+
</EmbeddedResource>
324331
</ItemGroup>
325332
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
326333
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

‎src/AbpCompanyName.AbpProjectName.EntityFramework/EntityFramework/AbpProjectNameDbContext.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Data.Common;
22
using System.Data.Entity;
3+
using Abp.DynamicEntityParameters;
34
using Abp.Zero.EntityFramework;
45
using AbpCompanyName.AbpProjectName.Authorization.Roles;
56
using AbpCompanyName.AbpProjectName.Authorization.Users;
@@ -49,6 +50,8 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
4950
{
5051
base.OnModelCreating(modelBuilder);
5152

53+
modelBuilder.Entity<DynamicParameter>().Property(p => p.ParameterName).HasMaxLength(250);
54+
modelBuilder.Entity<EntityDynamicParameter>().Property(p => p.EntityFullName).HasMaxLength(250);
5255
}
5356
}
5457
}

‎src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/202003201250482_Ugraded_To_ABP_5_4_0.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/202003201250482_Ugraded_To_ABP_5_4_0.cs‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
namespace AbpCompanyName.AbpProjectName.Migrations
2+
{
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Data.Entity.Infrastructure.Annotations;
6+
using System.Data.Entity.Migrations;
7+
8+
public partial class Ugraded_To_ABP_5_4_0 : DbMigration
9+
{
10+
public override void Up()
11+
{
12+
CreateTable(
13+
"dbo.AbpDynamicParameters",
14+
c => new
15+
{
16+
Id = c.Int(nullable: false, identity: true),
17+
ParameterName = c.String(maxLength: 250),
18+
InputType = c.String(),
19+
Permission = c.String(),
20+
TenantId = c.Int(),
21+
},
22+
annotations: new Dictionary<string, object>
23+
{
24+
{ "DynamicFilter_DynamicParameter_MayHaveTenant", "EntityFramework.DynamicFilters.DynamicFilterDefinition" },
25+
})
26+
.PrimaryKey(t => t.Id)
27+
.Index(t => new { t.ParameterName, t.TenantId }, unique: true)
28+
.Index(t => t.TenantId);
29+
30+
CreateTable(
31+
"dbo.AbpDynamicParameterValues",
32+
c => new
33+
{
34+
Id = c.Int(nullable: false, identity: true),
35+
Value = c.String(nullable: false),
36+
TenantId = c.Int(),
37+
DynamicParameterId = c.Int(nullable: false),
38+
},
39+
annotations: new Dictionary<string, object>
40+
{
41+
{ "DynamicFilter_DynamicParameterValue_MayHaveTenant", "EntityFramework.DynamicFilters.DynamicFilterDefinition" },
42+
})
43+
.PrimaryKey(t => t.Id)
44+
.ForeignKey("dbo.AbpDynamicParameters", t => t.DynamicParameterId, cascadeDelete: true)
45+
.Index(t => t.TenantId)
46+
.Index(t => t.DynamicParameterId);
47+
48+
CreateTable(
49+
"dbo.AbpEntityDynamicParameters",
50+
c => new
51+
{
52+
Id = c.Int(nullable: false, identity: true),
53+
EntityFullName = c.String(maxLength: 250),
54+
DynamicParameterId = c.Int(nullable: false),
55+
TenantId = c.Int(),
56+
},
57+
annotations: new Dictionary<string, object>
58+
{
59+
{ "DynamicFilter_EntityDynamicParameter_MayHaveTenant", "EntityFramework.DynamicFilters.DynamicFilterDefinition" },
60+
})
61+
.PrimaryKey(t => t.Id)
62+
.ForeignKey("dbo.AbpDynamicParameters", t => t.DynamicParameterId, cascadeDelete: true)
63+
.Index(t => new { t.EntityFullName, t.DynamicParameterId, t.TenantId }, unique: true)
64+
.Index(t => t.TenantId);
65+
66+
CreateTable(
67+
"dbo.AbpEntityDynamicParameterValues",
68+
c => new
69+
{
70+
Id = c.Int(nullable: false, identity: true),
71+
Value = c.String(nullable: false),
72+
EntityId = c.String(),
73+
EntityDynamicParameterId = c.Int(nullable: false),
74+
TenantId = c.Int(),
75+
},
76+
annotations: new Dictionary<string, object>
77+
{
78+
{ "DynamicFilter_EntityDynamicParameterValue_MayHaveTenant", "EntityFramework.DynamicFilters.DynamicFilterDefinition" },
79+
})
80+
.PrimaryKey(t => t.Id)
81+
.ForeignKey("dbo.AbpEntityDynamicParameters", t => t.EntityDynamicParameterId, cascadeDelete: true)
82+
.Index(t => t.EntityDynamicParameterId)
83+
.Index(t => t.TenantId);
84+
85+
}
86+
87+
public override void Down()
88+
{
89+
DropForeignKey("dbo.AbpEntityDynamicParameterValues", "EntityDynamicParameterId", "dbo.AbpEntityDynamicParameters");
90+
DropForeignKey("dbo.AbpEntityDynamicParameters", "DynamicParameterId", "dbo.AbpDynamicParameters");
91+
DropForeignKey("dbo.AbpDynamicParameterValues", "DynamicParameterId", "dbo.AbpDynamicParameters");
92+
DropIndex("dbo.AbpEntityDynamicParameterValues", new[] { "TenantId" });
93+
DropIndex("dbo.AbpEntityDynamicParameterValues", new[] { "EntityDynamicParameterId" });
94+
DropIndex("dbo.AbpEntityDynamicParameters", new[] { "TenantId" });
95+
DropIndex("dbo.AbpEntityDynamicParameters", new[] { "EntityFullName", "DynamicParameterId", "TenantId" });
96+
DropIndex("dbo.AbpDynamicParameterValues", new[] { "DynamicParameterId" });
97+
DropIndex("dbo.AbpDynamicParameterValues", new[] { "TenantId" });
98+
DropIndex("dbo.AbpDynamicParameters", new[] { "TenantId" });
99+
DropIndex("dbo.AbpDynamicParameters", new[] { "ParameterName", "TenantId" });
100+
DropTable("dbo.AbpEntityDynamicParameterValues",
101+
removedAnnotations: new Dictionary<string, object>
102+
{
103+
{ "DynamicFilter_EntityDynamicParameterValue_MayHaveTenant", "EntityFramework.DynamicFilters.DynamicFilterDefinition" },
104+
});
105+
DropTable("dbo.AbpEntityDynamicParameters",
106+
removedAnnotations: new Dictionary<string, object>
107+
{
108+
{ "DynamicFilter_EntityDynamicParameter_MayHaveTenant", "EntityFramework.DynamicFilters.DynamicFilterDefinition" },
109+
});
110+
DropTable("dbo.AbpDynamicParameterValues",
111+
removedAnnotations: new Dictionary<string, object>
112+
{
113+
{ "DynamicFilter_DynamicParameterValue_MayHaveTenant", "EntityFramework.DynamicFilters.DynamicFilterDefinition" },
114+
});
115+
DropTable("dbo.AbpDynamicParameters",
116+
removedAnnotations: new Dictionary<string, object>
117+
{
118+
{ "DynamicFilter_DynamicParameter_MayHaveTenant", "EntityFramework.DynamicFilters.DynamicFilterDefinition" },
119+
});
120+
}
121+
}
122+
}

0 commit comments

Comments
 (0)