Skip to content

Commit 7a4cd7a

Browse files
hikalkanhikalkan
committed
Upgraded to ABP 0.7.5. Moved to .NET Framework 4.5.2.
1 parent 3407114 commit 7a4cd7a

File tree

27 files changed

+240
-216
lines changed

27 files changed

+240
-216
lines changed

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1111
<AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -32,16 +33,16 @@
3233
<WarningLevel>4</WarningLevel>
3334
</PropertyGroup>
3435
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
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>
3738
<Private>True</Private>
3839
</Reference>
39-
<Reference Include="Abp.AutoMapper, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.AutoMapper.0.7.4.1\lib\net451\Abp.AutoMapper.dll</HintPath>
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>
4142
<Private>True</Private>
4243
</Reference>
43-
<Reference Include="Abp.Zero, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Abp.Zero.0.7.4.1\lib\net451\Abp.Zero.dll</HintPath>
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>
4546
<Private>True</Private>
4647
</Reference>
4748
<Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
</dependentAssembly>
2121
</assemblyBinding>
2222
</runtime>
23-
</configuration>
23+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>

‎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.4.1" targetFramework="net451" />
4-
<package id="Abp.AutoMapper" version="0.7.4.1" targetFramework="net451" />
5-
<package id="Abp.Zero" version="0.7.4.1" targetFramework="net451" />
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" />
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: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1111
<AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -32,12 +33,12 @@
3233
<WarningLevel>4</WarningLevel>
3334
</PropertyGroup>
3435
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
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>
3738
<Private>True</Private>
3839
</Reference>
39-
<Reference Include="Abp.Zero, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.Zero.0.7.4.1\lib\net451\Abp.Zero.dll</HintPath>
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>
4142
<Private>True</Private>
4243
</Reference>
4344
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
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"/>
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>
15-
</configuration>
15+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>

‎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.4.1" targetFramework="net451" />
4-
<package id="Abp.Zero" version="0.7.4.1" targetFramework="net451" />
3+
<package id="Abp" version="0.7.5.0" targetFramework="net452" />
4+
<package id="Abp.Zero" version="0.7.5.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: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1111
<AssemblyName>AbpCompanyName.AbpProjectName.EntityFramework</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -32,20 +33,20 @@
3233
<WarningLevel>4</WarningLevel>
3334
</PropertyGroup>
3435
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
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>
3738
<Private>True</Private>
3839
</Reference>
39-
<Reference Include="Abp.EntityFramework, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.EntityFramework.0.7.4.1\lib\net451\Abp.EntityFramework.dll</HintPath>
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>
4142
<Private>True</Private>
4243
</Reference>
43-
<Reference Include="Abp.Zero, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Abp.Zero.0.7.4.1\lib\net451\Abp.Zero.dll</HintPath>
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>
4546
<Private>True</Private>
4647
</Reference>
47-
<Reference Include="Abp.Zero.EntityFramework, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.EntityFramework.0.7.4.1\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
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>
4950
<Private>True</Private>
5051
</Reference>
5152
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
@@ -64,8 +65,8 @@
6465
<SpecificVersion>False</SpecificVersion>
6566
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
6667
</Reference>
67-
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
68-
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.4\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
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>
6970
<Private>True</Private>
7071
</Reference>
7172
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
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"/>
1717
</dependentAssembly>
1818
</assemblyBinding>
1919
</runtime>
20-
</configuration>
20+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.7.4.1" targetFramework="net451" />
4-
<package id="Abp.EntityFramework" version="0.7.4.1" targetFramework="net451" />
5-
<package id="Abp.Zero" version="0.7.4.1" targetFramework="net451" />
6-
<package id="Abp.Zero.EntityFramework" version="0.7.4.1" targetFramework="net451" />
3+
<package id="Abp" version="0.7.5.0" targetFramework="net452" />
4+
<package id="Abp.EntityFramework" version="0.7.5.0" targetFramework="net452" />
5+
<package id="Abp.Zero" version="0.7.5.0" targetFramework="net452" />
6+
<package id="Abp.Zero.EntityFramework" version="0.7.5.0" targetFramework="net452" />
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" />
11-
<package id="EntityFramework.DynamicFilters" version="1.4.4" targetFramework="net451" />
11+
<package id="EntityFramework.DynamicFilters" version="1.4.5" targetFramework="net452" />
1212
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
1313
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
1414
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1111
<AssemblyName>AbpCompanyName.AbpProjectName.NHibernate</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -32,16 +33,16 @@
3233
<WarningLevel>4</WarningLevel>
3334
</PropertyGroup>
3435
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
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>
3738
<Private>True</Private>
3839
</Reference>
39-
<Reference Include="Abp.FluentMigrator, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.FluentMigrator.0.7.4.1\lib\net451\Abp.FluentMigrator.dll</HintPath>
40+
<Reference Include="Abp.FluentMigrator, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Abp.FluentMigrator.0.7.5.0\lib\net452\Abp.FluentMigrator.dll</HintPath>
4142
<Private>True</Private>
4243
</Reference>
43-
<Reference Include="Abp.NHibernate, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Abp.NHibernate.0.7.4.1\lib\net451\Abp.NHibernate.dll</HintPath>
44+
<Reference Include="Abp.NHibernate, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.NHibernate.0.7.5.0\lib\net452\Abp.NHibernate.dll</HintPath>
4546
<Private>True</Private>
4647
</Reference>
4748
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

0 commit comments

Comments
 (0)