Skip to content

Commit f4bf354

Browse files
hikalkanhikalkan
committed
Upgraded to ABP and module zero to v0.7.3.0.
1 parent 37168a9 commit f4bf354

File tree

63 files changed

+10851
-4968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+10851
-4968
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.1.0\lib\net451\Abp.dll</HintPath>
35+
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="Abp.AutoMapper, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.AutoMapper.0.7.1.0\lib\net451\Abp.AutoMapper.dll</HintPath>
39+
<Reference Include="Abp.AutoMapper, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.AutoMapper.0.7.2.0\lib\net451\Abp.AutoMapper.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43-
<Reference Include="Abp.Zero, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Abp.Zero.0.7.1.0\lib\net451\Abp.Zero.dll</HintPath>
43+
<Reference Include="Abp.Zero, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Abp.Zero.0.7.3.0\lib\net451\Abp.Zero.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="AutoMapper, Version=4.0.4.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.7.1.0" targetFramework="net451" />
4-
<package id="Abp.AutoMapper" version="0.7.1.0" targetFramework="net451" />
5-
<package id="Abp.Zero" version="0.7.1.0" targetFramework="net451" />
3+
<package id="Abp" version="0.7.3.0" targetFramework="net451" />
4+
<package id="Abp.AutoMapper" version="0.7.2.0" targetFramework="net451" />
5+
<package id="Abp.Zero" version="0.7.3.0" targetFramework="net451" />
66
<package id="AutoMapper" version="4.0.4" 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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.1.0\lib\net451\Abp.dll</HintPath>
35+
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="Abp.Zero, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.Zero.0.7.1.0\lib\net451\Abp.Zero.dll</HintPath>
39+
<Reference Include="Abp.Zero, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.Zero.0.7.3.0\lib\net451\Abp.Zero.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
@@ -89,6 +89,8 @@
8989
<Compile Include="AbpProjectNameConsts.cs" />
9090
<Compile Include="AbpProjectNameCoreModule.cs" />
9191
<Compile Include="Authorization\PermissionChecker.cs" />
92+
<Compile Include="Editions\EditionManager.cs" />
93+
<Compile Include="Features\FeatureValueStore.cs" />
9294
<Compile Include="MultiTenancy\Tenant.cs" />
9395
<Compile Include="MultiTenancy\TenantManager.cs" />
9496
<Compile Include="Properties\AssemblyInfo.cs" />

‎src/AbpCompanyName.AbpProjectName.Core/Editions/EditionManager.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
using Abp.Application.Editions;
2+
3+
namespace AbpCompanyName.AbpProjectName.Editions
4+
{
5+
public class EditionManager : AbpEditionManager
6+
{
7+
8+
}
9+
}

‎src/AbpCompanyName.AbpProjectName.Core/Features/FeatureValueStore.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using Abp.Application.Features;
2+
using AbpCompanyName.AbpProjectName.Authorization.Roles;
3+
using AbpCompanyName.AbpProjectName.MultiTenancy;
4+
using AbpCompanyName.AbpProjectName.Users;
5+
6+
namespace AbpCompanyName.AbpProjectName.Features
7+
{
8+
public class FeatureValueStore : AbpFeatureValueStore<Tenant, Role, User>
9+
{
10+
public FeatureValueStore(TenantManager tenantManager)
11+
: base(tenantManager)
12+
{
13+
}
14+
}
15+
}

