Skip to content

Commit 2c4745f

Browse files
perifaceperiface
committed
Actualización a Abp 1.1
1 parent c1edc9c commit 2c4745f

File tree

64 files changed

+1142
-376
lines changed

Some content is hidden

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

64 files changed

+1142
-376
lines changed

‎CInotam.MailSender.Contracts/CInotam.MailSender.Contracts.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="Abp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\Abp.1.0.0.0\lib\net452\Abp.dll</HintPath>
34+
<Reference Include="Abp, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
35+
<HintPath>..\packages\Abp.1.1.1.0\lib\net452\Abp.dll</HintPath>
3636
<Private>True</Private>
3737
</Reference>
3838
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
@@ -64,15 +64,15 @@
6464
<Private>True</Private>
6565
</Reference>
6666
<Reference Include="System" />
67-
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
68-
<HintPath>..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
67+
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
68+
<HintPath>..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
7171
<Reference Include="System.ComponentModel.DataAnnotations" />
7272
<Reference Include="System.Configuration" />
7373
<Reference Include="System.Core" />
74-
<Reference Include="System.Linq.Dynamic, Version=1.0.5840.25917, Culture=neutral, processorArchitecture=MSIL">
75-
<HintPath>..\packages\System.Linq.Dynamic.1.0.6\lib\net40\System.Linq.Dynamic.dll</HintPath>
74+
<Reference Include="System.Linq.Dynamic, Version=1.0.6132.35681, Culture=neutral, processorArchitecture=MSIL">
75+
<HintPath>..\packages\System.Linq.Dynamic.1.0.7\lib\net40\System.Linq.Dynamic.dll</HintPath>
7676
<Private>True</Private>
7777
</Reference>
7878
<Reference Include="System.Runtime.Caching" />

‎CInotam.MailSender.Contracts/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="1.0.0.0" targetFramework="net452" />
3+
<package id="Abp" version="1.1.1.0" targetFramework="net452" />
44
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
55
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
66
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
77
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
88
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net452" />
9-
<package id="System.Collections.Immutable" version="1.2.0" targetFramework="net452" />
10-
<package id="System.Linq.Dynamic" version="1.0.6" targetFramework="net452" />
9+
<package id="System.Collections.Immutable" version="1.3.0" targetFramework="net452" />
10+
<package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net452" />
1111
</packages>

‎Cinotam.AbpModuleZero.Core/Cinotam.AbpModuleZero.Core.csproj‎

Lines changed: 12 additions & 12 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=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.1.0.0.0\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.1.1.1.0\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.AutoMapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.AutoMapper.1.0.0.0\lib\net452\Abp.AutoMapper.dll</HintPath>
40+
<Reference Include="Abp.AutoMapper, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.AutoMapper.1.1.1.0\lib\net452\Abp.AutoMapper.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.1.0.0.0\lib\net452\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.1.1.0.0\lib\net452\Abp.Zero.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
48-
<Reference Include="AutoMapper, Version=5.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
49-
<HintPath>..\packages\AutoMapper.5.1.1\lib\net45\AutoMapper.dll</HintPath>
48+
<Reference Include="AutoMapper, Version=5.2.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
49+
<HintPath>..\packages\AutoMapper.5.2.0\lib\net45\AutoMapper.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
5252
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
@@ -90,15 +90,15 @@
9090
<Private>True</Private>
9191
</Reference>
9292
<Reference Include="System" />
93-
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94-
<HintPath>..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
93+
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94+
<HintPath>..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
9595
<Private>True</Private>
9696
</Reference>
9797
<Reference Include="System.ComponentModel.DataAnnotations" />
9898
<Reference Include="System.Configuration" />
9999
<Reference Include="System.Core" />
100-
<Reference Include="System.Linq.Dynamic, Version=1.0.5840.25917, Culture=neutral, processorArchitecture=MSIL">
101-
<HintPath>..\packages\System.Linq.Dynamic.1.0.6\lib\net40\System.Linq.Dynamic.dll</HintPath>
100+
<Reference Include="System.Linq.Dynamic, Version=1.0.6132.35681, Culture=neutral, processorArchitecture=MSIL">
101+
<HintPath>..\packages\System.Linq.Dynamic.1.0.7\lib\net40\System.Linq.Dynamic.dll</HintPath>
102102
<Private>True</Private>
103103
</Reference>
104104
<Reference Include="System.Net.Http" />

‎Cinotam.AbpModuleZero.Core/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
15+
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
1616
</dependentAssembly>
1717
</assemblyBinding>
1818
</runtime>

‎Cinotam.AbpModuleZero.Core/packages.config‎

Lines changed: 6 additions & 6 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="1.0.0.0" targetFramework="net452" />
4-
<package id="Abp.AutoMapper" version="1.0.0.0" targetFramework="net452" />
5-
<package id="Abp.Zero" version="1.0.0.0" targetFramework="net452" />
6-
<package id="AutoMapper" version="5.1.1" targetFramework="net452" />
3+
<package id="Abp" version="1.1.1.0" targetFramework="net452" />
4+
<package id="Abp.AutoMapper" version="1.1.1.0" targetFramework="net452" />
5+
<package id="Abp.Zero" version="1.1.0.0" targetFramework="net452" />
6+
<package id="AutoMapper" version="5.2.0" targetFramework="net452" />
77
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
88
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
99
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
@@ -13,6 +13,6 @@
1313
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net452" />
1414
<package id="Sendgrid" version="8.0.4" targetFramework="net452" />
1515
<package id="SendGrid.CSharp.HTTP.Client" version="3.0.0" targetFramework="net452" />
16-
<package id="System.Collections.Immutable" version="1.2.0" targetFramework="net452" />
17-
<package id="System.Linq.Dynamic" version="1.0.6" targetFramework="net452" />
16+
<package id="System.Collections.Immutable" version="1.3.0" targetFramework="net452" />
17+
<package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net452" />
1818
</packages>

