Skip to content

Commit 6d352ac

Browse files
committed
Upgraded to ABP v0.8.0.1.
1 parent 5065e9d commit 6d352ac

26 files changed

+773
-266
lines changed

src/EventCloud.Application/EventCloud.Application.csproj

Lines changed: 10 additions & 10 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.7.1, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.7.7.1\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.8.0.1\lib\net461\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.AutoMapper, Version=0.7.7.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.AutoMapper.0.7.7.0\lib\net452\Abp.AutoMapper.dll</HintPath>
40+
<Reference Include="Abp.AutoMapper, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.AutoMapper.0.8.0.1\lib\net461\Abp.AutoMapper.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=0.7.7.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.0.7.7.0\lib\net452\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.0.8.0.1\lib\net461\Abp.Zero.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="AutoMapper, Version=4.0.4.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
@@ -74,7 +74,7 @@
7474
<Private>True</Private>
7575
</Reference>
7676
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
77-
<HintPath>..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
77+
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
7878
<Private>True</Private>
7979
</Reference>
8080
<Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -90,9 +90,9 @@
9090
<Private>True</Private>
9191
</Reference>
9292
<Reference Include="System" />
93-
<Reference Include="System.Collections.Immutable, Version=1.0.34.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94-
<SpecificVersion>False</SpecificVersion>
95-
<HintPath>..\packages\Microsoft.Bcl.Immutable.1.0.34\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
93+
<Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94+
<HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
95+
<Private>True</Private>
9696
</Reference>
9797
<Reference Include="System.ComponentModel.DataAnnotations" />
9898
<Reference Include="System.Core" />

src/EventCloud.Application/app.config

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
5+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
66
</configSections>
77
<runtime>
88
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
99
<dependentAssembly>
10-
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
11-
<bindingRedirect oldVersion="0.0.0.0-1.0.34.0" newVersion="1.0.34.0"/>
10+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
1212
</dependentAssembly>
1313
<dependentAssembly>
14-
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
15-
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0"/>
14+
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
1616
</dependentAssembly>
1717
<dependentAssembly>
18-
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral"/>
19-
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0"/>
18+
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
2020
</dependentAssembly>
2121
<dependentAssembly>
22-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
23-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
22+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
2424
</dependentAssembly>
2525
</assemblyBinding>
2626
</runtime>
2727
<entityFramework>
2828
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
2929
<parameters>
30-
<parameter value="mssqllocaldb"/>
30+
<parameter value="mssqllocaldb" />
3131
</parameters>
3232
</defaultConnectionFactory>
3333
<providers>
34-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
34+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
3535
</providers>
3636
</entityFramework>
37-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
37+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.7.7.1" targetFramework="net452" />
4-
<package id="Abp.AutoMapper" version="0.7.7.0" targetFramework="net452" />
5-
<package id="Abp.Zero" version="0.7.7.0" targetFramework="net452" />
3+
<package id="Abp" version="0.8.0.1" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="0.8.0.1" targetFramework="net461" />
5+
<package id="Abp.Zero" version="0.8.0.1" targetFramework="net461" />
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" />
99
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
1010
<package id="EntityFramework" version="6.1.3" targetFramework="net451" />
1111
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
12-
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
13-
<package id="Newtonsoft.Json" version="8.0.1" targetFramework="net452" />
12+
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net461" />
1413
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />
14+
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net461" />
1515
</packages>

src/EventCloud.Core/EventCloud.Core.csproj

Lines changed: 11 additions & 9 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.7.1, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.7.7.1\lib\net452\Abp.dll</HintPath>
36+
<Reference Include="Abp, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Abp.0.8.0.1\lib\net461\Abp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Abp.Zero, Version=0.7.7.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.Zero.0.7.7.0\lib\net452\Abp.Zero.dll</HintPath>
40+
<Reference Include="Abp.Zero, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.Zero.0.8.0.1\lib\net461\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">
@@ -66,7 +66,7 @@
6666
<Private>True</Private>
6767
</Reference>
6868
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
69+
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
7070
<Private>True</Private>
7171
</Reference>
7272
<Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -82,9 +82,9 @@
8282
<Private>True</Private>
8383
</Reference>
8484
<Reference Include="System" />
85-
<Reference Include="System.Collections.Immutable, Version=1.0.34.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
86-
<SpecificVersion>False</SpecificVersion>
87-
<HintPath>..\packages\Microsoft.Bcl.Immutable.1.0.34\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
85+
<Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
86+
<HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
87+
<Private>True</Private>
8888
</Reference>
8989
<Reference Include="System.ComponentModel.DataAnnotations" />
9090
<Reference Include="System.Core" />
@@ -126,7 +126,9 @@
126126
</ItemGroup>
127127
<ItemGroup>
128128
<None Include="app.config" />
129-
<None Include="packages.config" />
129+
<None Include="packages.config">
130+
<SubType>Designer</SubType>
131+
</None>
130132
</ItemGroup>
131133
<ItemGroup>
132134
<EmbeddedResource Include="Localization\Source\EventCloud-tr.xml" />

src/EventCloud.Core/app.config

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,33 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
5+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
66
</configSections>
77
<runtime>
88
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
99
<dependentAssembly>
10-
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
11-
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0"/>
10+
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
1212
</dependentAssembly>
1313
<dependentAssembly>
14-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
15-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
14+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
1620
</dependentAssembly>
1721
</assemblyBinding>
1822
</runtime>
1923
<entityFramework>
2024
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
2125
<parameters>
22-
<parameter value="mssqllocaldb"/>
26+
<parameter value="mssqllocaldb" />
2327
</parameters>
2428
</defaultConnectionFactory>
2529
<providers>
26-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
30+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
2731
</providers>
2832
</entityFramework>
29-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
33+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

src/EventCloud.Core/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.7.7.1" targetFramework="net452" />
4-
<package id="Abp.Zero" version="0.7.7.0" targetFramework="net452" />
3+
<package id="Abp" version="0.8.0.1" targetFramework="net461" />
4+
<package id="Abp.Zero" version="0.8.0.1" targetFramework="net461" />
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" />
88
<package id="EntityFramework" version="6.1.3" targetFramework="net451" />
99
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
10-
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
11-
<package id="Newtonsoft.Json" version="8.0.1" targetFramework="net452" />
10+
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net461" />
1211
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />
12+
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net461" />
1313
</packages>
Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
4+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
55
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
66
<entityFramework>
7-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
7+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
88
<providers>
9-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
9+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
1010
</providers>
1111
</entityFramework>
1212
<runtime>
1313
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
1414
<dependentAssembly>
15-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
16-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
15+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
16+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
17+
</dependentAssembly>
18+
<dependentAssembly>
19+
<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" />
1721
</dependentAssembly>
1822
</assemblyBinding>
1923
</runtime>
20-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
24+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

0 commit comments

Comments
 (0)