‎src/AbpCompanyName.AbpProjectName.Core/MultiTenancy/TenantManager.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
using Abp.Domain.Repositories;
2-
using Abp.MultiTenancy;
3-
using AbpCompanyName.AbpProjectName.Authorization.Roles;
4-
using AbpCompanyName.AbpProjectName.Users;
5-
6-
namespace AbpCompanyName.AbpProjectName.MultiTenancy
7-
{
8-
public class TenantManager : AbpTenantManager<Tenant, Role, User>
9-
{
10-
public TenantManager(IRepository<Tenant> tenantRepository)
11-
: base(tenantRepository)
12-
{
13-
14-
}
15-
}
1+
using Abp.MultiTenancy;
2+
using AbpCompanyName.AbpProjectName.Authorization.Roles;
3+
using AbpCompanyName.AbpProjectName.Editions;
4+
using AbpCompanyName.AbpProjectName.Users;
5+
6+
namespace AbpCompanyName.AbpProjectName.MultiTenancy
7+
{
8+
public class TenantManager : AbpTenantManager<Tenant, Role, User>
9+
{
10+
public TenantManager(EditionManager editionManager)
11+
: base(editionManager)
12+
{
13+
14+
}
15+
}
1616
}

‎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.7.1.0" targetFramework="net451" />
4-
<package id="Abp.Zero" version="0.7.1.0" targetFramework="net451" />
3+
<package id="Abp" version="0.7.3.0" targetFramework="net451" />
4+
<package id="Abp.Zero" version="0.7.3.0" targetFramework="net451" />
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: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.1.0\lib\net451\Abp.dll</HintPath>
35+
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="Abp.EntityFramework, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.EntityFramework.0.7.1.0\lib\net451\Abp.EntityFramework.dll</HintPath>
39+
<Reference Include="Abp.EntityFramework, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.EntityFramework.0.7.2.0\lib\net451\Abp.EntityFramework.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43-
<Reference Include="Abp.Zero, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Abp.Zero.0.7.1.0\lib\net451\Abp.Zero.dll</HintPath>
43+
<Reference Include="Abp.Zero, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Abp.Zero.0.7.3.0\lib\net451\Abp.Zero.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
47-
<Reference Include="Abp.Zero.EntityFramework, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.EntityFramework.0.7.1.0\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
47+
<Reference Include="Abp.Zero.EntityFramework, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.EntityFramework.0.7.3.0\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
5151
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
@@ -120,6 +120,10 @@
120120
<Compile Include="Migrations\201509290947427_Upgrade_To_ModuleZero_0_7_1.Designer.cs">
121121
<DependentUpon>201509290947427_Upgrade_To_ModuleZero_0_7_1.cs</DependentUpon>
122122
</Compile>
123+
<Compile Include="Migrations\201510141938232_Upgrade_Abp_And_Module_Zero_To_0_7_3.cs" />
124+
<Compile Include="Migrations\201510141938232_Upgrade_Abp_And_Module_Zero_To_0_7_3.Designer.cs">
125+
<DependentUpon>201510141938232_Upgrade_Abp_And_Module_Zero_To_0_7_3.cs</DependentUpon>
126+
</Compile>
123127
<Compile Include="Migrations\Configuration.cs" />
124128
<Compile Include="AbpProjectNameDataModule.cs" />
125129
<Compile Include="Migrations\SeedData\DefaultTenantRoleAndUserBuilder.cs" />
@@ -146,6 +150,9 @@
146150
<EmbeddedResource Include="Migrations\201509290947427_Upgrade_To_ModuleZero_0_7_1.resx">
147151
<DependentUpon>201509290947427_Upgrade_To_ModuleZero_0_7_1.cs</DependentUpon>
148152
</EmbeddedResource>
153+
<EmbeddedResource Include="Migrations\201510141938232_Upgrade_Abp_And_Module_Zero_To_0_7_3.resx">
154+
<DependentUpon>201510141938232_Upgrade_Abp_And_Module_Zero_To_0_7_3.cs</DependentUpon>
155+
</EmbeddedResource>
149156
</ItemGroup>
150157
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
151158
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

‎src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/201510141938232_Upgrade_Abp_And_Module_Zero_To_0_7_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/201510141938232_Upgrade_Abp_And_Module_Zero_To_0_7_3.cs‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
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 Upgrade_Abp_And_Module_Zero_To_0_7_3 : DbMigration
9+
{
10+
public override void Up()
11+
{
12+
CreateTable(
13+
"dbo.AbpFeatures",
14+
c => new
15+
{
16+
Id = c.Long(nullable: false, identity: true),
17+
Name = c.String(nullable: false, maxLength: 128),
18+
Value = c.String(nullable: false, maxLength: 2000),
19+
CreationTime = c.DateTime(nullable: false),
20+
CreatorUserId = c.Long(),
21+
EditionId = c.Int(),
22+
TenantId = c.Int(),
23+
Discriminator = c.String(nullable: false, maxLength: 128),
24+
})
25+
.PrimaryKey(t => t.Id)
26+
.ForeignKey("dbo.AbpEditions", t => t.EditionId, cascadeDelete: true)
27+
.Index(t => t.EditionId);
28+
29+
CreateTable(
30+
"dbo.AbpEditions",
31+
c => new
32+
{
33+
Id = c.Int(nullable: false, identity: true),
34+
Name = c.String(nullable: false, maxLength: 32),
35+
DisplayName = c.String(nullable: false, maxLength: 64),
36+
IsDeleted = c.Boolean(nullable: false),
37+
DeleterUserId = c.Long(),
38+
DeletionTime = c.DateTime(),
39+
LastModificationTime = c.DateTime(),
40+
LastModifierUserId = c.Long(),
41+
CreationTime = c.DateTime(nullable: false),
42+
CreatorUserId = c.Long(),
43+
},
44+
annotations: new Dictionary<string, object>
45+
{
46+
{ "DynamicFilter_Edition_SoftDelete", "EntityFramework.DynamicFilters.DynamicFilterDefinition" },
47+
})
48+
.PrimaryKey(t => t.Id);
49+
50+
AddColumn("dbo.AbpTenants", "EditionId", c => c.Int());
51+
CreateIndex("dbo.AbpTenants", "EditionId");
52+
AddForeignKey("dbo.AbpTenants", "EditionId", "dbo.AbpEditions", "Id");
53+
}
54+
55+
public override void Down()
56+
{
57+
DropForeignKey("dbo.AbpTenants", "EditionId", "dbo.AbpEditions");
58+
DropForeignKey("dbo.AbpFeatures", "EditionId", "dbo.AbpEditions");
59+
DropIndex("dbo.AbpTenants", new[] { "EditionId" });
60+
DropIndex("dbo.AbpFeatures", new[] { "EditionId" });
61+
DropColumn("dbo.AbpTenants", "EditionId");
62+
DropTable("dbo.AbpEditions",
63+
removedAnnotations: new Dictionary<string, object>
64+
{
65+
{ "DynamicFilter_Edition_SoftDelete", "EntityFramework.DynamicFilters.DynamicFilterDefinition" },
66+
});
67+
DropTable("dbo.AbpFeatures");
68+
}
69+
}
70+
}

0 commit comments

Comments
 (0)