Skip to content

Commit b0ea1f0

Browse files
committed
Updated Abp packages to v0.12.
1 parent 3b84dda commit b0ea1f0

File tree

23 files changed

+2015
-1770
lines changed

23 files changed

+2015
-1770
lines changed

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

Lines changed: 10 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.11.0.2, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.11.0.2\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.12.0.0\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.AutoMapper, Version=0.11.0.2, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.AutoMapper.0.11.0.2\lib\net452\Abp.AutoMapper.dll</HintPath>
40+
<Reference Include="Abp.AutoMapper, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.AutoMapper.0.12.0.0\lib\net452\Abp.AutoMapper.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.0.11.0.0\lib\net452\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.0.12.0.0\lib\net452\Abp.Zero.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="AutoMapper, Version=5.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
@@ -89,6 +89,10 @@
8989
<Reference Include="System.ComponentModel.DataAnnotations" />
9090
<Reference Include="System.Configuration" />
9191
<Reference Include="System.Core" />
92+
<Reference Include="System.Linq.Dynamic, Version=1.0.5840.25917, Culture=neutral, processorArchitecture=MSIL">
93+
<HintPath>..\packages\System.Linq.Dynamic.1.0.6\lib\net40\System.Linq.Dynamic.dll</HintPath>
94+
<Private>True</Private>
95+
</Reference>
9296
<Reference Include="System.Runtime.Caching" />
9397
<Reference Include="System.Transactions" />
9498
<Reference Include="System.Xml.Linq" />
Lines changed: 4 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.11.0.2" targetFramework="net452" />
4-
<package id="Abp.AutoMapper" version="0.11.0.2" targetFramework="net452" />
5-
<package id="Abp.Zero" version="0.11.0.0" targetFramework="net452" />
3+
<package id="Abp" version="0.12.0.0" targetFramework="net452" />
4+
<package id="Abp.AutoMapper" version="0.12.0.0" targetFramework="net452" />
5+
<package id="Abp.Zero" version="0.12.0.0" targetFramework="net452" />
66
<package id="AutoMapper" version="5.1.1" targetFramework="net452" />
77
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
88
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
@@ -11,4 +11,5 @@
1111
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
1212
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net452" />
1313
<package id="System.Collections.Immutable" version="1.2.0" targetFramework="net452" />
14+
<package id="System.Linq.Dynamic" version="1.0.6" targetFramework="net452" />
1415
</packages>

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

