Skip to content

Commit 9c83d03

Browse files
hikalkanhikalkan
committed
Upgraded all nuget packages including ABP and module zero.
1 parent ccd40d4 commit 9c83d03

File tree

61 files changed

+6013
-3647
lines changed

Some content is hidden

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

61 files changed

+6013
-3647
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.7.5.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.7.5.0\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.7.6.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.7.6.0\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.AutoMapper, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.AutoMapper.0.7.5.0\lib\net452\Abp.AutoMapper.dll</HintPath>
40+
<Reference Include="Abp.AutoMapper, Version=0.7.6.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.AutoMapper.0.7.6.0\lib\net452\Abp.AutoMapper.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.0.7.5.0\lib\net452\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=0.7.6.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.0.7.6.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.7.5.0" targetFramework="net452" />
4-
<package id="Abp.AutoMapper" version="0.7.5.0" targetFramework="net452" />
5-
<package id="Abp.Zero" version="0.7.5.0" targetFramework="net452" />
3+
<package id="Abp" version="0.7.6.0" targetFramework="net452" />
4+
<package id="Abp.AutoMapper" version="0.7.6.0" targetFramework="net452" />
5+
<package id="Abp.Zero" version="0.7.6.0" targetFramework="net452" />
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: 5 additions & 5 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.7.5.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.7.5.0\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.7.6.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.7.6.0\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.Zero, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.Zero.0.7.5.0\lib\net452\Abp.Zero.dll</HintPath>
40+
<Reference Include="Abp.Zero, Version=0.7.6.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.Zero.0.7.6.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">
@@ -130,4 +130,4 @@
130130
<Target Name="AfterBuild">
131131
</Target>
132132
-->
133-
</Project>
133+
</Project>

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Abp.Dependency;
66
using Abp.Domain.Repositories;
77
using Abp.Domain.Uow;
8+
using Abp.Organizations;
89
using Abp.Runtime.Caching;
910
using Abp.Zero.Configuration;
1011
using AbpCompanyName.AbpProjectName.Authorization.Roles;
@@ -24,7 +25,11 @@ public UserManager(
2425
ISettingManager settingManager,
2526
IUserManagementConfig userManagementConfig,
2627
IIocResolver iocResolver,
27-
ICacheManager cacheManager)
28+
ICacheManager cacheManager,
29+
IRepository<OrganizationUnit, long> organizationUnitRepository,
30+
IRepository<UserOrganizationUnit, long> userOrganizationUnitRepository,
31+
IOrganizationUnitSettings organizationUnitSettings
32+
)
2833
: base(
2934
store,
3035
roleManager,
@@ -35,8 +40,10 @@ public UserManager(
3540
settingManager,
3641
userManagementConfig,
3742
iocResolver,
38-
cacheManager
39-
)
43+
cacheManager,
44+
organizationUnitRepository,
45+
userOrganizationUnitRepository,
46+
organizationUnitSettings)
4047
{
4148
}
4249
}

‎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.5.0" targetFramework="net452" />
4-
<package id="Abp.Zero" version="0.7.5.0" targetFramework="net452" />
3+
<package id="Abp" version="0.7.6.0" targetFramework="net452" />
4+
<package id="Abp.Zero" version="0.7.6.0" targetFramework="net452" />
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: 24 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.7.5.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.7.5.0\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.7.6.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.7.6.0\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.EntityFramework, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.EntityFramework.0.7.5.0\lib\net452\Abp.EntityFramework.dll</HintPath>
40+
<Reference Include="Abp.EntityFramework, Version=0.7.6.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.EntityFramework.0.7.6.0\lib\net452\Abp.EntityFramework.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.0.7.5.0\lib\net452\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=0.7.6.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.0.7.6.0\lib\net452\Abp.Zero.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
48-
<Reference Include="Abp.Zero.EntityFramework, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Abp.Zero.EntityFramework.0.7.5.0\lib\net452\Abp.Zero.EntityFramework.dll</HintPath>
48+
<Reference Include="Abp.Zero.EntityFramework, Version=0.7.6.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Zero.EntityFramework.0.7.6.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.5.0, Culture=neutral, processorArchitecture=MSIL">
69-
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.5\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
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>
7070
<Private>True</Private>
7171
</Reference>
7272
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
@@ -129,6 +129,14 @@
129129
<Compile Include="Migrations\201511091457384_Upgrade_To_ModuleZero_0_7_4.Designer.cs">
130130
<DependentUpon>201511091457384_Upgrade_To_ModuleZero_0_7_4.cs</DependentUpon>
131131
</Compile>
132+
<Compile Include="Migrations\201512241146128_Upgrade_To_Module_Zero_0_7_6.cs" />
133+
<Compile Include="Migrations\201512241146128_Upgrade_To_Module_Zero_0_7_6.Designer.cs">
134+
<DependentUpon>201512241146128_Upgrade_To_Module_Zero_0_7_6.cs</DependentUpon>
135+
</Compile>
136+
<Compile Include="Migrations\201512241148372_Created_Indexes.cs" />
137+
<Compile Include="Migrations\201512241148372_Created_Indexes.Designer.cs">
138+
<DependentUpon>201512241148372_Created_Indexes.cs</DependentUpon>
139+
</Compile>
132140
<Compile Include="Migrations\Configuration.cs" />
133141
<Compile Include="AbpProjectNameDataModule.cs" />
134142
<Compile Include="Migrations\SeedData\DefaultEditionsBuilder.cs" />
@@ -163,6 +171,12 @@
163171
<EmbeddedResource Include="Migrations\201511091457384_Upgrade_To_ModuleZero_0_7_4.resx">
164172
<DependentUpon>201511091457384_Upgrade_To_ModuleZero_0_7_4.cs</DependentUpon>
165173
</EmbeddedResource>
174+
<EmbeddedResource Include="Migrations\201512241146128_Upgrade_To_Module_Zero_0_7_6.resx">
175+
<DependentUpon>201512241146128_Upgrade_To_Module_Zero_0_7_6.cs</DependentUpon>
176+
</EmbeddedResource>
177+
<EmbeddedResource Include="Migrations\201512241148372_Created_Indexes.resx">
178+
<DependentUpon>201512241148372_Created_Indexes.cs</DependentUpon>
179+
</EmbeddedResource>
166180
</ItemGroup>
167181
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
168182
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

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

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

0 commit comments

Comments
 (0)