Skip to content

Commit b147178

Browse files
author
ismcagdas
committed
upgrated to Abp & module zero 0.8.0.1 & .net framework 4.6.1. Also integrated Abp.Owin, Abp.SignalR, Abp.Hangfire
1 parent 333e45c commit b147178

File tree

49 files changed

+4223
-446
lines changed

Some content is hidden

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

49 files changed

+4223
-446
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1111
<AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
@@ -33,16 +33,16 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Abp, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.7.8.0\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.8.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.AutoMapper.0.7.8.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.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, 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" />

‎src/AbpCompanyName.AbpProjectName.Application/app.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-1.0.34.0" newVersion="1.0.34.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
@@ -20,4 +20,4 @@
2020
</dependentAssembly>
2121
</assemblyBinding>
2222
</runtime>
23-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
23+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

‎src/AbpCompanyName.AbpProjectName.Application/packages.config‎

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.7.8.0" targetFramework="net452" />
4-
<package id="Abp.AutoMapper" version="0.7.8.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.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" />
@@ -11,4 +11,5 @@
1111
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
1212
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
1313
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />
14+
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net461" />
1415
</packages>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1111
<AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
@@ -33,12 +33,12 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Abp, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.7.8.0\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">
@@ -74,9 +74,9 @@
7474
<Private>True</Private>
7575
</Reference>
7676
<Reference Include="System" />
77-
<Reference Include="System.Collections.Immutable, Version=1.0.34.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
78-
<SpecificVersion>False</SpecificVersion>
79-
<HintPath>..\packages\Microsoft.Bcl.Immutable.1.0.34\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
77+
<Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
78+
<HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
79+
<Private>True</Private>
8080
</Reference>
8181
<Reference Include="System.ComponentModel.DataAnnotations" />
8282
<Reference Include="System.Core" />

‎src/AbpCompanyName.AbpProjectName.Core/app.config‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
7-
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0"/>
6+
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
11-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
10+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<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" />
1216
</dependentAssembly>
1317
</assemblyBinding>
1418
</runtime>
15-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
19+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

‎src/AbpCompanyName.AbpProjectName.Core/packages.config‎

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.7.8.0" 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="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
99
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
1010
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
1111
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />
12+
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net461" />
1213
</packages>

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

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1111
<AssemblyName>AbpCompanyName.AbpProjectName.EntityFramework</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
@@ -33,20 +33,20 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Abp, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Abp.0.7.8.0\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.EntityFramework, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Abp.EntityFramework.0.7.8.0\lib\net452\Abp.EntityFramework.dll</HintPath>
40+
<Reference Include="Abp.EntityFramework, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.EntityFramework.0.8.0.1\lib\net461\Abp.EntityFramework.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>
48-
<Reference Include="Abp.Zero.EntityFramework, Version=0.7.7.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Abp.Zero.EntityFramework.0.7.7.0\lib\net452\Abp.Zero.EntityFramework.dll</HintPath>
48+
<Reference Include="Abp.Zero.EntityFramework, Version=0.8.0.1, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Zero.EntityFramework.0.8.0.1\lib\net461\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">
@@ -94,9 +94,9 @@
9494
<Private>True</Private>
9595
</Reference>
9696
<Reference Include="System" />
97-
<Reference Include="System.Collections.Immutable, Version=1.0.34.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98-
<SpecificVersion>False</SpecificVersion>
99-
<HintPath>..\packages\Microsoft.Bcl.Immutable.1.0.34\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
97+
<Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98+
<HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
99+
<Private>True</Private>
100100
</Reference>
101101
<Reference Include="System.ComponentModel.DataAnnotations" />
102102
<Reference Include="System.Core" />
@@ -141,6 +141,10 @@
141141
<Compile Include="Migrations\201601032115057_Upgraded_Module_Zero_0_7_7.Designer.cs">
142142
<DependentUpon>201601032115057_Upgraded_Module_Zero_0_7_7.cs</DependentUpon>
143143
</Compile>
144+
<Compile Include="Migrations\201602161446590_Upgrade_Abp_And_Module_Zero_To_0_8_1.cs" />
145+
<Compile Include="Migrations\201602161446590_Upgrade_Abp_And_Module_Zero_To_0_8_1.Designer.cs">
146+
<DependentUpon>201602161446590_Upgrade_Abp_And_Module_Zero_To_0_8_1.cs</DependentUpon>
147+
</Compile>
144148
<Compile Include="Migrations\Configuration.cs" />
145149
<Compile Include="AbpProjectNameDataModule.cs" />
146150
<Compile Include="Migrations\SeedData\DefaultEditionsBuilder.cs" />
@@ -184,6 +188,9 @@
184188
<EmbeddedResource Include="Migrations\201601032115057_Upgraded_Module_Zero_0_7_7.resx">
185189
<DependentUpon>201601032115057_Upgraded_Module_Zero_0_7_7.cs</DependentUpon>
186190
</EmbeddedResource>
191+
<EmbeddedResource Include="Migrations\201602161446590_Upgrade_Abp_And_Module_Zero_To_0_8_1.resx">
192+
<DependentUpon>201602161446590_Upgrade_Abp_And_Module_Zero_To_0_8_1.cs</DependentUpon>
193+
</EmbeddedResource>
187194
</ItemGroup>
188195
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
189196
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

‎src/AbpCompanyName.AbpProjectName.EntityFramework/App.config‎

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.5.2"/></startup></configuration>
24+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

‎src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/201602161446590_Upgrade_Abp_And_Module_Zero_To_0_8_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.

0 commit comments

Comments
 (0)