Lines changed: 8 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.11.0.2, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.11.0.2\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.12.0.0\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.Zero, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.Zero.0.11.0.0\lib\net452\Abp.Zero.dll</HintPath>
40+
<Reference Include="Abp.Zero, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.Zero.0.12.0.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">
@@ -81,6 +81,10 @@
8181
<Reference Include="System.ComponentModel.DataAnnotations" />
8282
<Reference Include="System.Configuration" />
8383
<Reference Include="System.Core" />
84+
<Reference Include="System.Linq.Dynamic, Version=1.0.5840.25917, Culture=neutral, processorArchitecture=MSIL">
85+
<HintPath>..\packages\System.Linq.Dynamic.1.0.6\lib\net40\System.Linq.Dynamic.dll</HintPath>
86+
<Private>True</Private>
87+
</Reference>
8488
<Reference Include="System.Runtime.Caching" />
8589
<Reference Include="System.Transactions" />
8690
<Reference Include="System.Xml.Linq" />
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.11.0.2" targetFramework="net452" />
4-
<package id="Abp.Zero" version="0.11.0.0" targetFramework="net452" />
3+
<package id="Abp" version="0.12.0.0" targetFramework="net452" />
4+
<package id="Abp.Zero" version="0.12.0.0" targetFramework="net452" />
55
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
66
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
77
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
88
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
99
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
1010
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net452" />
1111
<package id="System.Collections.Immutable" version="1.2.0" targetFramework="net452" />
12+
<package id="System.Linq.Dynamic" version="1.0.6" targetFramework="net452" />
1213
</packages>

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

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,24 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Abp, Version=0.11.0.2, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.11.0.2\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.12.0.0\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.EntityFramework, Version=0.11.0.2, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.EntityFramework.0.11.0.2\lib\net452\Abp.EntityFramework.dll</HintPath>
40+
<Reference Include="Abp.EntityFramework, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.EntityFramework.0.12.0.0\lib\net452\Abp.EntityFramework.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="Abp.EntityFramework.Common, Version=0.11.0.2, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.EntityFramework.Common.0.11.0.2\lib\net452\Abp.EntityFramework.Common.dll</HintPath>
44+
<Reference Include="Abp.EntityFramework.Common, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.EntityFramework.Common.0.12.0.0\lib\net452\Abp.EntityFramework.Common.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
48-
<Reference Include="Abp.Zero, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Abp.Zero.0.11.0.0\lib\net452\Abp.Zero.dll</HintPath>
48+
<Reference Include="Abp.Zero, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Zero.0.12.0.0\lib\net452\Abp.Zero.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
52-
<Reference Include="Abp.Zero.EntityFramework, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\packages\Abp.Zero.EntityFramework.0.11.0.0\lib\net452\Abp.Zero.EntityFramework.dll</HintPath>
52+
<Reference Include="Abp.Zero.EntityFramework, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Abp.Zero.EntityFramework.0.12.0.0\lib\net452\Abp.Zero.EntityFramework.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
5656
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
@@ -69,8 +69,8 @@
6969
<SpecificVersion>False</SpecificVersion>
7070
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
7171
</Reference>
72-
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.11.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
73-
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.11\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
72+
<Reference Include="EntityFramework.DynamicFilters, Version=2.3.0.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
73+
<HintPath>..\packages\EntityFramework.DynamicFilters.2.3.0\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
7474
<Private>True</Private>
7575
</Reference>
7676
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
@@ -105,6 +105,10 @@
105105
<Reference Include="System.ComponentModel.DataAnnotations" />
106106
<Reference Include="System.Configuration" />
107107
<Reference Include="System.Core" />
108+
<Reference Include="System.Linq.Dynamic, Version=1.0.5840.25917, Culture=neutral, processorArchitecture=MSIL">
109+
<HintPath>..\packages\System.Linq.Dynamic.1.0.6\lib\net40\System.Linq.Dynamic.dll</HintPath>
110+
<Private>True</Private>
111+
</Reference>
108112
<Reference Include="System.Runtime.Caching" />
109113
<Reference Include="System.Transactions" />
110114
<Reference Include="System.Xml.Linq" />
@@ -176,6 +180,10 @@
176180
<Compile Include="Migrations\201605041151380_UserAccount_And_Notification_Changes.Designer.cs">
177181
<DependentUpon>201605041151380_UserAccount_And_Notification_Changes.cs</DependentUpon>
178182
</Compile>
183+
<Compile Include="Migrations\201609110853544_Upgrade_To_ModuleZero_v1_12.cs" />
184+
<Compile Include="Migrations\201609110853544_Upgrade_To_ModuleZero_v1_12.Designer.cs">
185+
<DependentUpon>201609110853544_Upgrade_To_ModuleZero_v1_12.cs</DependentUpon>
186+
</Compile>
179187
<Compile Include="Migrations\AbpZeroDbMigrator.cs" />
180188
<Compile Include="Migrations\Configuration.cs" />
181189
<Compile Include="AbpProjectNameDataModule.cs" />
@@ -244,6 +252,9 @@
244252
<EmbeddedResource Include="Migrations\201605041151380_UserAccount_And_Notification_Changes.resx">
245253
<DependentUpon>201605041151380_UserAccount_And_Notification_Changes.cs</DependentUpon>
246254
</EmbeddedResource>
255+
<EmbeddedResource Include="Migrations\201609110853544_Upgrade_To_ModuleZero_v1_12.resx">
256+
<DependentUpon>201609110853544_Upgrade_To_ModuleZero_v1_12.cs</DependentUpon>
257+
</EmbeddedResource>
247258
</ItemGroup>
248259
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
249260
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/201609110853544_Upgrade_To_ModuleZero_v1_12.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.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
namespace AbpCompanyName.AbpProjectName.Migrations
2+
{
3+
using System;
4+
using System.Data.Entity.Migrations;
5+
6+
public partial class Upgrade_To_ModuleZero_v1_12 : DbMigration
7+
{
8+
public override void Up()
9+
{
10+
DropIndex("dbo.AbpOrganizationUnits", new[] { "TenantId", "Code" });
11+
AlterColumn("dbo.AbpOrganizationUnits", "Code", c => c.String(nullable: false, maxLength: 95));
12+
CreateIndex("dbo.AbpOrganizationUnits", new[] { "TenantId", "Code" });
13+
}
14+
15+
public override void Down()
16+
{
17+
DropIndex("dbo.AbpOrganizationUnits", new[] { "TenantId", "Code" });
18+
AlterColumn("dbo.AbpOrganizationUnits", "Code", c => c.String(nullable: false, maxLength: 128));
19+
CreateIndex("dbo.AbpOrganizationUnits", new[] { "TenantId", "Code" });
20+
}
21+
}
22+
}