‎Cinotam.AbpModuleZero.EntityFramework/App.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
</dependentAssembly>
1818
<dependentAssembly>
1919
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
20-
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
20+
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
2121
</dependentAssembly>
2222
<dependentAssembly>
2323
<assemblyIdentity name="EntityFramework.DynamicFilters" publicKeyToken="146423a1b8d60775" culture="neutral" />
24-
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0" />
24+
<bindingRedirect oldVersion="0.0.0.0-1.4.11.0" newVersion="1.4.11.0" />
2525
</dependentAssembly>
2626
</assemblyBinding>
2727
</runtime>

‎Cinotam.AbpModuleZero.EntityFramework/Cinotam.AbpModuleZero.EntityFramework.csproj‎

Lines changed: 23 additions & 16 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=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.1.0.0.0\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.1.1.1.0\lib\net452\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.EntityFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.EntityFramework.1.0.0.0\lib\net452\Abp.EntityFramework.dll</HintPath>
40+
<Reference Include="Abp.EntityFramework, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.EntityFramework.1.1.1.0\lib\net452\Abp.EntityFramework.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="Abp.EntityFramework.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.EntityFramework.Common.1.0.0.0\lib\net452\Abp.EntityFramework.Common.dll</HintPath>
44+
<Reference Include="Abp.EntityFramework.Common, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.EntityFramework.Common.1.1.1.0\lib\net452\Abp.EntityFramework.Common.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
48-
<Reference Include="Abp.Zero, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Abp.Zero.1.0.0.0\lib\net452\Abp.Zero.dll</HintPath>
48+
<Reference Include="Abp.Zero, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Zero.1.1.0.0\lib\net452\Abp.Zero.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
52-
<Reference Include="Abp.Zero.EntityFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\packages\Abp.Zero.EntityFramework.1.0.0.0\lib\net452\Abp.Zero.EntityFramework.dll</HintPath>
52+
<Reference Include="Abp.Zero.EntityFramework, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Abp.Zero.EntityFramework.1.1.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=2.3.0.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
73-
<HintPath>..\packages\EntityFramework.DynamicFilters.2.3.0\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
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>
7474
<Private>True</Private>
7575
</Reference>
7676
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
@@ -98,15 +98,15 @@
9898
<Private>True</Private>
9999
</Reference>
100100
<Reference Include="System" />
101-
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
102-
<HintPath>..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
101+
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
102+
<HintPath>..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
103103
<Private>True</Private>
104104
</Reference>
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>
108+
<Reference Include="System.Linq.Dynamic, Version=1.0.6132.35681, Culture=neutral, processorArchitecture=MSIL">
109+
<HintPath>..\packages\System.Linq.Dynamic.1.0.7\lib\net40\System.Linq.Dynamic.dll</HintPath>
110110
<Private>True</Private>
111111
</Reference>
112112
<Reference Include="System.Runtime.Caching" />
@@ -258,6 +258,10 @@
258258
<Compile Include="Migrations\201611231751555_FileNameToAttachment.Designer.cs">
259259
<DependentUpon>201611231751555_FileNameToAttachment.cs</DependentUpon>
260260
</Compile>
261+
<Compile Include="Migrations\201612010235032_AbpUpdate1_1.cs" />
262+
<Compile Include="Migrations\201612010235032_AbpUpdate1_1.Designer.cs">
263+
<DependentUpon>201612010235032_AbpUpdate1_1.cs</DependentUpon>
264+
</Compile>
261265
<Compile Include="Migrations\AbpZeroDbMigrator.cs" />
262266
<Compile Include="Migrations\Configuration.cs" />
263267
<Compile Include="AbpModuleZeroDataModule.cs" />
@@ -392,6 +396,9 @@
392396
<EmbeddedResource Include="Migrations\201611231751555_FileNameToAttachment.resx">
393397
<DependentUpon>201611231751555_FileNameToAttachment.cs</DependentUpon>
394398
</EmbeddedResource>
399+
<EmbeddedResource Include="Migrations\201612010235032_AbpUpdate1_1.resx">
400+
<DependentUpon>201612010235032_AbpUpdate1_1.cs</DependentUpon>
401+
</EmbeddedResource>
395402
</ItemGroup>
396403
<ItemGroup />
397404
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Cinotam.AbpModuleZero.EntityFramework/Migrations/201612010235032_AbpUpdate1_1.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.

‎Cinotam.AbpModuleZero.EntityFramework/Migrations/201612010235032_AbpUpdate1_1.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
namespace Cinotam.AbpModuleZero.Migrations
2+
{
3+
using System;
4+
using System.Data.Entity.Migrations;
5+
6+
public partial class AbpUpdate1_1 : DbMigration
7+
{
8+
public override void Up()
9+
{
10+
AlterColumn("dbo.AbpUsers", "EmailConfirmationCode", c => c.String(maxLength: 328));
11+
}
12+
13+
public override void Down()
14+
{
15+
AlterColumn("dbo.AbpUsers", "EmailConfirmationCode", c => c.String(maxLength: 128));
16+
}
17+
}
18+
}

0 commit comments

Comments
 (0)