src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/201609110853544_Upgrade_To_ModuleZero_v1_12.resx

Lines changed: 126 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.11.0.2" targetFramework="net452" />
4-
<package id="Abp.EntityFramework" version="0.11.0.2" targetFramework="net452" />
5-
<package id="Abp.EntityFramework.Common" version="0.11.0.2" targetFramework="net452" />
6-
<package id="Abp.Zero" version="0.11.0.0" targetFramework="net452" />
7-
<package id="Abp.Zero.EntityFramework" version="0.11.0.0" targetFramework="net452" />
3+
<package id="Abp" version="0.12.0.0" targetFramework="net452" />
4+
<package id="Abp.EntityFramework" version="0.12.0.0" targetFramework="net452" />
5+
<package id="Abp.EntityFramework.Common" version="0.12.0.0" targetFramework="net452" />
6+
<package id="Abp.Zero" version="0.12.0.0" targetFramework="net452" />
7+
<package id="Abp.Zero.EntityFramework" version="0.12.0.0" targetFramework="net452" />
88
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
99
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
1010
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
1111
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
12-
<package id="EntityFramework.DynamicFilters" version="1.4.11" targetFramework="net452" />
12+
<package id="EntityFramework.DynamicFilters" version="2.3.0" targetFramework="net452" />
1313
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
1414
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
1515
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net452" />
1616
<package id="System.Collections.Immutable" version="1.2.0" targetFramework="net452" />
17+
<package id="System.Linq.Dynamic" version="1.0.6" targetFramework="net452" />
1718
</packages>

src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,24 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Abp, Version=0.11.0.2, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.11.0.2\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.12.0.0\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.FluentMigrator, Version=0.11.0.2, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.FluentMigrator.0.11.0.2\lib\net452\Abp.FluentMigrator.dll</HintPath>
40+
<Reference Include="Abp.FluentMigrator, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.FluentMigrator.0.12.0.0\lib\net452\Abp.FluentMigrator.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="Abp.NHibernate, Version=0.11.0.2, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.NHibernate.0.11.0.2\lib\net452\Abp.NHibernate.dll</HintPath>
44+
<Reference Include="Abp.NHibernate, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.NHibernate.0.12.0.0\lib\net452\Abp.NHibernate.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
48-
<Reference Include="Abp.Zero, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Abp.Zero.0.11.0.0\lib\net452\Abp.Zero.dll</HintPath>
48+
<Reference Include="Abp.Zero, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Zero.0.12.0.0\lib\net452\Abp.Zero.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
52-
<Reference Include="Abp.Zero.NHibernate, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\packages\Abp.Zero.NHibernate.0.11.0.0\lib\net452\Abp.Zero.NHibernate.dll</HintPath>
52+
<Reference Include="Abp.Zero.NHibernate, Version=0.12.0.0, Culture=neutral, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Abp.Zero.NHibernate.0.12.0.0\lib\net452\Abp.Zero.NHibernate.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
5656
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
@@ -109,6 +109,10 @@
109109
<Reference Include="System.ComponentModel.DataAnnotations" />
110110
<Reference Include="System.Configuration" />
111111
<Reference Include="System.Core" />
112+
<Reference Include="System.Linq.Dynamic, Version=1.0.5840.25917, Culture=neutral, processorArchitecture=MSIL">
113+
<HintPath>..\packages\System.Linq.Dynamic.1.0.6\lib\net40\System.Linq.Dynamic.dll</HintPath>
114+
<Private>True</Private>
115+
</Reference>
112116
<Reference Include="System.Runtime.Caching" />
113117
<Reference Include="System.Transactions" />
114118
<Reference Include="System.Xml.Linq" />

0 commit comments

Comments
 (0)